min target kb doesn't seem to be exposed anymore

diff --git a/debian/changelog b/debian/changelog
index 95a7429..59ca679 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ invirt-remote (0.4.16) unstable; urgency=low
 
  -- Peter A. Iannucci <iannucci@mit.edu>  Tue, 28 May 2013 20:19:00 -0400
 
 
  -- Peter A. Iannucci <iannucci@mit.edu>  Tue, 28 May 2013 20:19:00 -0400
 

+invirt-remote (0.4.15~glasgall9) precise; urgency=low
+
+  * Xen dom0 minimum target memory doesn't seem to be exposed
+    anymore. Temporarily (?) trust the admin to set dom0-min-mem properly.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Wed, 24 Apr 2013 21:43:55 -0400
+

 invirt-remote (0.4.15~glasgall8) precise; urgency=low
 
   * Oops, right, Python doesn't auto-coerce strings to ints. Thankfully.
 invirt-remote (0.4.15~glasgall8) precise; urgency=low
 
   * Oops, right, Python doesn't auto-coerce strings to ints. Thankfully.

diff --git a/host/usr/sbin/invirt-availability b/host/usr/sbin/invirt-availability
index 729c229..70306dd 100644 (file)
--- a/host/usr/sbin/invirt-availability
+++ b/host/usr/sbin/invirt-availability
@@ -35,7 +35,9 @@ def main(argv):
     free_memory = int(xminfo['free_memory']) * 1024
 
     currentallocation = int(open('/sys/devices/system/xen_memory/xen_memory0/info/current_kb', 'r').read())
     free_memory = int(xminfo['free_memory']) * 1024
 
     currentallocation = int(open('/sys/devices/system/xen_memory/xen_memory0/info/current_kb', 'r').read())

-    minimumtarget = int(open('/sys/devices/system/xen_memory/xen_memory0/target_kb', 'r').read())
+# this information seems to have vanished in recent linux - we _want_ min_target_kb, but it doesn't seem to be
+# exposed anymore.
+#    minimumtarget = int(open('/sys/devices/system/xen_memory/xen_memory0/target_kb', 'r').read())

     p = Popen(['/usr/sbin/xm', 'info', '-c'], stdout=PIPE)
     output = p.communicate()[0]
     if p.returncode != 0:
     p = Popen(['/usr/sbin/xm', 'info', '-c'], stdout=PIPE)
     output = p.communicate()[0]
     if p.returncode != 0:

@@ -46,7 +48,8 @@ def main(argv):
     # In kibibytes
     dom0minmem = int(xminfoc['dom0-min-mem']) * 1024
 
     # In kibibytes
     dom0minmem = int(xminfoc['dom0-min-mem']) * 1024
 

-    dom0_spare_memory = currentallocation - max(minimumtarget, dom0minmem)
+#    dom0_spare_memory = currentallocation - max(minimumtarget, dom0minmem)
+    dom0_spare_memory = currentallocation - dom0minmem

     print int((free_memory + dom0_spare_memory)/1024)
     return 0
 
     print int((free_memory + dom0_spare_memory)/1024)
     return 0