incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1235350 - /incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py
Date Tue, 24 Jan 2012 16:51:31 GMT
Author: stroucki
Date: Tue Jan 24 16:51:31 2012
New Revision: 1235350

URL: http://svn.apache.org/viewvc?rev=1235350&view=rev
Log:
qemu.py: ensure matchSystemPids does not break scanInfoDir loop

Modified:
    incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py

Modified: incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py?rev=1235350&r1=1235349&r2=1235350&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py Tue Jan 24
16:51:31 2012
@@ -182,7 +182,7 @@ class Qemu(VmControlInterface):
 				try:
 					if self.scratchVg is not None:
 						scratch_name = child.instance.name
-						log.info("Removing scratch for " + scratch_name)
+						log.info("Removing any scratch for " + scratch_name)
 						cmd = "/sbin/lvremove -f %s" % self.scratchVg
     						result = subprocess.Popen(cmd.split(), executable=cmd.split()[0], stdout=subprocess.PIPE).wait()
 				except:
@@ -230,7 +230,10 @@ class Qemu(VmControlInterface):
 			else:
 				log.info("Loaded VM info for %d", vmId)
 		# XXXstroucki NM may not be available yet here.
-		self.matchSystemPids(self.controlledVMs)
+		try:
+			self.matchSystemPids(self.controlledVMs)
+		except:
+			pass
 	
 	def pollVMsLoop(self):
 		"""Infinite loop that checks for dead VMs"""



Mime
View raw message