From: Neha Ojha <nojha@redhat.com>
Date: Wed, 8 Apr 2020 23:21:04 +0000 (+0000)
Subject: qa/standalone/mgr/balancer.sh: adapt test
X-Git-Tag: v16.1.0~2584^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=480afa61b6b4cf91e89d2f9f83776c4fa2e827cf;p=ceph.git

qa/standalone/mgr/balancer.sh: adapt test

Now that the balancer is on by default the test needs these changes.

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/standalone/mgr/balancer.sh b/qa/standalone/mgr/balancer.sh
index 28db7038588e..2d7b2f35dc10 100755
--- a/qa/standalone/mgr/balancer.sh
+++ b/qa/standalone/mgr/balancer.sh
@@ -49,12 +49,11 @@ function TEST_balancer() {
     wait_for_clean || return 1
 
     ceph pg dump pgs
-    ceph osd set-require-min-compat-client luminous
     ceph balancer status || return 1
     eval MODE=$(ceph balancer status | jq '.mode')
-    test $MODE = "none" || return 1
+    test $MODE = "upmap" || return 1
     ACTIVE=$(ceph balancer status | jq '.active')
-    test $ACTIVE = "false" || return 1
+    test $ACTIVE = "true" || return 1
 
     ceph balancer ls || return 1
     PLANS=$(ceph balancer ls)
@@ -80,6 +79,7 @@ function TEST_balancer() {
     ceph balancer status || return 1
     eval MODE=$(ceph balancer status | jq '.mode')
     test $MODE = "crush-compat" || return 1
+    ceph balancer off || return 1
     ! ceph balancer optimize plan_crush $TEST_POOL1 || return 1
     ceph balancer status || return 1
     eval RESULT=$(ceph balancer status | jq '.optimize_result')