incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1187642 - in /incubator/tashi/trunk/src/tashi: client/tashi-client-hack.py clustermanager/clustermanagerservice.py
Date Sat, 22 Oct 2011 02:07:22 GMT
Author: stroucki
Date: Sat Oct 22 02:07:22 2011
New Revision: 1187642

URL: http://svn.apache.org/viewvc?rev=1187642&view=rev
Log:
merge CMU branch into trunk

Removed:
    incubator/tashi/trunk/src/tashi/client/tashi-client-hack.py
Modified:
    incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py

Modified: incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py?rev=1187642&r1=1187641&r2=1187642&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Sat Oct 22 02:07:22
2011
@@ -532,7 +532,9 @@ class ClusterManagerService(object):
 		if ('__resume_source' in instance.hints):
 			self.stateTransition(instance, InstanceState.Pending, InstanceState.Resuming)
 		else:
-			self.stateTransition(instance, InstanceState.Pending, InstanceState.Activating)
+			# XXXstroucki should held VMs be continually tried? Or be explicitly set back to pending?
+			#self.stateTransition(instance, InstanceState.Pending, InstanceState.Activating)
+			self.stateTransition(instance, None, InstanceState.Activating)
 
 		instance.hostId = host.id
 		self.data.releaseInstance(instance)



Mime
View raw message