From: David Zafman <dzafman@redhat.com>
Date: Wed, 19 Apr 2017 23:54:07 +0000 (-0700)
Subject: test: Fix test_admin_heap_profiler() and enable it
X-Git-Tag: v12.0.3~321^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1474d0f233e5c7d80009437da48b0bb207486ef6;p=ceph.git

test: Fix test_admin_heap_profiler() and enable it

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 7ce6eba213c..fc58e438080 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1816,12 +1816,12 @@ function test_admin_heap_profiler()
 
   [[ $do_test -eq 0 ]] && return 0
 
-  admin_socket = "--admin-daemon out/osd.0.asok"
+  local admin_socket=$(get_admin_socket osd.0)
 
-  ceph --admin $admin_socket heap start_profiler
-  ceph --admin $admin_socket heap dump
-  ceph --admin $admin_socket heap stop_profiler
-  ceph --admin $admin_socket heap release
+  $SUDO ceph --admin-daemon $admin_socket heap start_profiler
+  $SUDO ceph --admin-daemon $admin_socket heap dump
+  $SUDO ceph --admin-daemon $admin_socket heap stop_profiler
+  $SUDO ceph --admin-daemon $admin_socket heap release
 }
 
 function test_osd_bench()
@@ -2049,6 +2049,7 @@ MON_TESTS+=" mon_cephdf_commands"
 OSD_TESTS+=" osd_bench"
 OSD_TESTS+=" osd_negative_filestore_merge_threshold"
 OSD_TESTS+=" tiering_agent"
+OSD_TESTS+=" admin_heap_profiler"
 
 MDS_TESTS+=" mds_tell"
 MDS_TESTS+=" mon_mds"