You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/03/03 16:07:59 UTC
svn commit: r749627 - /qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp
Author: aconway
Date: Tue Mar 3 15:07:58 2009
New Revision: 749627
URL: http://svn.apache.org/viewvc?rev=749627&view=rev
Log:
QPID-1707 Mick Goulish. Improved failover_soak code
Modified:
qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp
Modified: qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp?rev=749627&r1=749626&r2=749627&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/failover_soak.cpp Tue Mar 3 15:07:58 2009
@@ -326,7 +326,7 @@
stringstream path, prefix, module;
module << moduleDir << "/cluster.so";
path << srcRoot << "/qpidd";
- prefix << "soak-" << brokerId++;
+ prefix << "soak-" << brokerId;
std::vector<std::string> argv =
list_of<string> ("qpidd")
@@ -345,8 +345,14 @@
ForkedBroker * broker = new ForkedBroker ( argv );
if ( verbosity > 0 )
- std::cerr << "new broker created: pid == " << broker->getPID() << endl;
+ std::cerr << "new broker created: pid == "
+ << broker->getPID()
+ << " log-prefix == "
+ << "soak-" << brokerId
+ << endl;
brokers.push_back ( broker );
+
+ ++ brokerId;
}
@@ -394,7 +400,12 @@
for ( uint i = 0; i < brokers.size(); ++ i )
try { brokers[i]->kill(9); }
- catch ( ... ) { }
+ catch ( ... )
+ {
+ std::cerr << "killAllBrokers Warning: exception during kill on broker "
+ << i
+ << endl;
+ }
}
@@ -633,8 +644,8 @@
}
- int minSleep = 3,
- maxSleep = 6;
+ int minSleep = 2,
+ maxSleep = 4;
for ( int totalBrokers = 3;
@@ -681,7 +692,7 @@
// If all children have exited, quit.
int unfinished = allMyChildren.unfinished();
if ( ! unfinished ) {
- killAllBrokers ( brokers, 10 );
+ killAllBrokers ( brokers, 5 );
if ( verbosity > 0 )
cout << "failoverSoak: all children have exited.\n";
@@ -707,7 +718,7 @@
if ( verbosity > 0 )
cout << "failoverSoak: error on child.\n";
allMyChildren.killEverybody();
- killAllBrokers ( brokers, 10 );
+ killAllBrokers ( brokers, 5 );
std::cerr << "ERROR: CLIENT END_OF_TEST\n";
return ERROR_ON_CHILD;
}
@@ -736,7 +747,7 @@
cout << "failoverSoak: maxBrokers reached.\n";
allMyChildren.killEverybody();
- killAllBrokers ( brokers, 10 );
+ killAllBrokers ( brokers, 5 );
std::cerr << "SUCCESSFUL END_OF_TEST\n";
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org