incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1202825 - in /incubator/tashi/trunk: ./ src/tashi/clustermanager/clustermanagerservice.py
Date Wed, 16 Nov 2011 18:28:56 GMT
Author: stroucki
Date: Wed Nov 16 18:28:56 2011
New Revision: 1202825

URL: http://svn.apache.org/viewvc?rev=1202825&view=rev
Log:
revert change to remove accounting data

Modified:
    incubator/tashi/trunk/   (props changed)
    incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py

Propchange: incubator/tashi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 16 18:28:56 2011
@@ -1 +1,2 @@
+/incubator/tashi/branches/cmu:1178106-1187632
 /incubator/tashi/branches/zoni-dev/trunk:1034098-1177646

Modified: incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py?rev=1202825&r1=1202824&r2=1202825&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Wed Nov 16 18:28:56
2011
@@ -475,9 +475,10 @@ class ClusterManagerService(object):
 
 		# let the host communicate what it is running
 		# XXXrgass - This is too chatty for the console, I think we should remove this.
-		#for instance in instances:
-			#self.log.info('Accounting: id %d host %d vmId %d user %d cores %d memory %d' % (instance.id,
host.id, instance.vmId, instance.userId, instance.cores, instance.memory))
-			#self.instanceLastContactTime.setdefault(instance.id, 0)
+		# XXXstroucki - My install depends on this, but I output to log files. This should be handled
by a separate accounting server in future.
+		for instance in instances:
+			self.log.info('Accounting: id %d host %d vmId %d user %d cores %d memory %d' % (instance.id,
host.id, instance.vmId, instance.userId, instance.cores, instance.memory))
+			self.instanceLastContactTime.setdefault(instance.id, 0)
 
 		self.data.releaseHost(oldHost)
 		return host.id



Mime
View raw message