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/03/07 19:31:42 UTC
svn commit: r1298051 - in /incubator/tashi/trunk: INSTALL
src/tashi/client/tashi-client.py
src/tashi/clustermanager/data/getentoverride.py
src/tashi/nodemanager/nodemanagerservice.py src/tashi/util.py
Author: stroucki
Date: Wed Mar 7 19:31:42 2012
New Revision: 1298051
URL: http://svn.apache.org/viewvc?rev=1298051&view=rev
Log:
INSTALL: update documentation
tashi-client: clean banner message
getentoverride: fix bug, import data types
nodemanagerservice: make note for future improvement
util.py: ipython and python versions can diverge. try to pick correct shell embedding another way.
Modified:
incubator/tashi/trunk/INSTALL
incubator/tashi/trunk/src/tashi/client/tashi-client.py
incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py
incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
incubator/tashi/trunk/src/tashi/util.py
Modified: incubator/tashi/trunk/INSTALL
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/INSTALL?rev=1298051&r1=1298050&r2=1298051&view=diff
==============================================================================
--- incubator/tashi/trunk/INSTALL (original)
+++ incubator/tashi/trunk/INSTALL Wed Mar 7 19:31:42 2012
@@ -124,6 +124,7 @@ When defining the host, you must provide
given by the hostname command. If you plan on eventually having several
hosts and networks, feel free to add them now.
+root@grml:/usr/local/tashi# cd bin
root@grml:/usr/local/tashi/bin# DEBUG=1 ./clustermanager
2012-01-26 23:12:33,972 [./clustermanager:INFO] Using configuration file(s) ['/usr/local/tashi/etc/TashiDefaults.cfg']
2012-01-26 23:12:33,972 [./clustermanager:INFO] Starting cluster manager
@@ -158,9 +159,8 @@ In [3]: data.baseDataObject.networks[1]=
In [4]: data.baseDataObject.save()
-In [5]: import os
-
-In [6]: os.kill(os.getpid(), 9)
+In [5]: (^C)
+2012-03-07 20:00:00,456 [./bin/clustermanager:INFO] Exiting cluster manager after receiving a SIGINT signal
Run the cluster manager in the background:
root@grml:/usr/local/tashi/bin# ./clustermanager &
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=1298051&r1=1298050&r2=1298051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/tashi-client.py (original)
+++ incubator/tashi/trunk/src/tashi/client/tashi-client.py Wed Mar 7 19:31:42 2012
@@ -340,7 +340,8 @@ def usage(func = None):
print "Unknown function %s" % (func)
print
functions = argLists
- print "%s is the client program for Tashi, a system for cloud-computing on BigData." % (os.path.basename(sys.argv[0]))
+ print "%s is the client program for Tashi" % (os.path.basename(sys.argv[0]))
+ print "Tashi, a system for cloud-computing on BigData"
print "Visit http://incubator.apache.org/tashi/ for more information."
print
else:
Modified: incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py?rev=1298051&r1=1298050&r2=1298051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py Wed Mar 7 19:31:42 2012
@@ -19,7 +19,7 @@ import logging
import subprocess
import time
import os
-from tashi.rpycservices.rpyctypes import User, LocalImages
+from tashi.rpycservices.rpyctypes import User, LocalImages, Instance, Host
from tashi.clustermanager.data import DataInterface
from tashi.util import instantiateImplementation, humanReadable
@@ -66,7 +66,7 @@ class GetentOverride(DataInterface):
return self.baseDataObject.acquireHost(hostId)
def releaseHost(self, host):
- if type(host) is not Instance:
+ if type(host) is not Host:
self.log.exception("Argument is not of type Host, but of type %s" % (type(host)))
raise TypeError
Modified: incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py?rev=1298051&r1=1298050&r2=1298051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py Wed Mar 7 19:31:42 2012
@@ -76,6 +76,8 @@ class NodeManagerService(object):
self.__registerHost()
+ # XXXstroucki: should make an effort to retry
+ # otherwise vmm will wait forever
self.id = self.cm.registerNodeManager(self.host, self.instances.values())
# XXXstroucki cut cross check for NM/VMM state
Modified: incubator/tashi/trunk/src/tashi/util.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/util.py?rev=1298051&r1=1298050&r2=1298051&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/util.py (original)
+++ incubator/tashi/trunk/src/tashi/util.py Wed Mar 7 19:31:42 2012
@@ -212,10 +212,10 @@ def getConfig(additionalNames=[], additi
return (config, configFiles)
def __getShellFn(globalDict):
- if sys.version_info < (2, 6, 1):
+ try:
from IPython.Shell import IPShellEmbed
return IPShellEmbed(user_ns=globalDict)
- else:
+ except ImportError:
import IPython
return IPython.embed(user_ns=globalDict)