47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
|
From 7a940c14658909a081bbcfa8c05c9cc05b191bce Mon Sep 17 00:00:00 2001
|
||
|
|
From: gaohuatao <gaohuatao@huawei.com>
|
||
|
|
Date: Mon, 26 Apr 2021 15:06:35 +0800
|
||
|
|
Subject: [PATCH 087/104] CI:activate vg isulad
|
||
|
|
|
||
|
|
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
|
||
|
|
---
|
||
|
|
CI/test_cases/helpers.sh | 8 +++++++-
|
||
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/CI/test_cases/helpers.sh b/CI/test_cases/helpers.sh
|
||
|
|
index 7f4a286d..c8e7bb8a 100755
|
||
|
|
--- a/CI/test_cases/helpers.sh
|
||
|
|
+++ b/CI/test_cases/helpers.sh
|
||
|
|
@@ -196,6 +196,10 @@ function do_install_thinpool()
|
||
|
|
{
|
||
|
|
local ret=0
|
||
|
|
|
||
|
|
+ systemctl restart lvm2-lvmetad.service
|
||
|
|
+ systemctl restart systemd-udevd.service
|
||
|
|
+ udevadm control --reload-rules && udevadm trigger
|
||
|
|
+
|
||
|
|
dev_disk=`pvs | grep isulad | awk '{print$1}'`
|
||
|
|
rm -rf /var/lib/isulad/*
|
||
|
|
dmsetup remove_all
|
||
|
|
@@ -240,6 +244,8 @@ EOF
|
||
|
|
lvconvert -y --zero n -c 512K --thinpool isulad/thinpool --poolmetadata isulad/thinpoolmeta
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - lvconvert failed" && ((ret++))
|
||
|
|
|
||
|
|
+ lvchange --activate ay isulad
|
||
|
|
+
|
||
|
|
lvchange --metadataprofile isulad-thinpool isulad/thinpool
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - lvchange failed" && ((ret++))
|
||
|
|
|
||
|
|
@@ -251,7 +257,7 @@ EOF
|
||
|
|
# Delete all containers and stop isulad before executing this func
|
||
|
|
function reinstall_thinpool()
|
||
|
|
{
|
||
|
|
- retry_limit=3
|
||
|
|
+ retry_limit=10
|
||
|
|
retry_interval=2
|
||
|
|
state="fail"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|