From 19fcec84d8d7d21e796c7624e521b60d28ee21ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 20:45:59 +0200 Subject: Adding upstream version 16.2.11+ds. Signed-off-by: Daniel Baumann --- qa/suites/orch/cephadm/osds/2-ops/repave-all.yaml | 13 +++++++++++++ qa/suites/orch/cephadm/osds/2-ops/rm-zap-add.yaml | 17 +++++++++++++++++ qa/suites/orch/cephadm/osds/2-ops/rm-zap-flag.yaml | 15 +++++++++++++++ qa/suites/orch/cephadm/osds/2-ops/rm-zap-wait.yaml | 16 ++++++++++++++++ .../orch/cephadm/osds/2-ops/rmdir-reactivate.yaml | 20 ++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 qa/suites/orch/cephadm/osds/2-ops/repave-all.yaml create mode 100644 qa/suites/orch/cephadm/osds/2-ops/rm-zap-add.yaml create mode 100644 qa/suites/orch/cephadm/osds/2-ops/rm-zap-flag.yaml create mode 100644 qa/suites/orch/cephadm/osds/2-ops/rm-zap-wait.yaml create mode 100644 qa/suites/orch/cephadm/osds/2-ops/rmdir-reactivate.yaml (limited to 'qa/suites/orch/cephadm/osds/2-ops') diff --git a/qa/suites/orch/cephadm/osds/2-ops/repave-all.yaml b/qa/suites/orch/cephadm/osds/2-ops/repave-all.yaml new file mode 100644 index 000000000..16413aba8 --- /dev/null +++ b/qa/suites/orch/cephadm/osds/2-ops/repave-all.yaml @@ -0,0 +1,13 @@ +tasks: +- cephadm.shell: + host.a: + - | + set -e + set -x + ceph orch ps + ceph orch device ls + ceph osd tree + for osd in `ceph osd ls` ; do + ceph orch osd rm $osd --force --zap --replace + done + while ceph orch osd rm ls | wc | grep ^1 ; do sleep 10 ; done diff --git a/qa/suites/orch/cephadm/osds/2-ops/rm-zap-add.yaml b/qa/suites/orch/cephadm/osds/2-ops/rm-zap-add.yaml new file mode 100644 index 000000000..09be72f11 --- /dev/null +++ b/qa/suites/orch/cephadm/osds/2-ops/rm-zap-add.yaml @@ -0,0 +1,17 @@ +tasks: +- cephadm.shell: + host.a: + - | + set -e + set -x + ceph orch ps + ceph orch device ls + DEVID=$(ceph device ls | grep osd.1 | awk '{print $1}') + HOST=$(ceph orch device ls | grep $DEVID | awk '{print $1}') + DEV=$(ceph orch device ls | grep $DEVID | awk '{print $2}') + echo "host $HOST, dev $DEV, devid $DEVID" + ceph orch osd rm 1 + while ceph orch osd rm status | grep ^1 ; do sleep 5 ; done + ceph orch device zap $HOST $DEV --force + ceph orch daemon add osd $HOST:$DEV + while ! ceph osd dump | grep osd.1 | grep up ; do sleep 5 ; done diff --git a/qa/suites/orch/cephadm/osds/2-ops/rm-zap-flag.yaml b/qa/suites/orch/cephadm/osds/2-ops/rm-zap-flag.yaml new file mode 100644 index 000000000..8f07f6d53 --- /dev/null +++ b/qa/suites/orch/cephadm/osds/2-ops/rm-zap-flag.yaml @@ -0,0 +1,15 @@ +tasks: +- cephadm.shell: + host.a: + - | + set -e + set -x + ceph orch ps + ceph orch device ls + DEVID=$(ceph device ls | grep osd.1 | awk '{print $1}') + HOST=$(ceph orch device ls | grep "$DEVID" | awk '{print $1}') + DEV=$(ceph orch device ls | grep "$DEVID" | awk '{print $2}') + echo "host $HOST, dev $DEV, devid $DEVID" + ceph orch osd rm --zap --replace 1 + while ceph orch osd rm status | grep ^1 ; do sleep 5 ; done + while ! ceph osd dump | grep osd.1 | grep "up\s*in" ; do sleep 5 ; done diff --git a/qa/suites/orch/cephadm/osds/2-ops/rm-zap-wait.yaml b/qa/suites/orch/cephadm/osds/2-ops/rm-zap-wait.yaml new file mode 100644 index 000000000..78161aa49 --- /dev/null +++ b/qa/suites/orch/cephadm/osds/2-ops/rm-zap-wait.yaml @@ -0,0 +1,16 @@ +tasks: +- cephadm.shell: + host.a: + - | + set -e + set -x + ceph orch ps + ceph orch device ls + DEVID=$(ceph device ls | grep osd.1 | awk '{print $1}') + HOST=$(ceph orch device ls | grep $DEVID | awk '{print $1}') + DEV=$(ceph orch device ls | grep $DEVID | awk '{print $2}') + echo "host $HOST, dev $DEV, devid $DEVID" + ceph orch osd rm 1 + while ceph orch osd rm status | grep ^1 ; do sleep 5 ; done + ceph orch device zap $HOST $DEV --force + while ! ceph osd dump | grep osd.1 | grep up ; do sleep 5 ; done diff --git a/qa/suites/orch/cephadm/osds/2-ops/rmdir-reactivate.yaml b/qa/suites/orch/cephadm/osds/2-ops/rmdir-reactivate.yaml new file mode 100644 index 000000000..a971a02e4 --- /dev/null +++ b/qa/suites/orch/cephadm/osds/2-ops/rmdir-reactivate.yaml @@ -0,0 +1,20 @@ +tasks: +- cephadm.shell: + host.a: + - | + set -e + set -x + ceph orch ps + HOST=$(hostname -s) + OSD=$(ceph orch ps $HOST | grep osd | head -n 1 | awk '{print $1}') + echo "host $HOST, osd $OSD" + ceph orch daemon stop $OSD + while ceph orch ps | grep $OSD | grep running ; do sleep 5 ; done + ceph auth export $OSD > k + ceph orch daemon rm $OSD --force + ceph orch ps --refresh + while ceph orch ps | grep $OSD ; do sleep 5 ; done + ceph auth add $OSD -i k + ceph cephadm osd activate $HOST + while ! ceph orch ps | grep $OSD | grep running ; do sleep 5 ; done +- cephadm.healthy: -- cgit v1.2.3