From: Kefu Chai <kchai@redhat.com>
Date: Mon, 18 Nov 2019 04:10:17 +0000 (+0800)
Subject: qa/workunits/cephtool/test.sh: remove heap cli tests
X-Git-Tag: v15.1.0~866^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bec1b3f7d68160580aa1bf7ccabdb32ab2efaf9;p=ceph.git

qa/workunits/cephtool/test.sh: remove heap cli tests

"heap" cli commands are removed in the big asok/tell cleanup, they are now
asock commands.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index f8a0d7efeeb..6fc17516578 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2489,32 +2489,12 @@ function test_mon_osd_misc()
   expect_false ceph osd reweight-by-pg 110 boguspoolasdfasdfasdf
 }
 
-function test_mon_heap_profiler()
-{
-  do_test=1
-  set +e
-  # expect 'heap' commands to be correctly parsed
-  ceph heap stats 2>$TMPFILE
-  if [[ $? -eq 22 && `grep 'tcmalloc not enabled' $TMPFILE` ]]; then
-    echo "tcmalloc not enabled; skip heap profiler test"
-    do_test=0
-  fi
-  set -e
-
-  [[ $do_test -eq 0 ]] && return 0
-
-  ceph heap start_profiler
-  ceph heap dump
-  ceph heap stop_profiler
-  ceph heap release
-}
-
 function test_admin_heap_profiler()
 {
   do_test=1
   set +e
   # expect 'heap' commands to be correctly parsed
-  ceph heap stats 2>$TMPFILE
+  ceph daemon osd.0 heap stats 2>$TMPFILE
   if [[ $? -eq 22 && `grep 'tcmalloc not enabled' $TMPFILE` ]]; then
     echo "tcmalloc not enabled; skip heap profiler test"
     do_test=0
@@ -2837,7 +2817,6 @@ MON_TESTS+=" mon_osd_pool_set"
 MON_TESTS+=" mon_osd_tiered_pool_set"
 MON_TESTS+=" mon_osd_erasure_code"
 MON_TESTS+=" mon_osd_misc"
-MON_TESTS+=" mon_heap_profiler"
 MON_TESTS+=" mon_tell"
 MON_TESTS+=" mon_ping"
 MON_TESTS+=" mon_deprecated_commands"