Author: justi9 Date: 2009-08-12 15:10:39 -0400 (Wed, 12 Aug 2009) New Revision: 3572 Modified: mgmt/trunk/mint/python/mint/main.py mgmt/trunk/mint/python/mint/model.py mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/python/mint/schemaparser.py mgmt/trunk/mint/python/mint/tools.py mgmt/trunk/mint/python/mint/update.py mgmt/trunk/mint/xml/Makefile Log: Note that this change requires reloading your schema * Fix the URL for fetching the condor schema * An experimental fix to convert unsigned 64-bit scope and object ids to signed types instead; postgres can't consume the former Submissions were failing to show up due to this * Don't use the queue to process method updates; instead process them immediately * Remove the method update accounting that had existed for mint-bench * Update to the latest schema * Add a method to fetch the (host, port) for a given vhost Modified: mgmt/trunk/mint/python/mint/main.py =================================================================== --- mgmt/trunk/mint/python/mint/main.py 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/python/mint/main.py 2009-08-12 19:10:39 UTC (rev 3572) @@ -117,3 +117,9 @@ if self.debug: enable_logging("mint", "debug", sys.stderr) + +def get_addr_for_vhost(vhost): + broker = vhost.broker + host = broker.system.nodeName + port = broker.port + return (host, port) Modified: mgmt/trunk/mint/python/mint/model.py =================================================================== --- mgmt/trunk/mint/python/mint/model.py 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/python/mint/model.py 2009-08-12 19:10:39 UTC (rev 3572) @@ -380,15 +380,16 @@ return self.heartbeatsByAgentId.get(key) def methodResponse(self, broker, seq, response): - # XXX don't do this via the update thread? + log.debug("Method response for request %i received from %s", seq, broker) + log.debug("Response: %s", response) - if not self.app.updateThread.isAlive(): - return + self.lock() - mbroker = self.getMintBrokerByQmfBroker(broker) - up = update.MethodUpdate(self, mbroker, seq, response) + try: + methodCallback = self.outstandingMethodCalls.pop(seq) + methodCallback(response.text, response.outArgs) + finally: + self.unlock() - self.app.updateThread.enqueue(up) - def getAgentDBId(self, agent, brokerId): return "%s.%d.%d" % (brokerId, agent.getBrokerBank(), agent.getAgentBank()) Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/python/mint/schema.py 2009-08-12 19:10:39 UTC (rev 3572) @@ -184,7 +184,7 @@ actualArgs = list() if JobAd is not None: actualArgs.append(JobAd) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetAd", callback, args=actualArgs) @@ -194,7 +194,7 @@ actualArgs.append(Name) if Value is not None: actualArgs.append(Value) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetAttribute", callback, args=actualArgs) @@ -202,7 +202,7 @@ actualArgs = list() if Reason is not None: actualArgs.append(Reason) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Hold", callback, args=actualArgs) @@ -210,7 +210,7 @@ actualArgs = list() if Reason is not None: actualArgs.append(Reason) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Release", callback, args=actualArgs) @@ -218,7 +218,7 @@ actualArgs = list() if Reason is not None: actualArgs.append(Reason) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Remove", callback, args=actualArgs) @@ -232,7 +232,7 @@ actualArgs.append(End) if Data is not None: actualArgs.append(Data) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Fetch", callback, args=actualArgs) @@ -284,7 +284,7 @@ actualArgs.append(Ad) if Id is not None: actualArgs.append(Id) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Submit", callback, args=actualArgs) @@ -294,7 +294,7 @@ actualArgs.append(Id) if JobAd is not None: actualArgs.append(JobAd) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetAd", callback, args=actualArgs) @@ -306,7 +306,7 @@ actualArgs.append(Name) if Value is not None: actualArgs.append(Value) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetAttribute", callback, args=actualArgs) @@ -316,7 +316,7 @@ actualArgs.append(Id) if Reason is not None: actualArgs.append(Reason) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Hold", callback, args=actualArgs) @@ -326,7 +326,7 @@ actualArgs.append(Id) if Reason is not None: actualArgs.append(Reason) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Release", callback, args=actualArgs) @@ -336,7 +336,7 @@ actualArgs.append(Id) if Reason is not None: actualArgs.append(Reason) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Remove", callback, args=actualArgs) @@ -352,10 +352,42 @@ actualArgs.append(End) if Data is not None: actualArgs.append(Data) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Fetch", callback, args=actualArgs) + def GetStates(self, model, callback, Submission, State, Count): + actualArgs = list() + if Submission is not None: + actualArgs.append(Submission) + if State is not None: + actualArgs.append(State) + if Count is not None: + actualArgs.append(Count) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) + model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetStates", + callback, args=actualArgs) + + def GetJobs(self, model, callback, Submission, Jobs): + actualArgs = list() + if Submission is not None: + actualArgs.append(Submission) + if Jobs is not None: + actualArgs.append(Jobs) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) + model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetJobs", + callback, args=actualArgs) + + def echo(self, model, callback, sequence, body): + actualArgs = list() + if sequence is not None: + actualArgs.append(sequence) + if body is not None: + actualArgs.append(body) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) + model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "echo", + callback, args=actualArgs) + class SchedulerStats(SQLObject): class sqlmeta: lazyUpdate = True @@ -450,7 +482,7 @@ actualArgs = list() if Limits is not None: actualArgs.append(Limits) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetLimits", callback, args=actualArgs) @@ -460,7 +492,7 @@ actualArgs.append(Name) if Max is not None: actualArgs.append(Max) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetLimit", callback, args=actualArgs) @@ -470,7 +502,7 @@ actualArgs.append(Name) if Ad is not None: actualArgs.append(Ad) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetStats", callback, args=actualArgs) @@ -480,7 +512,7 @@ actualArgs.append(Name) if Priority is not None: actualArgs.append(Priority) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetPriority", callback, args=actualArgs) @@ -490,7 +522,7 @@ actualArgs.append(Name) if PriorityFactor is not None: actualArgs.append(PriorityFactor) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetPriorityFactor", callback, args=actualArgs) @@ -500,7 +532,7 @@ actualArgs.append(Name) if Usage is not None: actualArgs.append(Usage) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetUsage", callback, args=actualArgs) @@ -510,7 +542,7 @@ actualArgs.append(Name) if Value is not None: actualArgs.append(Value) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetRawConfig", callback, args=actualArgs) @@ -520,13 +552,13 @@ actualArgs.append(Name) if Value is not None: actualArgs.append(Value) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetRawConfig", callback, args=actualArgs) def Reconfig(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Reconfig", callback, args=actualArgs) @@ -624,7 +656,7 @@ actualArgs = list() if Subsystem is not None: actualArgs.append(Subsystem) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Start", callback, args=actualArgs) @@ -632,7 +664,7 @@ actualArgs = list() if Subsystem is not None: actualArgs.append(Subsystem) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Stop", callback, args=actualArgs) @@ -763,7 +795,7 @@ def reloadACLFile(self, model, callback): """Reload the ACL file""" actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "reloadACLFile", callback, args=actualArgs) @@ -811,13 +843,13 @@ actualArgs = list() if brokerId is not None: actualArgs.append(brokerId) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "stopClusterNode", callback, args=actualArgs) def stopFullCluster(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "stopFullCluster", callback, args=actualArgs) @@ -919,7 +951,7 @@ actualArgs = list() if by is not None: actualArgs.append(by) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "expand", callback, args=actualArgs) @@ -1034,7 +1066,7 @@ actualArgs.append(sequence) if body is not None: actualArgs.append(body) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "echo", callback, args=actualArgs) @@ -1055,7 +1087,7 @@ actualArgs.append(password) if transport is not None: actualArgs.append(transport) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "connect", callback, args=actualArgs) @@ -1068,7 +1100,7 @@ actualArgs.append(destQueue) if qty is not None: actualArgs.append(qty) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "queueMoveMessages", callback, args=actualArgs) @@ -1183,7 +1215,7 @@ actualArgs = list() if request is not None: actualArgs.append(request) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "purge", callback, args=actualArgs) @@ -1338,7 +1370,7 @@ def close(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close", callback, args=actualArgs) @@ -1384,7 +1416,7 @@ def close(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close", callback, args=actualArgs) @@ -1411,7 +1443,7 @@ actualArgs.append(dynamic) if sync is not None: actualArgs.append(sync) - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "bridge", callback, args=actualArgs) @@ -1461,7 +1493,7 @@ def close(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close", callback, args=actualArgs) @@ -1505,25 +1537,25 @@ def solicitAck(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "solicitAck", callback, args=actualArgs) def detach(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "detach", callback, args=actualArgs) def resetLifespan(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "resetLifespan", callback, args=actualArgs) def close(self, model, callback): actualArgs = list() - originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId) + originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L) model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close", callback, args=actualArgs) Modified: mgmt/trunk/mint/python/mint/schemaparser.py =================================================================== --- mgmt/trunk/mint/python/mint/schemaparser.py 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/python/mint/schemaparser.py 2009-08-12 19:10:39 UTC (rev 3572) @@ -198,7 +198,7 @@ self.pythonOutput += "\n def %s(self, model, callback%s):\n" % (elem["@name"], formalArgs) self.pythonOutput += comment self.pythonOutput += actualArgs - self.pythonOutput += " originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)\n" + self.pythonOutput += " originalId = ObjectId(None, self.qmfScopeId + 9223372036854775808L, self.qmfObjectId + 9223372036854775808L)\n" self.pythonOutput += " model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, \"%s\",\n" % elem["@name"] self.pythonOutput += " callback, args=actualArgs)\n" Modified: mgmt/trunk/mint/python/mint/tools.py =================================================================== --- mgmt/trunk/mint/python/mint/tools.py 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/python/mint/tools.py 2009-08-12 19:10:39 UTC (rev 3572) @@ -144,10 +144,10 @@ app.init() app.start() - head = "%6s %6s %6s %6s %6s %6s %6s %6s %6s" % \ + head = "%6s %6s %6s %6s %6s %6s %6s %6s" % \ ("enqs", "deqs", "depth", "drop", "defer", - "prop", "stat", "meth", "exp") - row = "%6i %6i %6i %6i %6i %6i %6i %6i %6i" + "prop", "stat", "exp") + row = "%6i %6i %6i %6i %6i %6i %6i %6i" try: for arg in args[1:]: @@ -185,7 +185,6 @@ prop = ut.propUpdateCount stat = ut.statUpdateCount - meth = ut.methUpdateCount exp = ut.expireUpdateCount print row % (enq - enq_last, @@ -195,7 +194,6 @@ dfr - dfr_last, prop - prop_last, stat - stat_last, - meth - meth_last, exp - exp_last) enq_last = enq @@ -205,7 +203,6 @@ prop_last = prop stat_last = stat - meth_last = meth exp_last = exp finally: print "Totals:" @@ -217,7 +214,6 @@ dfr, prop, stat, - meth, exp) finally: #from threading import enumerate Modified: mgmt/trunk/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/python/mint/update.py 2009-08-12 19:10:39 UTC (rev 3572) @@ -31,7 +31,6 @@ self.dequeueCount = 0 self.statUpdateCount = 0 self.propUpdateCount = 0 - self.methUpdateCount = 0 self.expireUpdateCount = 0 self.dropCount = 0 self.deferCount = 0 @@ -237,8 +236,8 @@ log.debug("%s(%s) marked deleted", cls.__name__, oid) - attrs["qmfScopeId"] = oid.first - attrs["qmfObjectId"] = oid.second + attrs["qmfScopeId"] = oid.first - 9223372036854775808L + attrs["qmfObjectId"] = oid.second - 9223372036854775808L attrs["qmfClassKey"] = str(self.object.getClassKey()) qmfBrokerId = str(self.broker.qmfBroker.getBrokerId()) attrs["qmfBrokerId"] = qmfBrokerId @@ -379,23 +378,6 @@ thread.statUpdateCount += 1 -class MethodUpdate(ModelUpdate): - def __init__(self, model, broker, seq, response): - super(MethodUpdate, self).__init__(model, broker, response) - - self.seq = seq - - def process(self, thread): - self.model.lock() - - try: - methodCallback = self.model.outstandingMethodCalls.pop(self.seq) - methodCallback(self.object.text, self.object.outArgs) - finally: - self.model.unlock() - - thread.methUpdateCount += 1 - class ExpireUpdate(ModelUpdate): def __init__(self, model): super(ExpireUpdate, self).__init__(model, None, None) Modified: mgmt/trunk/mint/xml/Makefile =================================================================== --- mgmt/trunk/mint/xml/Makefile 2009-08-12 18:47:08 UTC (rev 3571) +++ mgmt/trunk/mint/xml/Makefile 2009-08-12 19:10:39 UTC (rev 3572) @@ -20,7 +20,7 @@ svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/src/qpid/cluster/mana... qpid-cluster.xml condor.xml: - wget "http://git.et.redhat.com/?p=mrg-grid.git;a=blob_plain;f=src/management/condor-management-schema.xml;hb=refs/heads/V7.3-QMF-Plugins" -O condor.xml + wget "http://git.et.redhat.com/?p=mrg-grid.git;a=blob_plain;f=src/management/condor-management-schema.xml;hb=refs/heads/V7.3-QMF" -O condor.xml sesame.xml: svn export http://anonsvn.jboss.org/repos/rhmessaging/mgmt/trunk/sesame/cpp/src/qmfg... sesame.xml