mirror of
git://sourceware.org/git/lvm2.git
synced 2025-02-06 01:58:01 +03:00
Rename mirror_device_fault_policy to mirror_image_fault policy
This commit is contained in:
parent
bf8c8a6d61
commit
03984e05a3
@ -1,5 +1,6 @@
|
||||
Version 2.02.57 -
|
||||
====================================
|
||||
Rename mirror_device_fault_policy to mirror_image_fault policy.
|
||||
Remove empty PV devices if lvconvert --repair is using defined policies.
|
||||
Use fixed buffer to prevent stack overflow in persistent filter dump.
|
||||
Use snapshot metadata usage to determine if a snapshot is empty.
|
||||
|
@ -405,7 +405,7 @@ activation {
|
||||
# be allocated for the replacement.
|
||||
|
||||
mirror_log_fault_policy = "allocate"
|
||||
mirror_device_fault_policy = "remove"
|
||||
mirror_image_fault_policy = "remove"
|
||||
}
|
||||
|
||||
|
||||
|
@ -46,7 +46,7 @@
|
||||
|
||||
#define DEFAULT_MIRRORLOG "disk"
|
||||
#define DEFAULT_MIRROR_LOG_FAULT_POLICY "allocate"
|
||||
#define DEFAULT_MIRROR_DEV_FAULT_POLICY "remove"
|
||||
#define DEFAULT_MIRROR_IMAGE_FAULT_POLICY "remove"
|
||||
#define DEFAULT_MIRROR_MAX_IMAGES 8 /* limited by kernel DM_KCOPYD_MAX_REGIONS */
|
||||
#define DEFAULT_DMEVENTD_MIRROR_LIB "libdevmapper-event-lvm2mirror.so"
|
||||
#define DEFAULT_DMEVENTD_MONITOR 1
|
||||
|
@ -783,9 +783,13 @@ static int get_mirror_fault_policy(struct cmd_context *cmd __attribute((unused))
|
||||
if (log_policy)
|
||||
policy = find_config_str(NULL, "activation/mirror_log_fault_policy",
|
||||
DEFAULT_MIRROR_LOG_FAULT_POLICY);
|
||||
else
|
||||
policy = find_config_str(NULL, "activation/mirror_device_fault_policy",
|
||||
DEFAULT_MIRROR_DEV_FAULT_POLICY);
|
||||
else {
|
||||
policy = find_config_str(NULL, "activation/mirror_image_fault_policy",
|
||||
NULL);
|
||||
if (!policy)
|
||||
policy = find_config_str(NULL, "activation/mirror_device_fault_policy",
|
||||
DEFAULT_MIRROR_IMAGE_FAULT_POLICY);
|
||||
}
|
||||
|
||||
if (!strcmp(policy, "remove"))
|
||||
return MIRROR_REMOVE;
|
||||
|
@ -475,6 +475,9 @@ static void _lvconvert_mirrors_repair_ask(struct cmd_context *cmd,
|
||||
|
||||
if (arg_count(cmd, use_policies_ARG)) {
|
||||
leg_policy = find_config_tree_str(cmd,
|
||||
"activation/mirror_image_fault_policy", NULL);
|
||||
if (!leg_policy)
|
||||
leg_policy = find_config_tree_str(cmd,
|
||||
"activation/mirror_device_fault_policy",
|
||||
DEFAULT_MIRROR_DEVICE_FAULT_POLICY);
|
||||
log_policy = find_config_tree_str(cmd,
|
||||
|
Loading…
x
Reference in New Issue
Block a user