From c87bce67ac12ee37f8257efd02ab62fe19336b32 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 9 Dec 2009 16:58:51 +0000
Subject: QPID-2253 -  Cluster node shuts down with inconsistent error.

Add a missing memberUpdate on the transition to CATCHUP mode.
The inconsistent error was caused because the newly updated member
did not have its membership updated and so was missing an failover
update message that the existing members sent to a new client.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@888874 13f79535-47bb-0310-9956-ffa450edef68
---
 python/qpid/brokertest.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'python')

diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py
index c3145c06ea..9fa79a220b 100644
--- a/python/qpid/brokertest.py
+++ b/python/qpid/brokertest.py
@@ -89,6 +89,7 @@ class Popen(popen2.Popen3):
         self.stdout = ExceptionWrapper(self.fromchild, msg)
         self.stderr = ExceptionWrapper(self.childerr, msg)
         self.dump(self.cmd_str(), "cmd")
+        log.debug("Started process %s" % self.pname)
 
     def dump(self, str, ext):
         name = "%s.%s" % (self.pname, ext)
@@ -107,7 +108,7 @@ class Popen(popen2.Popen3):
             try:
                 self.kill()
             except:
-                self.unexpected("Exit code %d" % self.wait())
+                self.unexpected("expected running, exit code %d" % self.wait())
         else:
             # Give the process some time to exit.
             delay = 0.1
@@ -393,13 +394,11 @@ class NumberedSender(Thread):
         self.condition.release()
 
     def stop(self):
-        log.debug("NumberedSender.stop")
         self.condition.acquire()
         self.stopped = True
         self.condition.notify()
         self.condition.release()
         self.join()
-        log.debug("NumberedSender.stop - joined")
         if self.error: raise self.error
         
 class NumberedReceiver(Thread):
@@ -437,18 +436,14 @@ class NumberedReceiver(Thread):
                     if self.sender:
                         self.sender.notify_received(self.received)
         except Exception, e:
-            log.debug("NumberedReceiver.run exception %s" % (e)) # FIXME aconway 2009-12-02: 
             self.error = RethrownException(e, self.receiver.pname)
 
     def stop(self, count):
         """Returns when received >= count"""
-        log.debug("NumberedReceiver.stop") # FIXME aconway 2009-12-02: 
         self.lock.acquire()
-        log.debug("NumberedReceiver.stop at %d, received=%d" % (count, self.received))
         self.stopat = count
         self.lock.release()
         self.join()
-        log.debug("NumberedReceiver.stop - joined")
         if self.error: raise self.error
 
 class ErrorGenerator(StoppableThread):
-- 
cgit v1.2.1