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/07/19 22:07:35 UTC
svn commit: r1363567 -
/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
Author: stroucki
Date: Thu Jul 19 22:07:35 2012
New Revision: 1363567
URL: http://svn.apache.org/viewvc?rev=1363567&view=rev
Log:
clustermanagerservice: make comment on migration failure
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=1363567&r1=1363566&r2=1363567&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Thu Jul 19 22:07:35 2012
@@ -461,6 +461,8 @@ class ClusterManagerService(object):
raise
try:
+ # XXXstroucki: if migration fails, we'll still
+ # show MigratePrep as state...
self.__stateTransition(instance, InstanceState.Running, InstanceState.MigratePrep)
except TashiException:
self.data.releaseInstance(instance)
@@ -476,6 +478,7 @@ class ClusterManagerService(object):
except Exception:
self.log.exception('prepReceiveVm failed')
raise
+
instance = self.data.acquireInstance(instance.id)
try:
self.__stateTransition(instance, InstanceState.MigratePrep, InstanceState.MigrateTrans)