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

ARTEMIS-1495 Test Improvements 

Server.stop is currently waiting completions on Sessions just because of test cases.

With the recent changes made into the Executors this is not needed any longer
This commit is contained in:
Clebert Suconic 2017-11-09 16:06:05 -05:00
parent ead60d54d0
commit 63b156e290
6 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-junit/src/main/java/org/apache/activemq/artemis/junit/Wait.java
View File

@ -67,6 +67,14 @@ public class Wait {
assertTrue("Condition wasn't met", condition);
}
public static void assertFalse(Condition condition) throws Exception {
assertTrue(() -> !condition.isSatisfied());
}
public static void assertFalse(String failureMessage, Condition condition) throws Exception {
assertTrue(failureMessage, () -> !condition.isSatisfied());
}
public static void assertTrue(String failureMessage, Condition condition) throws Exception {
boolean result = waitFor(condition);

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
View File

@ -845,11 +845,6 @@ public interface ActiveMQServerLogger extends BasicLogger {
@Message(id = 222104, value = "IO Error completing the transaction, code = {0}, message = {1}", format = Message.Format.MESSAGE_FORMAT)
void ioErrorOnTX(Integer errorCode, String errorMessage);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 222105, value = "Could not finish context execution in 10 seconds",
format = Message.Format.MESSAGE_FORMAT)
void errorCompletingContext(@Cause Exception e);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 222106, value = "Replacing incomplete LargeMessage with ID={0}", format = Message.Format.MESSAGE_FORMAT)
void replacingIncompleteLargeMessage(Long messageID);

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
View File

@ -203,8 +203,6 @@ public interface ServerSession extends SecurityAuth {
void close(boolean failed) throws Exception;
void waitContextCompletion() throws Exception;
void setTransferring(boolean transferring);
Set<ServerConsumer> getServerConsumers();

10
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -1245,16 +1245,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
ActiveMQServerLogger.LOGGER.errorClosingSessionsWhileStoppingServer(e);
}
}
if (!criticalIOError) {
for (ServerSession session : sessions.values()) {
try {
session.waitContextCompletion();
} catch (Exception e) {
ActiveMQServerLogger.LOGGER.errorClosingSessionsWhileStoppingServer(e);
}
}
}
}
static void stopComponent(ActiveMQComponent component) {

11
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
View File

@ -1238,17 +1238,6 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
setStarted(false);
}
@Override
public void waitContextCompletion() {
try {
if (!context.waitCompletion(10000)) {
ActiveMQServerLogger.LOGGER.errorCompletingContext(new Exception("warning"));
}
} catch (Exception e) {
ActiveMQServerLogger.LOGGER.errorCompletingContext(e);
}
}
@Override
public void close(final boolean failed) {
if (closed)

7
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
View File

@ -29,6 +29,7 @@ import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Before;
import org.junit.Test;
@ -121,12 +122,8 @@ public class JMSPagingFileDeleteTest extends JMSTestBase {
//subscriber1.close(); // << you can't call this on this test
//session.close(); // << can't call this on this test
long timeout = System.currentTimeMillis() + 5000;
while (timeout > System.currentTimeMillis() && pagingStore.isPaging()) {
Thread.sleep(100);
}
Wait.assertFalse(pagingStore::isPaging);
printPageStoreInfo(pagingStore);
assertFalse(pagingStore.isPaging());
}
} finally {