You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2012/08/06 23:37:26 UTC

svn commit: r1370062 - /incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py

Author: stroucki
Date: Mon Aug  6 23:37:26 2012
New Revision: 1370062

URL: http://svn.apache.org/viewvc?rev=1370062&view=rev
Log:
Merge branch 'assertionerror'

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=1370062&r1=1370061&r2=1370062&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Mon Aug  6 23:37:26 2012
@@ -295,7 +295,12 @@ class ClusterManagerService(object):
 
 				instance.decayed = True
 				self.log.debug('Fetching state on instance %s because it is decayed' % (instance.name))
-				if instance.hostId is None: raise AssertionError
+				if instance.hostId is None:
+					# XXXstroucki we should not have reached
+					# here. Log state of instance and raise
+					# an AssertionError
+					self.log.error("Assert failed: hostId is None with instance %s" % instance)
+					raise AssertionError
 
 				# XXXstroucki check if host is down?
 				host = self.data.getHost(instance.hostId)