ARTEMIS-1333 fixing test, cannot flush itself from Runnable

This commit is contained in:
Clebert Suconic 2017-08-09 15:57:55 -04:00
parent 4762e52ef1
commit 012fe58b2c
4 changed files with 48 additions and 24 deletions

View File

@ -91,6 +91,11 @@ public abstract class ProcessorBase<T> {
long timeLimit = System.currentTimeMillis() + unit.toMillis(timeout);
try {
while (stateUpdater.get(this) == STATE_RUNNING && timeLimit > System.currentTimeMillis()) {
if (tasks.isEmpty()) {
return true;
}
Thread.sleep(10);
}
} catch (InterruptedException e) {

View File

@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.protocol.core;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
@ -158,6 +159,8 @@ public class ServerSessionPacketHandler implements ChannelHandler {
private final boolean direct;
private static final ThreadLocal<AtomicBoolean> inHandler = ThreadLocal.withInitial(AtomicBoolean::new);
public ServerSessionPacketHandler(final ActiveMQServer server,
final CoreProtocolManager manager,
final ServerSession session,
@ -225,8 +228,10 @@ public class ServerSessionPacketHandler implements ChannelHandler {
}
public void flushExecutor() {
packetActor.flush();
callExecutor.flush();
if (!inHandler.get().get()) {
packetActor.flush();
callExecutor.flush();
}
}
public void close() {
@ -256,28 +261,33 @@ public class ServerSessionPacketHandler implements ChannelHandler {
if (logger.isTraceEnabled()) {
logger.trace("ServerSessionPacketHandler::handlePacket," + packet);
}
final byte type = packet.getType();
switch (type) {
case SESS_SEND: {
onSessionSend(packet);
break;
inHandler.get().set(true);
try {
final byte type = packet.getType();
switch (type) {
case SESS_SEND: {
onSessionSend(packet);
break;
}
case SESS_ACKNOWLEDGE: {
onSessionAcknowledge(packet);
break;
}
case SESS_PRODUCER_REQUEST_CREDITS: {
onSessionRequestProducerCredits(packet);
break;
}
case SESS_FLOWTOKEN: {
onSessionConsumerFlowCredit(packet);
break;
}
default:
// separating a method for everything else as JIT was faster this way
slowPacketHandler(packet);
break;
}
case SESS_ACKNOWLEDGE: {
onSessionAcknowledge(packet);
break;
}
case SESS_PRODUCER_REQUEST_CREDITS: {
onSessionRequestProducerCredits(packet);
break;
}
case SESS_FLOWTOKEN: {
onSessionConsumerFlowCredit(packet);
break;
}
default:
// separating a method for everything else as JIT was faster this way
slowPacketHandler(packet);
break;
} finally {
inHandler.get().set(false);
}
}

View File

@ -65,7 +65,7 @@ public final class CoreSessionCallback implements SessionCallback {
@Override
public void close(boolean failed) {
ServerSessionPacketHandler localHandler = handler;
if (failed && localHandler != null) {
if (localHandler != null) {
// We wait any pending tasks before we make this as closed
localHandler.flushExecutor();
}

View File

@ -47,6 +47,15 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
public void testScaleDownWithConnector() throws Exception {
}
// it doesn't make sense through the core
// the pool will be shutdown while a connection is being used
// makes no sense!
@Override
public void testForceFailover() throws Exception {
}
@Override
protected ActiveMQServerControl createManagementControl() throws Exception {
return new ActiveMQServerControl() {