incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1297659 - in /incubator/tashi/trunk: ./ etc/ src/tashi/ src/tashi/agents/ src/tashi/client/ src/tashi/messaging/ src/tashi/nodemanager/vmcontrol/ src/tashi/thrift/ src/utils/
Date Tue, 06 Mar 2012 19:19:51 GMT
Author: stroucki
Date: Tue Mar  6 19:19:51 2012
New Revision: 1297659

URL: http://svn.apache.org/viewvc?rev=1297659&view=rev
Log:
merge stroucki-dropthrift by lazy consensus

Removed:
    incubator/tashi/trunk/src/tashi/agents/locality-server.py
    incubator/tashi/trunk/src/tashi/client/client.py
    incubator/tashi/trunk/src/tashi/client/test.py
    incubator/tashi/trunk/src/tashi/messaging/messageBroker.py
    incubator/tashi/trunk/src/tashi/messaging/messaging.py
    incubator/tashi/trunk/src/tashi/messaging/soapmessaging.py
    incubator/tashi/trunk/src/tashi/messaging/tashimessaging.py
    incubator/tashi/trunk/src/tashi/messaging/threadpool.py
    incubator/tashi/trunk/src/tashi/messaging/thriftmessaging.py
    incubator/tashi/trunk/src/tashi/thrift/
    incubator/tashi/trunk/src/utils/Makefile
    incubator/tashi/trunk/src/utils/getLocality.py
    incubator/tashi/trunk/src/utils/nmd.c
Modified:
    incubator/tashi/trunk/   (props changed)
    incubator/tashi/trunk/etc/NodeManager.cfg
    incubator/tashi/trunk/etc/TashiDefaults.cfg
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
    incubator/tashi/trunk/src/tashi/util.py

Propchange: incubator/tashi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 19:19:51 2012
@@ -3,6 +3,7 @@
 /incubator/tashi/branches/stablefix:1203848-1241770
 /incubator/tashi/branches/stroucki-accounting:1221525-1295369
 /incubator/tashi/branches/stroucki-accounting/branches/stroucki-accounting:1221525-1235607
+/incubator/tashi/branches/stroucki-dropthrift:1292513-1297655
 /incubator/tashi/branches/stroucki-irpbugs:1245857-1292894
 /incubator/tashi/branches/stroucki-slotsbug:1244839-1245041
 /incubator/tashi/branches/stroucki-tashi10:1294393-1294727

Modified: incubator/tashi/trunk/etc/NodeManager.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/NodeManager.cfg?rev=1297659&r1=1297658&r2=1297659&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/NodeManager.cfg (original)
+++ incubator/tashi/trunk/etc/NodeManager.cfg Tue Mar  6 19:19:51 2012
@@ -80,7 +80,6 @@ clusterManagerPort = 9882
 statsInterval = 0.0
 ;accountingHost = clustermanager
 ;accountingPort = 2228
-;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
 
 [Security]
 authAndEncrypt = False

Modified: incubator/tashi/trunk/etc/TashiDefaults.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/TashiDefaults.cfg?rev=1297659&r1=1297658&r2=1297659&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/TashiDefaults.cfg (original)
+++ incubator/tashi/trunk/etc/TashiDefaults.cfg Tue Mar  6 19:19:51 2012
@@ -57,7 +57,6 @@ maxCores = 8
 allowDuplicateNames = False
 ;accountingHost = clustermanager
 ;accountingPort = 2228
-;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
 
 [GetentOverride]
 baseData = tashi.clustermanager.data.Pickled
@@ -110,7 +109,6 @@ registerFrequency = 10.0
 clusterManagerHost = localhost 
 clusterManagerPort = 9882
 statsInterval = 0.0
-;bind = 0.0.0.0 ; not supported (Thrift is missing support to specify what to bind to!)
 
 [Qemu]
 qemuBin = /usr/bin/kvm

Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py?rev=1297659&r1=1297658&r2=1297659&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py Tue Mar  6 19:19:51 2012
@@ -28,7 +28,7 @@ from vmcontrolinterface import VmControl
 from tashi.rpycservices.rpyctypes import Errors, InstanceState, TashiException
 from tashi.rpycservices.rpyctypes import Instance, Host
 from tashi import boolean, convertExceptions, ConnectionManager, version
-from tashi.util import isolatedRPC, broken
+from tashi.util import broken
 
 import tashi.parallel
 from tashi.parallel import synchronized, synchronizedmethod

Modified: incubator/tashi/trunk/src/tashi/util.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/util.py?rev=1297659&r1=1297658&r2=1297659&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/util.py (original)
+++ incubator/tashi/trunk/src/tashi/util.py Tue Mar  6 19:19:51 2012
@@ -149,14 +149,6 @@ class reference(object):
 	def __delattr__(self, name):
 		return delattr(self.__dict__['__real_obj__'], name)
 
-def isolatedRPC(client, method, *args, **kw):
-	"""Opens and closes a thrift transport for a single RPC call"""
-	if (not client._iprot.trans.isOpen()):
-		client._iprot.trans.open()
-	res = getattr(client, method)(*args, **kw)
-	client._iprot.trans.close()
-	return res
-
 def signalHandler(signalNumber):
 	"""Used to denote a particular function as the signal handler for a 
 	   specific signal"""
@@ -193,7 +185,7 @@ def instantiateImplementation(className,
 
 def convertExceptions(oldFunc):
 	"""This converts any exception type into a TashiException so that 
-	   it can be passed over a Thrift RPC"""
+	   it can be passed over an RPC"""
 	def newFunc(*args, **kw):
 		try:
 			return oldFunc(*args, **kw)



Mime
View raw message