svn commit: r1082371 - in /incubator/tashi/branches/stablefix: ./ doc/DEVELOPMENT src/tashi/clustermanager/data/fromconfig.py src/tashi/nodemanager/nodemanager.py src/tashi/nodemanager/nodemanagerservice.py src/tashi/nodemanager/vmcontrol/qemu.py

[st...@apache.org]

Author: stroucki
Date: Thu Mar 17 01:37:02 2011
New Revision: 1082371

URL: http://svn.apache.org/viewvc?rev=1082371&view=rev
Log:
Bring in changes from deployment at CMU (stable branch)   
   * Support booting from virtio disks (only one disk can be set bootable)
   * Don't raise exception when starting nodemanager up for first time and its database file doesn't exist
   * Using "with" in python 2.5 environment requires import from future
   * Change hashbang line to make program killable using killall

Added:
    incubator/tashi/branches/stablefix/
      - copied from r1081942, incubator/tashi/trunk/
    incubator/tashi/branches/stablefix/doc/DEVELOPMENT
      - copied unchanged from r1081943, incubator/tashi/trunk/doc/DEVELOPMENT
Modified:
    incubator/tashi/branches/stablefix/src/tashi/clustermanager/data/fromconfig.py
    incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanager.py
    incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanagerservice.py
    incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py

Modified: incubator/tashi/branches/stablefix/src/tashi/clustermanager/data/fromconfig.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stablefix/src/tashi/clustermanager/data/fromconfig.py?rev=1082371&r1=1081942&r2=1082371&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/tashi/clustermanager/data/fromconfig.py (original)
+++ incubator/tashi/branches/stablefix/src/tashi/clustermanager/data/fromconfig.py Thu Mar 17 01:37:02 2011
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.    
 
+from __future__ import with_statement
 import threading
 import os
 import ConfigParser

Modified: incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanager.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanager.py?rev=1082371&r1=1081942&r2=1082371&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanager.py (original)
+++ incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanager.py Thu Mar 17 01:37:02 2011
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

Modified: incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanagerservice.py?rev=1082371&r1=1081942&r2=1082371&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanagerservice.py (original)
+++ incubator/tashi/branches/stablefix/src/tashi/nodemanager/nodemanagerservice.py Thu Mar 17 01:37:02 2011
@@ -76,8 +76,7 @@ class NodeManagerService(object):
 			f.close()
 			self.instances = cPickle.loads(data)
 		except Exception, e:
-# this fails reasonably often. should probably not be a verbose exception
-			self.log.exception('Failed to load VM info from %s' % (self.infoFile))
+			self.log.warning('Failed to load VM info from %s' % (self.infoFile))
 			self.instances = {}
 	
 	def saveVmInfo(self):

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=1082371&r1=1081942&r2=1082371&view=diff
==============================================================================
--- incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/branches/stablefix/src/tashi/nodemanager/vmcontrol/qemu.py Thu Mar 17 01:37:02 2011
@@ -338,7 +338,7 @@ class Qemu(VmControlInterface):
 			thisDiskList.append("if=%s" % diskInterface)
 			thisDiskList.append("index=%d" % index)
 
-			if (diskInterface == "virtio"):
+			if (index == 0 and diskInterface == "virtio"):
 				thisDiskList.append("boot=on")
 
 			if (disk.persistent):