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

tests: disable lvmetad and lvmpolld

Browse Source 
Since now we enable those by default when compiled with those daemons,
explicitely disable them in tests when needed.

Alphabetically sort configurables.
This commit is contained in:
Zdenek Kabelac 2015-05-11 15:45:34 +02:00
parent b5b3ad14a8
commit fabc19b73c
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/lib/aux.sh
View File

@ -816,6 +816,8 @@ generate_config() {
fi fi
LVM_TEST_LOCKING=${LVM_TEST_LOCKING:-1} LVM_TEST_LOCKING=${LVM_TEST_LOCKING:-1}
LVM_TEST_LVMETAD=${LVM_TEST_LVMETAD:-0}
LVM_TEST_LVMPOLLD=${LVM_TEST_LVMPOLLD:-0}
if test "$DM_DEV_DIR" = "/dev"; then if test "$DM_DEV_DIR" = "/dev"; then
LVM_VERIFY_UDEV=${LVM_VERIFY_UDEV:-0} LVM_VERIFY_UDEV=${LVM_VERIFY_UDEV:-0}
else else
@ -823,46 +825,48 @@ generate_config() {
fi fi
test -f "$config_values" || { test -f "$config_values" || {
cat > "$config_values" <<-EOF cat > "$config_values" <<-EOF
devices/dir = "$DM_DEV_DIR" activation/checks = 1
devices/scan = "$DM_DEV_DIR" activation/monitoring = 0
devices/filter = "a|.*|" activation/polling_interval = 0
devices/global_filter = [ "a|$DM_DEV_DIR/mapper/.*pv[0-9_]*$|", "r|.*|" ]
devices/cache_dir = "$TESTDIR/etc"
devices/sysfs_scan = 1
devices/default_data_alignment = 1
devices/md_component_detection = 0
log/syslog = 0
log/indent = 1
log/level = 9
log/file = "$TESTDIR/debug.log"
log/overwrite = 1
log/activation = 1
log/verbose = 0
activation/retry_deactivation = 1 activation/retry_deactivation = 1
backup/backup = 0 activation/snapshot_autoextend_percent = 50
activation/snapshot_autoextend_threshold = 50
activation/udev_rules = 1
activation/udev_sync = 1
activation/verify_udev_operations = $LVM_VERIFY_UDEV
allocation/wipe_signatures_when_zeroing_new_lvs = 0
backup/archive = 0 backup/archive = 0
backup/backup = 0
devices/cache_dir = "$TESTDIR/etc"
devices/default_data_alignment = 1
devices/dir = "$DM_DEV_DIR"
devices/filter = "a|.*|"
qdevices/global_filter = [ "a|$DM_DEV_DIR/mapper/.*pv[0-9_]*$|", "r|.*|" ]
devices/md_component_detection = 0
devices/scan = "$DM_DEV_DIR"
devices/sysfs_scan = 1
global/abort_on_internal_errors = 1 global/abort_on_internal_errors = 1
global/cache_check_executable = "$LVM_TEST_CACHE_CHECK_CMD"
global/cache_dump_executable = "$LVM_TEST_CACHE_DUMP_CMD"
global/cache_repair_executable = "$LVM_TEST_CACHE_REPAIR_CMD"
global/detect_internal_vg_cache_corruption = 1 global/detect_internal_vg_cache_corruption = 1
global/fallback_to_local_locking = 0
global/library_dir = "$TESTDIR/lib" global/library_dir = "$TESTDIR/lib"
global/locking_dir = "$TESTDIR/var/lock/lvm" global/locking_dir = "$TESTDIR/var/lock/lvm"
global/locking_type=$LVM_TEST_LOCKING global/locking_type=$LVM_TEST_LOCKING
global/si_unit_consistency = 1 global/si_unit_consistency = 1
global/fallback_to_local_locking = 0
global/cache_check_executable = "$LVM_TEST_CACHE_CHECK_CMD"
global/cache_dump_executable = "$LVM_TEST_CACHE_DUMP_CMD"
global/cache_repair_executable = "$LVM_TEST_CACHE_REPAIR_CMD"
global/thin_check_executable = "$LVM_TEST_THIN_CHECK_CMD" global/thin_check_executable = "$LVM_TEST_THIN_CHECK_CMD"
global/thin_dump_executable = "$LVM_TEST_THIN_DUMP_CMD" global/thin_dump_executable = "$LVM_TEST_THIN_DUMP_CMD"
global/thin_repair_executable = "$LVM_TEST_THIN_REPAIR_CMD" global/thin_repair_executable = "$LVM_TEST_THIN_REPAIR_CMD"
activation/checks = 1 global/use_lvmetad = $LVM_TEST_LVMETAD
activation/udev_sync = 1 global/use_lvmpolld = $LVM_TEST_LVMPOLLD
activation/udev_rules = 1 log/activation = 1
activation/verify_udev_operations = $LVM_VERIFY_UDEV log/file = "$TESTDIR/debug.log"
activation/polling_interval = 0 log/indent = 1
activation/snapshot_autoextend_percent = 50 log/level = 9
activation/snapshot_autoextend_threshold = 50 log/overwrite = 1
activation/monitoring = 0 log/syslog = 0
allocation/wipe_signatures_when_zeroing_new_lvs = 0 log/verbose = 0
EOF EOF
} }