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 mr...@apache.org on 2009/02/20 18:36:14 UTC
svn commit: r746329 - in /incubator/tashi/trunk: etc/TashiDefaults.cfg
src/tashi/client/tashi-client.py src/tashi/clustermanager/data/pickled.py
src/tashi/nodemanager/vmcontrol/qemu.py
Author: mryan3
Date: Fri Feb 20 18:36:14 2009
New Revision: 746329
URL: http://svn.apache.org/viewvc?rev=746329&view=rev
Log:
Bug fix in qemu backend to correctly handle reloading.
Bug fix in picked data backend to correctly update the maxInstanceId variable during loading.
Cleanup type references in tashi-client.
Config file cleanup -- moved client section, removed unused configuration option, and made a more sensible default for clusterManagerHost.
Modified:
incubator/tashi/trunk/etc/TashiDefaults.cfg
incubator/tashi/trunk/src/tashi/client/tashi-client.py
incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
Modified: incubator/tashi/trunk/etc/TashiDefaults.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/TashiDefaults.cfg?rev=746329&r1=746328&r2=746329&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/TashiDefaults.cfg (original)
+++ incubator/tashi/trunk/etc/TashiDefaults.cfg Fri Feb 20 18:36:14 2009
@@ -19,7 +19,6 @@
[ClusterManager]
service = tashi.clustermanager.ClusterManagerService
data = tashi.clustermanager.data.Pickled
-sqlLogging = 0
nodeManagerPort = 9883
[ClusterManagerService]
@@ -54,15 +53,9 @@
port = 9883
registerFrequency = 10.0
infoFile = /var/tmp/nm.dat
-clusterManagerHost = fillmein
-clusterManagerPort = 9882
-;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
-
-# Client configuration
-[Client]
clusterManagerHost = localhost
clusterManagerPort = 9882
-clusterManagerTimeout = 5.0
+;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
[Qemu]
qemuBin = /usr/local/bin/qemu-system-x86_64
@@ -80,6 +73,12 @@
[Vfs]
prefix = /var/tmp/
+# Client configuration
+[Client]
+clusterManagerHost = localhost
+clusterManagerPort = 9882
+clusterManagerTimeout = 5.0
+
# Agent portion
[DhcpDnsScheduler]
dnsKeyFile = /location/of/private/key/for/dns
Modified: incubator/tashi/trunk/src/tashi/client/tashi-client.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/client/tashi-client.py?rev=746329&r1=746328&r2=746329&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/tashi-client.py (original)
+++ incubator/tashi/trunk/src/tashi/client/tashi-client.py Fri Feb 20 18:36:14 2009
@@ -342,7 +342,7 @@
def simpleType(obj):
"""Determines whether an object is a simple type -- used as a helper function to pprint"""
- if (type(obj) is not type([])):
+ if (type(obj) is not types.ListType):
if (not getattr(obj, "__dict__", None)):
return True
return False
@@ -356,7 +356,7 @@
valueManip = lambda x: vmStates[x]
else:
keyString = ""
- if (type(obj) is type([])):
+ if (type(obj) is types.ListType):
if (reduce(lambda x, y: x and simpleType(y), obj, True)):
print (" " * (depth * INDENT)) + keyString + str(obj)
else:
Modified: incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py?rev=746329&r1=746328&r2=746329&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py Fri Feb 20 18:36:14 2009
@@ -69,6 +69,8 @@
self.networks = networks
self.users = users
for i in self.instances.itervalues():
+ if (i.id >= self.maxInstanceId):
+ self.maxInstanceId = i.id + 1
i._lock = threading.Lock()
self.lockNames[i._lock] = "i%d" % (i.id)
for h in self.hosts.itervalues():
Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py?rev=746329&r1=746328&r2=746329&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py Fri Feb 20 18:36:14 2009
@@ -174,7 +174,7 @@
log.exception("Failed to load VM info for %d", vmId)
else:
log.info("Loaded VM info for %d", vmId)
- self.matchSystemPids(controlledVMs)
+ self.matchSystemPids(self.controlledVMs)
def pollVMsLoop(self):
"""Infinite loop that checks for dead VMs"""