master - test: allow to succeed in the cluster
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b74e7f6a781bf7dc491...
Commit: b74e7f6a781bf7dc4914d8294fcbc6881a539f2e
Parent: 053314f2954dd94f707ef4a6ae9967ecd69fad6e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:59:55 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:59:55 2017 +0100
test: allow to succeed in the cluster
Avoiding "$(get first_extent_sector "$d")" in the loop
allows the test to succeed in the cluster. Further cluster
analysis needed to get to the core reason.
---
test/shell/lvconvert-repair-raid.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh
index c866455..d29b72d 100644
--- a/test/shell/lvconvert-repair-raid.sh
+++ b/test/shell/lvconvert-repair-raid.sh
@@ -25,10 +25,12 @@ aux lvmconf 'allocation/maximise_cling = 0' \
aux prepare_vg 8 80
get_devs
+offset=$(get first_extent_sector $dev1)
+
function delay
{
for d in "${DEVICES[@]}"; do
- aux delay_dev "$d" 0 $1 "$(get first_extent_sector "$d")"
+ aux delay_dev "$d" 0 $1 "$offset"
done
}
6 years, 4 months
master - test: allow to succeed in the cluster
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=01b3344cbda712130de...
Commit: 01b3344cbda712130dec96924fb3c2bdfe4c595b
Parent: 053314f2954dd94f707ef4a6ae9967ecd69fad6e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:57:21 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:57:21 2017 +0100
test: allow to succeed in the cluster
Avoiding in the loop
allows the test to succeed in the cluster. Further cluster
analysis needed to get to the core reason.
---
test/shell/lvconvert-repair-raid.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh
index c866455..d29b72d 100644
--- a/test/shell/lvconvert-repair-raid.sh
+++ b/test/shell/lvconvert-repair-raid.sh
@@ -25,10 +25,12 @@ aux lvmconf 'allocation/maximise_cling = 0' \
aux prepare_vg 8 80
get_devs
+offset=$(get first_extent_sector $dev1)
+
function delay
{
for d in "${DEVICES[@]}"; do
- aux delay_dev "$d" 0 $1 "$(get first_extent_sector "$d")"
+ aux delay_dev "$d" 0 $1 "$offset"
done
}
6 years, 4 months
master - test: add large tests skip option
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=053314f2954dd94f707...
Commit: 053314f2954dd94f707ef4a6ae9967ecd69fad6e
Parent: 7aef59c6c332e5b9a983f5559acfa13834b2d064
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:50:55 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:50:55 2017 +0100
test: add large tests skip option
The lvm2 test suite aims at small test resource footprints
(few PVs, small PV sizes) to run on tmpfs backed loop device.
OTOH, lvconvert-reshape-raid.sh aims to test the maxima of
supported total stripes of 64. This patch adds a prerequisite
conditional to skip tests using more than 14 stripes.
It requires the target version 1.13.1 to avoid deadlocks.
---
test/shell/lvconvert-raid-reshape.sh | 60 ++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/test/shell/lvconvert-raid-reshape.sh b/test/shell/lvconvert-raid-reshape.sh
index b07e1ce..28bff0d 100644
--- a/test/shell/lvconvert-raid-reshape.sh
+++ b/test/shell/lvconvert-raid-reshape.sh
@@ -13,22 +13,25 @@
SKIP_WITH_LVMLOCKD=1
SKIP_WITH_LVMPOLLD=1
-. lib/inittest
+LVM_SKIP_LARGE_TESTS=0
-if [[ "$TESTDIR" == /dev/shm/* ]]; then
- echo "Disabled. This tests is permanently causing /dev/shm exhaustion. RHBZ#1501145"
- false
-fi
+. lib/inittest
which mkfs.ext4 || skip
-aux have_raid 1 12 0 || skip
+aux have_raid 1 13 1 || skip # needed to address RHBZ#1501145
# Temporarily skip reshape tests on single-core CPUs until there's a fix for
# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
#aux have_multi_core || skip
# dropping single-core limitation with 1.12 target
-aux prepare_pvs 65 32
+if [ $LVM_SKIP_LARGE_TESTS -eq 0 ]
+then
+ aux prepare_pvs 65 9
+else
+ aux prepare_pvs 20 9
+fi
+
get_devs
vgcreate -s 1M "$vg" "${DEVICES[@]}"
@@ -66,7 +69,7 @@ function _lvconvert
[ "${level:0:7}" = "striped" ] && wait_and_check=0
[ "${level:0:5}" = "raid0" ] && wait_and_check=0
- lvconvert -y --ty $req_level $R $vg/$lv || return $?
+ lvconvert -y --ty $req_level $R "$DM_DEV_DIR/$vg/$lv" || return $?
check lv_first_seg_field $vg/$lv segtype "$level"
check lv_first_seg_field $vg/$lv data_stripes $data_stripes
@@ -97,7 +100,7 @@ function _reshape_layout
[[ "$opts" =~ "--stripes" ]] && ignore_a_chars=1
- lvconvert -vvvv -y --ty $type $opts $vg/$lv
+ lvconvert -y --ty $type $opts "$DM_DEV_DIR/$vg/$lv"
check lv_first_seg_field $vg/$lv segtype "$type"
check lv_first_seg_field $vg/$lv data_stripes $data_stripes
check lv_first_seg_field $vg/$lv stripes $stripes
@@ -114,6 +117,7 @@ function _reshape_layout
#
# Create 3-way striped raid5 (4 legs total)
+# _lvcreate raid5_ls 3 4 16M $vg $lv1
_lvcreate raid5_ls 3 4 16M $vg $lv1
check lv_first_seg_field $vg/$lv1 segtype "raid5_ls"
aux wait_for_sync $vg $lv1
@@ -149,24 +153,32 @@ _reshape_layout raid5_ls 9 10 $vg $lv1 --stripes 9
# Convert raid5_ls to 14 stripes
_reshape_layout raid5_ls 14 15 $vg $lv1 --stripes 14
-# Convert raid5_ls to 63 stripes
-_reshape_layout raid5_ls 63 64 $vg $lv1 --stripes 63
-
-# Convert raid5_ls back to 27 stripes
-_reshape_layout raid5_ls 27 64 $vg $lv1 --stripes 27 --force
-_reshape_layout raid5_ls 27 28 $vg $lv1 --stripes 27
-
-# Convert raid5_ls back to 4 stripes checking
-# conversion to striped/raid* gets rejected
-# with existing LVs to be removed afer reshape
-_reshape_layout raid5_ls 4 28 $vg $lv1 --stripes 4 --force
+if [ $LVM_SKIP_LARGE_TESTS -eq 0 ]
+then
+ # Convert raid5_ls to 63 stripes
+ _reshape_layout raid5_ls 63 64 $vg $lv1 --stripes 63
+
+ # Convert raid5_ls back to 27 stripes
+ _reshape_layout raid5_ls 27 64 $vg $lv1 --stripes 27 --force
+ _reshape_layout raid5_ls 27 28 $vg $lv1 --stripes 27
+
+ # Convert raid5_ls back to 4 stripes checking
+ # conversion to striped/raid* gets rejected
+ # with existing LVs to be removed afer reshape
+ _reshape_layout raid5_ls 4 28 $vg $lv1 --stripes 4 --force
+else
+ # Convert raid5_ls back to 4 stripes checking
+ # conversion to striped/raid* gets rejected
+ # with existing LVs to be removed afer reshape
+ _reshape_layout raid5_ls 4 15 $vg $lv1 --stripes 4 --force
+fi
# No we got the data reshaped and the freed SubLVs still present
# -> check takeover request gets rejected
-not lvconvert --yes --type striped $vg/$lv1
-not lvconvert --yes --type raid0 $vg/$lv1
-not lvconvert --yes --type raid0_meta $vg/$lv1
-not lvconvert --yes --type raid6 $vg/$lv1
+not lvconvert --yes --type striped "$DM_DEV_DIR/$vg/$lv1"
+not lvconvert --yes --type raid0 "$DM_DEV_DIR/$vg/$lv1"
+not lvconvert --yes --type "$DM_DEV_DIR/raid0_meta $vg/$lv1"
+not lvconvert --yes --type "$DM_DEV_DIR/raid6 $vg/$lv1"
# Remove the freed SubLVs
_reshape_layout raid5_ls 4 5 $vg $lv1 --stripes 4
6 years, 4 months
master - test: reduce pv sizes, fix comment and stripe size
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7aef59c6c332e5b9a98...
Commit: 7aef59c6c332e5b9a983f5559acfa13834b2d064
Parent: 16fa9d9ed5569ac6b8f87375c2902de8280eefe4
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:42:37 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:42:37 2017 +0100
test: reduce pv sizes, fix comment and stripe size
---
.../lvconvert-raid-reshape-striped_to_linear.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
index ba90f57..5230b2b 100644
--- a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
+++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
@@ -22,7 +22,7 @@ aux have_raid 1 12 0 || skip
# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
aux have_multi_core || skip
-aux prepare_vg 5
+aux prepare_vg 5 20
#
# Test single step linear -> striped conversion
@@ -69,7 +69,7 @@ fsck -fn $DM_DEV_DIR/$vg/$lv1
check lv_first_seg_field $vg/$lv1 segtype "raid5_n"
check lv_first_seg_field $vg/$lv1 data_stripes 1
check lv_first_seg_field $vg/$lv1 stripes 5
-check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+check lv_first_seg_field $vg/$lv1 stripesize "32.00k"
check lv_first_seg_field $vg/$lv1 regionsize "1.00m"
check lv_first_seg_field $vg/$lv1 reshape_len_le 10
# for slv in {0..4}
@@ -84,7 +84,7 @@ lvconvert -y --stripes 1 $vg/$lv1
check lv_first_seg_field $vg/$lv1 segtype "raid5_n"
check lv_first_seg_field $vg/$lv1 data_stripes 1
check lv_first_seg_field $vg/$lv1 stripes 2
-check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+check lv_first_seg_field $vg/$lv1 stripesize "32.00k"
check lv_first_seg_field $vg/$lv1 regionsize "1.00m"
check lv_first_seg_field $vg/$lv1 reshape_len_le 4
@@ -98,7 +98,7 @@ check lv_first_seg_field $vg/$lv1 stripesize "0"
check lv_first_seg_field $vg/$lv1 regionsize "1.00m"
check lv_first_seg_field $vg/$lv1 reshape_len_le ""
-# Convert raid5_n -> linear
+# Convert raid1 -> linear
lvconvert -y --type linear $vg/$lv1
fsck -fn $DM_DEV_DIR/$vg/$lv1
check lv_first_seg_field $vg/$lv1 segtype "linear"
6 years, 4 months
master - test: cleanup command
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=16fa9d9ed5569ac6b8f...
Commit: 16fa9d9ed5569ac6b8f87375c2902de8280eefe4
Parent: 4daad1cf11d9bb16ff6d8f3adc0918cbacfbe398
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:39:38 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:39:38 2017 +0100
test: cleanup command
---
test/shell/lvchange-partial-raid10.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/shell/lvchange-partial-raid10.sh b/test/shell/lvchange-partial-raid10.sh
index 83193b2..caec3a3 100644
--- a/test/shell/lvchange-partial-raid10.sh
+++ b/test/shell/lvchange-partial-raid10.sh
@@ -26,7 +26,7 @@ lvcreate --type raid10 -m 1 -i 2 -l 2 -n $lv1 $vg
aux wait_for_sync $vg $lv1
lvchange -an $vg/$lv1
aux disable_dev "$dev1" "$dev3"
-lvchange -ay $vg/$lv1 --partial
+lvchange -ay --partial $vg/$lv1
lvchange -an $vg/$lv1
aux enable_dev "$dev1"
6 years, 4 months
master - lv_manip: allow extension on --nosync raid lv
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4daad1cf11d9bb16ff6...
Commit: 4daad1cf11d9bb16ff6d8f3adc0918cbacfbe398
Parent: 3688eeeea0a81e8dbc02d1c9d46cb983a4d8d79b
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:38:18 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:38:18 2017 +0100
lv_manip: allow extension on --nosync raid lv
If the recovery of the repleced leg(s) of a RaidLV created without
initial resynchronization (i.e. "lvcreate --nosync ...") got
interrupted, it can't be extended because of the < 100% sync rate.
---
lib/metadata/lv_manip.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index fb152ac..6b2d1f1 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -4233,7 +4233,8 @@ int lv_extend(struct logical_volume *lv,
log_error("Failed to get sync percent for %s.",
display_lvname(lv));
goto out;
- } else if (sync_percent == DM_PERCENT_100) {
+ } else if (lv_is_not_synced(lv) ||
+ sync_percent == DM_PERCENT_100) {
log_verbose("Skipping initial resync for "
"extended portion of %s",
display_lvname(lv));
6 years, 4 months
master - test: disable new reshape test until target version 1.13.1
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3688eeeea0a81e8dbc0...
Commit: 3688eeeea0a81e8dbc02d1c9d46cb983a4d8d79b
Parent: 9681d98cc401681ab60033b6595caf8355f8748d
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:33:11 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:33:11 2017 +0100
test: disable new reshape test until target version 1.13.1
---
test/shell/lvconvert-raid-reshape-load.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh
index c01127b..4ccf01f 100644
--- a/test/shell/lvconvert-raid-reshape-load.sh
+++ b/test/shell/lvconvert-raid-reshape-load.sh
@@ -20,7 +20,7 @@ LVM_SKIP_LARGE_TESTS=1
# Test reshaping under io load
which mkfs.ext4 || skip
-aux have_raid 1 12 0 || skip
+aux have_raid 1 13 1 || skip
mpoint=/tmp/mpoint.$$
6 years, 4 months
master - test: new reshape test under io load
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9681d98cc401681ab60...
Commit: 9681d98cc401681ab60033b6595caf8355f8748d
Parent: d3d18e637cbd4bfb1ef088a404fdc12dd319309e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 18:31:12 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 18:31:12 2017 +0100
test: new reshape test under io load
---
test/shell/lvconvert-raid-reshape-load.sh | 67 +++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh
new file mode 100644
index 0000000..c01127b
--- /dev/null
+++ b/test/shell/lvconvert-raid-reshape-load.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+LVM_SKIP_LARGE_TESTS=1
+
+. lib/inittest
+
+# Test reshaping under io load
+
+which mkfs.ext4 || skip
+aux have_raid 1 12 0 || skip
+
+mpoint=/tmp/mpoint.$$
+
+trap "[ -d $mpoint ] && rmdir $mpoint" 15
+
+aux prepare_pvs 16 32
+
+get_devs
+
+vgcreate -s 1M "$vg" "${DEVICES[@]}"
+
+# Create 13-way striped raid5 (14 legs total)
+lvcreate --yes --type raid5_ls --stripes 13 -L190M -n$lv1 $vg
+check lv_first_seg_field $vg/$lv1 segtype "raid5_ls"
+check lv_first_seg_field $vg/$lv1 data_stripes 13
+check lv_first_seg_field $vg/$lv1 stripes 14
+echo y|mkfs -t ext4 /dev/$vg/$lv1
+aux wait_for_sync $vg $lv1
+
+mkdir -p $mpoint
+mount "$DM_DEV_DIR/$vg/$lv1" $mpoint
+mkdir -p $mpoint/1 $mpoint/2
+
+aux delay_dev "$dev2" 0 100
+
+echo 3 >/proc/sys/vm/drop_caches
+cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null &
+cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null &
+sync &
+
+# Reshape it to 256K stripe size
+lvconvert --yes --stripesize 256 $vg/$lv1
+aux delay_dev "$dev2" 0 0
+check lv_first_seg_field $vg/$lv1 stripesize "256.00k"
+
+kill -9 %%
+wait
+
+umount $mpoint
+[ -d $mpoint ] && rmdir $mpoint
+
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
+
+vgremove -ff $vg
6 years, 4 months
master - raid: ignore --stripesize on raid4/5 conversion to 1 stripe
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d3d18e637cbd4bfb1ef...
Commit: d3d18e637cbd4bfb1ef088a404fdc12dd319309e
Parent: a42c3a0e90d712652890696fefca51380969d595
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Dec 1 15:00:09 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Dec 1 15:00:09 2017 +0100
raid: ignore --stripesize on raid4/5 conversion to 1 stripe
In case caller passes in changed stripe size when reshaping raid4/5
to 1 stripe aiming to convert to raid1 and optionally to linear,
ignore it to prevent data corruption.
---
lib/metadata/raid_manip.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 2d8aaed..0f56120 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1989,12 +1989,16 @@ static int _raid_reshape_remove_images(struct logical_volume *lv,
const unsigned new_stripes, const unsigned new_stripe_size,
struct dm_list *allocate_pvs, struct dm_list *removal_lvs)
{
- uint32_t available_slvs, current_le_count, reduced_le_count, removed_slvs, s;
+ int stripe_size_changed;
+ uint32_t available_slvs, current_le_count, reduced_le_count, removed_slvs, s, stripe_size;
uint64_t extend_le_count;
unsigned devs_health, devs_in_sync;
struct lv_segment *seg = first_seg(lv);
struct lvinfo info = { 0 };
+ stripe_size = seg->stripe_size;
+ stripe_size_changed = new_stripe_size && (stripe_size != new_stripe_size);
+
if (seg_is_any_raid6(seg) && new_stripes < 3) {
log_error("Minimum 3 stripes required for %s LV %s.",
lvseg_name(seg), display_lvname(lv));
@@ -2119,7 +2123,15 @@ static int _raid_reshape_remove_images(struct logical_volume *lv,
return 0;
}
- seg->stripe_size = new_stripe_size;
+ /* May allow stripe size changes > 2 legs */
+ if (new_image_count > 2)
+ seg->stripe_size = new_stripe_size;
+ else {
+ seg->stripe_size = stripe_size;
+ if (stripe_size_changed)
+ log_warn("WARNING: ignoring --stripesize on conversion of %s to 1 stripe.",
+ display_lvname(lv));
+ }
return 1;
}
6 years, 4 months
master - cleanup: remove debug code
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a42c3a0e90d71265289...
Commit: a42c3a0e90d712652890696fefca51380969d595
Parent: 0e177cc7c90139441530fc065125fa510671e610
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Nov 27 16:52:38 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Dec 1 12:19:09 2017 +0100
cleanup: remove debug code
---
lib/activate/activate.c | 7 -------
lib/activate/dev_manager.c | 2 --
2 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 381083b..e7653a2 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -323,12 +323,6 @@ int lvs_in_vg_opened(const struct volume_group *vg)
{
return 0;
}
-/******
-int lv_suspend(struct cmd_context *cmd, const char *lvid_s)
-{
- return 1;
-}
-*******/
int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s, unsigned origin_only, unsigned exclusive,
const struct logical_volume *lv, const struct logical_volume *lv_pre)
{
@@ -2369,7 +2363,6 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s,
if (error_if_not_active)
goto_out;
-
/* ATM only thin-pool with origin-only suspend does not really suspend anything
* it's used only for message passing to thin-pool */
if (laopts->origin_only && lv_is_thin_pool(lv))
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 9f19912..5662090 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -3135,8 +3135,6 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv,
if (!dm_tree_preload_children(root, dlid, DLID_SIZE))
goto_out;
- //if (action == PRELOAD) { log_debug("SLEEP"); sleep(7); }
-
if ((dm_tree_node_size_changed(root) < 0))
dm->flush_required = 1;
/* Currently keep the code require flush for any
6 years, 4 months