From 304de4833f9d308c8ca33886d0cd8fbcc088cfc3 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 5 Jun 2017 11:21:32 +0200 Subject: [PATCH] Common: Rewrite check_pgs Rewrite the check_pgs by using json parsing instead of complex regexp to parse the `ceph -s` output. Signed-off-by: Guillaume Abrioux --- roles/ceph-common/templates/restart_osd_daemon.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-common/templates/restart_osd_daemon.sh.j2 b/roles/ceph-common/templates/restart_osd_daemon.sh.j2 index 05e3ef9ce..5d1d04597 100644 --- a/roles/ceph-common/templates/restart_osd_daemon.sh.j2 +++ b/roles/ceph-common/templates/restart_osd_daemon.sh.j2 @@ -6,7 +6,7 @@ CEPH_CLI="--name client.bootstrap-osd --keyring /var/lib/ceph/bootstrap-osd/{{ c check_pgs() { while [ $RETRIES -ne 0 ]; do - test "$(ceph $CEPH_CLI -s | grep pgmap | sed -r 's/.*: ([0-9]+) pgs.*/\1/g')" -eq "$(ceph $CEPH_CLI -s | egrep '\sactive\+clean' | sed -r 's/[^0-9]*//g')" && ceph $CEPH_CLI health | egrep -sq "HEALTH_OK|HEALTH_WARN" + test "[""$(ceph $CEPH_CLI -s -f json | python -c 'import sys, json; print(json.load(sys.stdin)["pgmap"]["num_pgs"])')""]" == "$(ceph $CEPH_CLI -s -f json | python -c 'import sys, json; print [ i["count"] for i in json.load(sys.stdin)["pgmap"]["pgs_by_state"] if i["state_name"] == "active+clean"]')" RET=$? test $RET -eq 0 && exit 0 sleep $DELAY -- 2.47.3