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

This closes #563

This commit is contained in:
jbertram 2016-06-06 16:41:13 -05:00
parent ee6176c671 2e6586548b
commit 50d83fb63d
18 changed files with 246 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/OperationContext.java
View File

@ -29,9 +29,21 @@ public interface OperationContext extends IOCompletion {
/**
* Execute the task when all IO operations are complete,
* Or execute it immediately if nothing is pending.
* @param runnable the tas to be executed.
* @param storeOnly There are tasks that won't need to wait on replication or paging and will need to
* be completed as soon as the response from the journal is received. An example would be the
* DuplicateCache
*/
void executeOnCompletion(IOCallback runnable, boolean storeOnly);
/**
* Execute the task when all IO operations are complete,
* Or execute it immediately if nothing is pending.
* @param runnable the tas to be executed.
*/
void executeOnCompletion(IOCallback runnable);
void replicationLineUp();
void replicationDone();

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

@ -100,6 +100,8 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent {
void afterCompleteOperations(IOCallback run);
/** This is similar to afterComplete, however this only cares about the journal part. */
void afterStoreOperations(IOCallback run);
/**
* Block until the operations are done.
* Warning: Don't use it inside an ordered executor, otherwise the system may lock up

9
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
View File

@ -292,6 +292,10 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
getContext().executeOnCompletion(run);
}
public void afterStoreOperations(IOCallback run) {
getContext().executeOnCompletion(run, true);
}
@Override
public long generateID() {
return idGenerator.generateID();
@ -1788,6 +1792,11 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
runnable.done();
}
@Override
public void executeOnCompletion(IOCallback runnable, boolean storeOnly) {
executeOnCompletion(runnable);
}
@Override
public void replicationDone() {
}

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DummyOperationContext.java
View File

@ -34,6 +34,13 @@ final class DummyOperationContext implements OperationContext {
runnable.done();
}
@Override
public void executeOnCompletion(IOCallback runnable, boolean storeOnly) {
// There are no executeOnCompletion calls while using the DummyOperationContext
// However we keep the code here for correctness
runnable.done();
}
@Override
public void replicationDone() {
}

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
View File

@ -61,8 +61,10 @@ import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.LargeServerMessage;
import org.apache.activemq.artemis.core.server.ServerMessage;
import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.jboss.logging.Logger;
public class JournalStorageManager extends AbstractJournalStorageManager {
private static final Logger logger = Logger.getLogger(JournalStorageManager.class);
private SequentialFileFactory journalFF;
@ -569,6 +571,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
}
}
catch (Exception e) {
logger.warn(e.getMessage(), e);
stopReplication();
throw e;
}
@ -681,6 +684,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
*/
@Override
public void stopReplication() {
logger.trace("stopReplication()");
storageManagerLock.writeLock().lock();
try {
if (replicator == null)

46
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
View File

@ -72,6 +72,7 @@ public class OperationContextImpl implements OperationContext {
}
private List<TaskHolder> tasks;
private List<TaskHolder> storeOnlyTasks;
private long minimalStore = Long.MAX_VALUE;
private long minimalReplicated = Long.MAX_VALUE;
@ -126,7 +127,12 @@ public class OperationContextImpl implements OperationContext {
}
@Override
public void executeOnCompletion(final IOCallback completion) {
public void executeOnCompletion(IOCallback runnable) {
executeOnCompletion(runnable, false);
}
@Override
public void executeOnCompletion(final IOCallback completion, final boolean storeOnly) {
if (errorCode != -1) {
completion.onError(errorCode, errorMessage);
return;
@ -135,11 +141,18 @@ public class OperationContextImpl implements OperationContext {
boolean executeNow = false;
synchronized (this) {
if (tasks == null) {
tasks = new LinkedList<>();
minimalReplicated = replicationLineUp.intValue();
minimalStore = storeLineUp.intValue();
minimalPage = pageLineUp.intValue();
if (storeOnly) {
if (storeOnlyTasks == null) {
storeOnlyTasks = new LinkedList<>();
}
}
else {
if (tasks == null) {
tasks = new LinkedList<>();
minimalReplicated = replicationLineUp.intValue();
minimalStore = storeLineUp.intValue();
minimalPage = pageLineUp.intValue();
}
}
// On this case, we can just execute the context directly
@ -159,7 +172,12 @@ public class OperationContextImpl implements OperationContext {
}
}
else {
tasks.add(new TaskHolder(completion));
if (storeOnly) {
storeOnlyTasks.add(new TaskHolder(completion));
}
else {
tasks.add(new TaskHolder(completion));
}
}
}
@ -177,6 +195,20 @@ public class OperationContextImpl implements OperationContext {
}
private void checkTasks() {
if (storeOnlyTasks != null) {
Iterator<TaskHolder> iter = storeOnlyTasks.iterator();
while (iter.hasNext()) {
TaskHolder holder = iter.next();
if (stored >= holder.storeLined) {
// If set, we use an executor to avoid the server being single threaded
execute(holder.task);
iter.remove();
}
}
}
if (stored >= minimalStore && replicated >= minimalReplicated && paged >= minimalPage) {
Iterator<TaskHolder> iter = tasks.iterator();
while (iter.hasNext()) {

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

@ -93,6 +93,11 @@ public class NullStorageManager implements StorageManager {
public void done() {
}
@Override
public void executeOnCompletion(IOCallback runnable, boolean storeOnly) {
runnable.done();
}
@Override
public void storeLineUp() {
}
@ -338,6 +343,11 @@ public class NullStorageManager implements StorageManager {
run.done();
}
@Override
public void afterStoreOperations(IOCallback run) {
run.done();
}
@Override
public void waitOnOperations() throws Exception {
}

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java
View File

@ -226,7 +226,7 @@ public class DuplicateIDCacheImpl implements DuplicateIDCache {
}
// For a tx, it's important that the entry is not added to the cache until commit
// since if the client fails then resends them tx we don't want it to get rejected
tx.addOperation(new AddDuplicateIDOperation(duplID, recordID));
tx.afterStore(new AddDuplicateIDOperation(duplID, recordID));
}
}
}

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
View File

@ -690,9 +690,17 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
}
for (Object id : idsToRemove) {
RemotingConnection conn = getConnection(id);
final RemotingConnection conn = getConnection(id);
if (conn != null) {
conn.fail(ActiveMQMessageBundle.BUNDLE.clientExited(conn.getRemoteAddress()));
// In certain cases (replicationManager for instance) calling fail could take some time
// We can't pause the FailureCheckAndFlushThread as that would lead other clients to fail for
// missing pings
flushExecutor.execute(new Runnable() {
@Override
public void run() {
conn.fail(ActiveMQMessageBundle.BUNDLE.clientExited(conn.getRemoteAddress()));
}
});
removeConnection(id);
}
}

72
artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
View File

@ -265,13 +265,14 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
}
@Override
public synchronized void stop() throws Exception {
if (!started) {
return;
public void stop() throws Exception {
synchronized (this) {
if (!started) {
logger.trace("Stopping being ignored as it hasn't been started");
return;
}
}
enabled = false;
// This is to avoid the write holding a lock while we are trying to close it
if (replicatingChannel != null) {
replicatingChannel.close();
@ -279,6 +280,7 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
}
synchronized (replicationLock) {
enabled = false;
writable.set(true);
replicationLock.notifyAll();
clearReplicationTokens();
@ -299,9 +301,12 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
* backup crashing).
*/
public void clearReplicationTokens() {
logger.trace("clearReplicationTokens initiating");
synchronized (replicationLock) {
logger.trace("clearReplicationTokens entered the lock");
while (!pendingTokens.isEmpty()) {
OperationContext ctx = pendingTokens.poll();
logger.trace("Calling ctx.replicationDone()");
try {
ctx.replicationDone();
}
@ -310,6 +315,7 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
}
}
}
logger.trace("clearReplicationTokens finished");
}
/**
@ -347,20 +353,8 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
synchronized (replicationLock) {
if (enabled) {
pendingTokens.add(repliToken);
if (!replicatingChannel.getConnection().isWritable(this)) {
try {
writable.set(false);
//don't wait for ever as this may hang tests etc, we've probably been closed anyway
long now = System.currentTimeMillis();
long deadline = now + 5000;
while (!writable.get() && now < deadline) {
replicationLock.wait(deadline - now);
now = System.currentTimeMillis();
}
}
catch (InterruptedException e) {
throw new ActiveMQInterruptedException(e);
}
if (!flowControl()) {
return repliToken;
}
replicatingChannel.send(packet);
}
@ -379,6 +373,43 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
return repliToken;
}
/** This was written as a refactoring of sendReplicatePacket.
* In case you refactor this in any way, this method must hold a lock on replication lock. .*/
private boolean flowControl() {
// synchronized (replicationLock) { -- I'm not adding this because the caller already has it
// future maintainers of this code please be aware that the intention here is hold the lock on replication lock
if (!replicatingChannel.getConnection().isWritable(this)) {
try {
logger.trace("flowControl waiting on writable");
writable.set(false);
//don't wait for ever as this may hang tests etc, we've probably been closed anyway
long now = System.currentTimeMillis();
long deadline = now + 5000;
while (!writable.get() && now < deadline) {
replicationLock.wait(deadline - now);
now = System.currentTimeMillis();
}
logger.trace("flow control done");
if (!writable.get()) {
ActiveMQServerLogger.LOGGER.slowReplicationResponse();
logger.tracef("There was no response from replication backup after %s seconds, server being stopped now", System.currentTimeMillis() - now);
try {
stop();
}
catch (Exception e) {
logger.warn(e.getMessage(), e);
}
return false;
}
}
catch (InterruptedException e) {
throw new ActiveMQInterruptedException(e);
}
}
return true;
}
@Override
public void readyForWriting() {
synchronized (replicationLock) {
@ -591,6 +622,7 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
sendReplicatePacket(new ReplicationStartSyncMessage(nodeID));
try {
if (!synchronizationIsFinishedAcknowledgement.await(initialReplicationSyncTimeout)) {
logger.trace("sendSynchronizationDone wasn't finished in time");
throw ActiveMQMessageBundle.BUNDLE.replicationSynchronizationTimeout(initialReplicationSyncTimeout);
}
}
@ -598,6 +630,8 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
logger.debug(e);
}
inSync = false;
logger.trace("sendSynchronizationDone finished");
}
}

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

@ -1209,6 +1209,11 @@ public interface ActiveMQServerLogger extends BasicLogger {
@Message(id = 222206, value = "Connection limit of {0} reached. Refusing connection from {1}.", format = Message.Format.MESSAGE_FORMAT)
void connectionLimitReached(long connectionsAllowed, String address);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 222207, value = "The backup server is not responding promptly introducing latency beyond the limit. Replication server being disconnected now.",
format = Message.Format.MESSAGE_FORMAT)
void slowReplicationResponse();
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 224000, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT)
void initializationError(@Cause Throwable e);

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

@ -67,6 +67,11 @@ public interface Transaction {
void addOperation(TransactionOperation sync);
/** This is an operation that will be called right after the storage is completed.
* addOperation could only happen after paging and replication, while these operations will just be
* about the storage*/
void afterStore(TransactionOperation sync);
List<TransactionOperation> getAllOperations();
boolean hasTimedOut(long currentTime, int defaultTimeout);

78
artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java
View File

@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.transaction.impl;
import javax.transaction.xa.Xid;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import org.apache.activemq.artemis.api.core.ActiveMQException;
@ -38,6 +39,8 @@ public class TransactionImpl implements Transaction {
private List<TransactionOperation> operations;
private List<TransactionOperation> storeOperations;
private static final int INITIAL_NUM_PROPERTIES = 10;
private Object[] properties = new Object[TransactionImpl.INITIAL_NUM_PROPERTIES];
@ -301,6 +304,24 @@ public class TransactionImpl implements Transaction {
}
});
final List<TransactionOperation> storeOperationsToComplete = this.storeOperations;
this.storeOperations = null;
if (storeOperationsToComplete != null) {
storageManager.afterStoreOperations(new IOCallback() {
@Override
public void onError(final int errorCode, final String errorMessage) {
ActiveMQServerLogger.LOGGER.ioErrorOnTX(errorCode, errorMessage);
}
@Override
public void done() {
afterCommit(storeOperationsToComplete);
}
});
}
}
}
@ -365,6 +386,9 @@ public class TransactionImpl implements Transaction {
final List<TransactionOperation> operationsToComplete = this.operations;
this.operations = null;
final List<TransactionOperation> storeOperationsToComplete = this.storeOperations;
this.storeOperations = null;
// We use the Callback even for non persistence
// If we are using non-persistence with replication, the replication manager will have
// to execute this runnable in the correct order
@ -380,6 +404,21 @@ public class TransactionImpl implements Transaction {
afterRollback(operationsToComplete);
}
});
if (storeOperationsToComplete != null) {
storageManager.afterStoreOperations(new IOCallback() {
@Override
public void onError(final int errorCode, final String errorMessage) {
ActiveMQServerLogger.LOGGER.ioErrorOnTX(errorCode, errorMessage);
}
@Override
public void done() {
afterRollback(storeOperationsToComplete);
}
});
}
}
@Override
@ -445,6 +484,15 @@ public class TransactionImpl implements Transaction {
operations.add(operation);
}
@Override
public synchronized void afterStore(TransactionOperation sync) {
if (storeOperations == null) {
storeOperations = new LinkedList<>();
}
storeOperations.add(sync);
}
private int getOperationsCount() {
checkCreateOperations();
@ -491,7 +539,7 @@ public class TransactionImpl implements Transaction {
private void checkCreateOperations() {
if (operations == null) {
operations = new ArrayList<>();
operations = new LinkedList<>();
}
}
@ -505,13 +553,13 @@ public class TransactionImpl implements Transaction {
}
}
private synchronized void afterRollback(List<TransactionOperation> oeprationsToComplete) {
if (oeprationsToComplete != null) {
for (TransactionOperation operation : oeprationsToComplete) {
private synchronized void afterRollback(List<TransactionOperation> operationsToComplete) {
if (operationsToComplete != null) {
for (TransactionOperation operation : operationsToComplete) {
operation.afterRollback(this);
}
// Help out GC here
oeprationsToComplete.clear();
operationsToComplete.clear();
}
}
@ -521,6 +569,11 @@ public class TransactionImpl implements Transaction {
operation.beforeCommit(this);
}
}
if (storeOperations != null) {
for (TransactionOperation operation : storeOperations) {
operation.beforeCommit(this);
}
}
}
private synchronized void beforePrepare() throws Exception {
@ -529,6 +582,11 @@ public class TransactionImpl implements Transaction {
operation.beforePrepare(this);
}
}
if (storeOperations != null) {
for (TransactionOperation operation : storeOperations) {
operation.beforePrepare(this);
}
}
}
private synchronized void beforeRollback() throws Exception {
@ -537,6 +595,11 @@ public class TransactionImpl implements Transaction {
operation.beforeRollback(this);
}
}
if (storeOperations != null) {
for (TransactionOperation operation : storeOperations) {
operation.beforeRollback(this);
}
}
}
private synchronized void afterPrepare() {
@ -545,6 +608,11 @@ public class TransactionImpl implements Transaction {
operation.afterPrepare(this);
}
}
if (storeOperations != null) {
for (TransactionOperation operation : storeOperations) {
operation.afterPrepare(this);
}
}
}
@Override

5
artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
View File

@ -252,6 +252,11 @@ public class TransactionImplTest extends ActiveMQTestBase {
run.done();
}
@Override
public void afterStoreOperations(IOCallback run) {
run.done();
}
@Override
public boolean waitOnOperations(long timeout) throws Exception {
return false;

4
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/OrphanedConsumerTest.java
View File

@ -67,10 +67,6 @@ public class OrphanedConsumerTest extends ActiveMQTestBase {
* This static method is an entry point for the byteman rules on {@link #testOrphanedConsumers()}
*/
public static void leavingCloseOnTestCountersWhileClosing() {
if (staticServer.getConnectionCount() == 0) {
verification = new AssertionError("The connection was closed before the consumers and sessions, this may cause issues on management leaving Orphaned Consumers!");
}
if (staticServer.getSessions().size() == 0) {
verification = new AssertionError("The session was closed before the consumers, this may cause issues on management leaving Orphaned Consumers!");
}

5
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/PagingTest.java
View File

@ -5730,7 +5730,12 @@ public class PagingTest extends ActiveMQTestBase {
@Override
public void executeOnCompletion(IOCallback runnable) {
runnable.done();
}
@Override
public void executeOnCompletion(IOCallback runnable, boolean storeOnly) {
runnable.done();
}
}
}

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DuplicateCacheTest.java
View File

@ -90,7 +90,7 @@ public class DuplicateCacheTest extends StorageManagerTestBase {
public void onError(int errorCode, String errorMessage) {
}
});
}, true);
Assert.assertTrue(latch.await(1, TimeUnit.MINUTES));

5
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/BindingsImplTest.java
View File

@ -114,6 +114,11 @@ public class BindingsImplTest extends ActiveMQTestBase {
}
@Override
public void afterStore(TransactionOperation sync) {
}
@Override
public void addOperation(final TransactionOperation sync) {