Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve hang in purge if message count stats are off and log a warning.. tidy up broker service waitForStarted logic which caused AMQ2102 test to block.. still issue with master/slave sync with AMQ2102 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@936798 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-04-22 12:01:15 +00:00
parent eb983f7c08
commit 956c3e0df2
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -689,10 +689,10 @@ public class BrokerService implements Service {
} }
/** /**
* A helper method to block the caller thread until the broker has been * A helper method to block the caller thread until the broker has fully started
* started * @return boolean true if wait succeeded false if broker was not started or was stopped
*/ */
public void waitUntilStarted() { public boolean waitUntilStarted() {
boolean waitSucceeded = false; boolean waitSucceeded = false;
while (isStarted() && !stopped.get() && !waitSucceeded) { while (isStarted() && !stopped.get() && !waitSucceeded) {
try { try {
@ -700,6 +700,7 @@ public class BrokerService implements Service {
} catch (InterruptedException ignore) { } catch (InterruptedException ignore) {
} }
} }
return waitSucceeded;
} }
// Properties // Properties

7
activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
View File

@ -940,8 +940,11 @@ public class Queue extends BaseDestination implements Task, UsageListener {
} catch (IOException e) { } catch (IOException e) {
} }
} }
// don't spin/hang if stats are out and there is nothing left in the store
} while (!pagedInMessages.isEmpty() || this.destinationStatistics.getMessages().getCount() > 0); } while (!list.isEmpty() && this.destinationStatistics.getMessages().getCount() > 0);
if (this.destinationStatistics.getMessages().getCount() > 0) {
LOG.warn(getActiveMQDestination().getQualifiedName() + " after purge complete, message count stats report: " + this.destinationStatistics.getMessages().getCount());
}
gc(); gc();
this.destinationStatistics.getMessages().setCount(0); this.destinationStatistics.getMessages().setCount(0);
getMessages().clear(); getMessages().clear();

3
activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
View File

@ -186,7 +186,8 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S
*/ */
@Override @Override
public String toString() { public String toString() {
return "tcp://" + socket.getInetAddress() + ":" + socket.getPort(); return "" + (socket.isConnected() ? "tcp://" + socket.getInetAddress() + ":" + socket.getPort()
: (localLocation != null ? localLocation : remoteLocation)) ;
} }
/** /**

4
activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java
View File

@ -397,7 +397,7 @@ public class AMQ2102Test extends CombinationTestSupport implements UncaughtExcep
} }
private static void debug(String message) { private static void debug(String message) {
LOG.debug(message); LOG.info(message);
} }
private static void info(String message) { private static void info(String message) {
@ -464,7 +464,6 @@ public class AMQ2102Test extends CombinationTestSupport implements UncaughtExcep
} }
}; };
t.start(); t.start();
master.waitUntilStarted();
masterUrl = master.getTransportConnectors().get(0).getConnectUri().toString(); masterUrl = master.getTransportConnectors().get(0).getConnectUri().toString();
debug("masterUrl: " + masterUrl); debug("masterUrl: " + masterUrl);
@ -475,6 +474,7 @@ public class AMQ2102Test extends CombinationTestSupport implements UncaughtExcep
slave.setMasterConnectorURI(masterUrl); slave.setMasterConnectorURI(masterUrl);
slave.start(); slave.start();
slave.waitUntilStarted(); slave.waitUntilStarted();
assertTrue("master started", master.waitUntilStarted());
} }
public void tearDown() throws Exception { public void tearDown() throws Exception {