commit fb73a8fc6fa8cdc826b10c47490bc47cd0e6776a
author Jenkins <jenkins@review.openstack.org> Fri Mar 24 12:59:24 2017 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 24 12:59:24 2017 +0000
tree 635f5874e9f600572c74b4c0527602302443f92d
parent 9f95d171a9066d6291a2cd3a1392787dd21aac1a
parent 5ae945244ec22634f95897cb50e44fb7c2da43a6

Merge "run memory_tracker as root"

lib/dstat

diff --git a/lib/dstat b/lib/dstat
index 62795f5..517e423 100644
--- a/lib/dstat
+++ b/lib/dstat
@@ -24,12 +24,12 @@
     # To enable memory_tracker add:
     #    enable_service memory_tracker
     # to your localrc
-    run_process memory_tracker "$TOP_DIR/tools/memory_tracker.sh"
+    run_process memory_tracker "sudo $TOP_DIR/tools/memory_tracker.sh"
 
     # remove support for the old name when it's no longer used (sometime in Queens)
     if is_service_enabled peakmem_tracker; then
         deprecated "Use of peakmem_tracker in devstack is deprecated, use memory_tracker instead"
-        run_process peakmem_tracker "$TOP_DIR/tools/memory_tracker.sh"
+        run_process peakmem_tracker "sudo $TOP_DIR/tools/memory_tracker.sh"
     fi
 }
 

tools/memory_tracker.sh

diff --git a/tools/memory_tracker.sh b/tools/memory_tracker.sh
index dac0267..7397c03 100755
--- a/tools/memory_tracker.sh
+++ b/tools/memory_tracker.sh
@@ -86,7 +86,7 @@
             # list processes that lock memory from swap
             if [[ $unevictable -ne $unevictable_point ]]; then
                 unevictable_point=$unevictable
-                sudo ./tools/mlock_report.py
+                ./tools/mlock_report.py
             fi
 
             echo "]]]"