munin/tahoe-storagespace.py: use /bin/du instead of our python version, since

it a) is faster and b) will include filesystem overhead that is a real cost.

diff --git a/misc/munin/tahoe-storagespace.py b/misc/munin/tahoe-storagespace.py
index 02cccbb00d5f153a97372a4afc347f2f14d747da..87339292ea385ca455dd23bb7c065703a0b66d25 100644 (file)
--- a/misc/munin/tahoe-storagespace.py
+++ b/misc/munin/tahoe-storagespace.py
@@ -19,8 +19,7 @@
 # since it imports a utility module from allmydata.utils .
 
 import os, sys
-
-from allmydata.util import fileutil
+import commands
 
 nodedirs = []
 for k,v in os.environ.items():
@@ -48,6 +47,11 @@ if len(sys.argv) > 1:
         sys.exit(0)
 
 for nodename, basedir in nodedirs:
-    usage = fileutil.du(os.path.join(basedir, "storage"))
+    cmd = "du --bytes --summarize %s" % os.path.join(basedir, "storage")
+    rc,out = commands.getstatusoutput(cmd)
+    if rc != 0:
+        sys.exit(rc)
+    bytes, extra = out.split()
+    usage = int(bytes)
     print "%s.value %d" % (nodename, usage)