incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1235612 - in /incubator/tashi/trunk: ./ etc/NodeManager.cfg etc/TashiDefaults.cfg scripts/ src/tashi/client/tashi-client.py src/tashi/nodemanager/vmcontrol/qemu.py
Date Wed, 25 Jan 2012 03:12:26 GMT
Author: stroucki
Date: Wed Jan 25 03:12:25 2012
New Revision: 1235612

URL: http://svn.apache.org/viewvc?rev=1235612&view=rev
Log:
merge stroucki-accounting into trunk

Removed:
    incubator/tashi/trunk/scripts/
Modified:
    incubator/tashi/trunk/   (props changed)
    incubator/tashi/trunk/etc/NodeManager.cfg
    incubator/tashi/trunk/etc/TashiDefaults.cfg
    incubator/tashi/trunk/src/tashi/client/tashi-client.py
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py

Propchange: incubator/tashi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 25 03:12:25 2012
@@ -1,4 +1,3 @@
 /incubator/tashi/branches/cmu:1178106-1187632
-/incubator/tashi/branches/stroucki-accounting:1221525-1229894
-/incubator/tashi/branches/stroucki-accounting/trunk:1221525-1235605
+/incubator/tashi/branches/stroucki-accounting:1221525-1235611
 /incubator/tashi/branches/zoni-dev/trunk:1034098-1177646

Modified: incubator/tashi/trunk/etc/NodeManager.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/NodeManager.cfg?rev=1235612&r1=1235611&r2=1235612&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/NodeManager.cfg (original)
+++ incubator/tashi/trunk/etc/NodeManager.cfg Wed Jan 25 03:12:25 2012
@@ -79,8 +79,8 @@ infoFile = /var/tmp/nm.dat
 clusterManagerHost = localhost ; Clustermanager hostname
 clusterManagerPort = 9882
 statsInterval = 0.0
-accountingHost = clustermanager
-accountingPort = 2228
+;accountingHost = clustermanager
+;accountingPort = 2228
 ;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
 
 [Security]

Modified: incubator/tashi/trunk/etc/TashiDefaults.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/TashiDefaults.cfg?rev=1235612&r1=1235611&r2=1235612&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/TashiDefaults.cfg (original)
+++ incubator/tashi/trunk/etc/TashiDefaults.cfg Wed Jan 25 03:12:25 2012
@@ -55,8 +55,8 @@ allowMismatchedVersions = False
 maxMemory = 8192
 maxCores = 8
 allowDuplicateNames = False
-accountingHost = clustermanager
-accountingPort = 2228
+;accountingHost = clustermanager
+;accountingPort = 2228
 ;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
 
 [GetentOverride]

Modified: incubator/tashi/trunk/src/tashi/client/tashi-client.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/client/tashi-client.py?rev=1235612&r1=1235611&r2=1235612&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/tashi-client.py (original)
+++ incubator/tashi/trunk/src/tashi/client/tashi-client.py Wed Jan 25 03:12:25 2012
@@ -162,6 +162,8 @@ def getSlots(cores, memory):
 	count = 0
 
 	for h in hosts:
+		if h.up is False or h.state != HostState.Normal:
+			continue
 		countbycores = int((h.cores - h.usedCores) / cores)
 		countbymemory = int((h.memory - h.usedMemory) / memory)
 		count += min(countbycores, countbymemory)

Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py?rev=1235612&r1=1235611&r2=1235612&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py Wed Jan 25 03:12:25 2012
@@ -204,7 +204,7 @@ class Qemu(VmControlInterface):
 				# remove scratch storage
 				try:
 					if self.scratchVg is not None:
-						log.info("Removing scratch for %s" % (name))
+						log.info("Removing any scratch for %s" % (name))
 						cmd = "/sbin/lvremove -f %s" % self.scratchVg
     						result = subprocess.Popen(cmd.split(), executable=cmd.split()[0], stdout=subprocess.PIPE).wait()
 				except:



Mime
View raw message