shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

log: Add DM_ABORT_ON_INTERNAL_ERRORS lvm override.

Browse Source 
Recognise DM_ABORT_ON_INTERNAL_ERRORS in the lvm logging function as
well as the default dm function it replaces.
This commit is contained in:
Alasdair G Kergon 2015-07-20 15:48:59 +01:00
parent b4be988732
commit 500fd8b9bf
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.126 - Version 2.02.126 -
================================ ================================
Recognise DM_ABORT_ON_INTERNAL_ERRORS env var override in lvm logging fn.
Fix alloc segfault when extending LV with fewer stripes than in first seg. Fix alloc segfault when extending LV with fewer stripes than in first seg.
Fix handling of cache policy name. Fix handling of cache policy name.
Set cache policy before with the first lvm2 cache pool metadata commit. Set cache policy before with the first lvm2 cache pool metadata commit.

21
lib/log/log.c
View File

@ -36,7 +36,7 @@ static int _indent = 1;
static int _log_suppress = 0; static int _log_suppress = 0;
static char _msg_prefix[30] = " "; static char _msg_prefix[30] = " ";
static int _already_logging = 0; static int _already_logging = 0;
static int _abort_on_internal_errors = 0; static int _abort_on_internal_errors_config = 0;
static lvm2_log_fn_t _lvm2_log_fn = NULL; static lvm2_log_fn_t _lvm2_log_fn = NULL;
@ -218,9 +218,10 @@ void init_indent(int indent)
_indent = indent; _indent = indent;
} }
/* If present, environment setting will override this. */
void init_abort_on_internal_errors(int fatal) void init_abort_on_internal_errors(int fatal)
{ {
_abort_on_internal_errors = fatal; _abort_on_internal_errors_config = fatal;
} }
void reset_lvm_errno(int store_errmsg) void reset_lvm_errno(int store_errmsg)
@ -277,10 +278,24 @@ void print_log(int level, const char *file, int line, int dm_errno_or_class,
size_t msglen; size_t msglen;
const char *indent_spaces = ""; const char *indent_spaces = "";
FILE *stream; FILE *stream;
static int _abort_on_internal_errors_env_present = -1;
static int _abort_on_internal_errors_env = 0;
char *env_str;
level &= ~(_LOG_STDERR|_LOG_ONCE); level &= ~(_LOG_STDERR|_LOG_ONCE);
if (_abort_on_internal_errors && if (_abort_on_internal_errors_env_present < 0) {
if ((env_str = getenv("DM_ABORT_ON_INTERNAL_ERRORS"))) {
_abort_on_internal_errors_env_present = 1;
/* Set when env DM_ABORT_ON_INTERNAL_ERRORS is not "0" */
_abort_on_internal_errors_env = strcmp(env_str, "0");
} else
_abort_on_internal_errors_env_present = 0;
}
/* Use value from environment if present, otherwise use value from config. */
if (((_abort_on_internal_errors_env_present && _abort_on_internal_errors_env) ||
(!_abort_on_internal_errors_env_present && _abort_on_internal_errors_config)) &&
!strncmp(format, INTERNAL_ERROR, sizeof(INTERNAL_ERROR) - 1)) { !strncmp(format, INTERNAL_ERROR, sizeof(INTERNAL_ERROR) - 1)) {
fatal_internal_error = 1; fatal_internal_error = 1;
/* Internal errors triggering abort cannot be suppressed. */ /* Internal errors triggering abort cannot be suppressed. */