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

Rolling back commit 443271 since it is breaking the build 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@443425 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-09-14 17:38:32 +00:00
parent 04c3b07a96
commit 295850da01
7 changed files with 46 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
View File

@ -62,7 +62,6 @@ import org.apache.activemq.state.CommandVisitor;
import org.apache.activemq.state.ConsumerState;
import org.apache.activemq.state.ProducerState;
import org.apache.activemq.state.SessionState;
import org.apache.activemq.state.TransactionState;
import org.apache.activemq.thread.Task;
import org.apache.activemq.thread.TaskRunner;
import org.apache.activemq.thread.TaskRunnerFactory;
@ -309,12 +308,7 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
if( cs!=null ) {
context = cs.getContext();
}
// Avoid replaying dup commands
if( cs.getTransactionState(info.getTransactionId())==null ) {
cs.addTransactionState(info.getTransactionId());
broker.beginTransaction(context, info.getTransactionId());
}
broker.beginTransaction(context, info.getTransactionId());
return null;
}
@ -331,22 +325,9 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
if( cs!=null ) {
context = cs.getContext();
}
TransactionState transactionState = cs.getTransactionState(info.getTransactionId());
if( transactionState == null )
throw new IllegalStateException("Cannot prepare a transaction that had not been started: "+info.getTransactionId());
// Avoid dups.
if( !transactionState.isPrepared() ) {
transactionState.setPrepared(true);
int result = broker.prepareTransaction(context, info.getTransactionId());
transactionState.setPreparedResult(result);
IntegerResponse response = new IntegerResponse(result);
return response;
} else {
IntegerResponse response = new IntegerResponse(transactionState.getPreparedResult());
return response;
}
int result = broker.prepareTransaction(context, info.getTransactionId());
IntegerResponse response = new IntegerResponse(result);
return response;
}
public Response processCommitTransactionOnePhase(TransactionInfo info) throws Exception {
@ -355,12 +336,8 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
if( cs!=null ) {
context = cs.getContext();
}
cs.removeTransactionState(info.getTransactionId());
broker.commitTransaction(context, info.getTransactionId(), true);
return null;
}
public Response processCommitTransactionTwoPhase(TransactionInfo info) throws Exception {
@ -369,8 +346,6 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
if( cs!=null ) {
context = cs.getContext();
}
cs.removeTransactionState(info.getTransactionId());
broker.commitTransaction(context, info.getTransactionId(), false);
return null;
}
@ -381,8 +356,6 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
if( cs!=null ) {
context = cs.getContext();
}
cs.removeTransactionState(info.getTransactionId());
broker.rollbackTransaction(context, info.getTransactionId());
return null;
}
@ -409,32 +382,10 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
public Response processMessage(Message messageSend) throws Exception {
ProducerId producerId = messageSend.getProducerId();
ConnectionState state = lookupConnectionState(producerId);
ConnectionContext context = state.getContext();
// If the message originates from this client connection,
// then, finde the associated producer state so we can do some dup detection.
ProducerState producerState=null;
if( messageSend.getMessageId().getProducerId().equals( messageSend.getProducerId() ) ) {
SessionState ss = state.getSessionState(producerId.getParentId());
if( ss == null )
throw new IllegalStateException("Cannot send from a session that had not been registered: "+producerId.getParentId());
producerState = ss.getProducerState(producerId);
}
if( producerState == null ) {
broker.send(context, messageSend);
} else {
// Avoid Dups.
long seq = messageSend.getMessageId().getProducerSequenceId();
if( seq > producerState.getLastSequenceId() ) {
producerState.setLastSequenceId(seq);
broker.send(context, messageSend);
}
}
broker.send(context, messageSend);
return null;
}

16
activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java
View File

@ -30,7 +30,6 @@ import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.command.DestinationInfo;
import org.apache.activemq.command.SessionId;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.command.TransactionId;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
@ -38,7 +37,6 @@ import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
public class ConnectionState {
final ConnectionInfo info;
private final ConcurrentHashMap transactions = new ConcurrentHashMap();
private final ConcurrentHashMap sessions = new ConcurrentHashMap();
private final List tempDestinations = Collections.synchronizedList(new ArrayList());
private final AtomicBoolean shutdown = new AtomicBoolean(false);
@ -66,20 +64,6 @@ public class ConnectionState {
}
}
}
public void addTransactionState(TransactionId id) {
checkShutdown();
transactions.put(id, new TransactionState(id));
}
public TransactionState getTransactionState(TransactionId id) {
return (TransactionState)transactions.get(id);
}
public Collection getTransactionStates() {
return transactions.values();
}
public TransactionState removeTransactionState(TransactionId id) {
return (TransactionState) transactions.remove(id);
}
public void addSession(SessionInfo info) {
checkShutdown();

173
activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
View File

@ -55,41 +55,21 @@ import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
*/
public class ConnectionStateTracker implements CommandVisitor {
private final static Tracked TRACKED_RESPONSE_MARKER = new Tracked(null);
private final static Response TRACKED_RESPONSE_MARKER = new Response();
private boolean trackTransactions = false;
boolean trackTransactions = false;
boolean trackMessages = false;
boolean trackAcks = false;
private boolean restoreSessions=true;
private boolean restoreConsumers=true;
boolean restoreConsumers=true;
private boolean restoreProducers=true;
private boolean restoreTransaction=true;
protected final ConcurrentHashMap connectionStates = new ConcurrentHashMap();
private class RemoveTransactionAction implements Runnable {
private final TransactionInfo info;
public RemoveTransactionAction(TransactionInfo info) {
this.info = info;
}
public void run() {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState)connectionStates.get(connectionId);
if( cs != null ) {
cs.removeTransactionState(info.getTransactionId());
}
}
}
/**
*
*
* @param command
* @return null if the command is not state tracked.
* @throws IOException
*/
public Tracked track(Command command) throws IOException {
public boolean track(Command command) throws IOException {
try {
return (Tracked) command.visit(this);
return command.visit(this)!=null;
} catch (IOException e) {
throw e;
} catch (Throwable e) {
@ -106,22 +86,9 @@ public class ConnectionStateTracker implements CommandVisitor {
if( restoreSessions )
restoreSessions(transport, connectionState);
if( restoreTransaction )
restoreTransactions(transport, connectionState);
}
}
private void restoreTransactions(Transport transport, ConnectionState connectionState) throws IOException {
for (Iterator iter = connectionState.getTransactionStates().iterator(); iter.hasNext();) {
TransactionState transactionState = (TransactionState) iter.next();
for (Iterator iterator = transactionState.getCommands().iterator(); iterator.hasNext();) {
Command command = (Command) iterator.next();
transport.oneway(command);
}
}
}
/**
* @param transport
* @param connectionState
@ -260,103 +227,26 @@ public class ConnectionStateTracker implements CommandVisitor {
return null;
}
public Response processMessage(Message send) throws Exception {
if( trackTransactions && send.getTransactionId() != null ) {
ConnectionId connectionId = send.getProducerId().getParentId().getParentId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(send.getTransactionId());
transactionState.addCommand(send);
return TRACKED_RESPONSE_MARKER;
}
return null;
}
return null;
}
public Response processMessageAck(MessageAck ack) throws Exception {
if( trackTransactions && ack.getTransactionId() != null ) {
ConnectionId connectionId = ack.getConsumerId().getParentId().getParentId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(ack.getTransactionId());
transactionState.addCommand(ack);
return TRACKED_RESPONSE_MARKER;
}
return null;
return null;
}
public Response processBeginTransaction(TransactionInfo info) throws Exception {
if( trackTransactions ) {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
cs.addTransactionState(info.getTransactionId());
return TRACKED_RESPONSE_MARKER;
}
return null;
}
return null;
}
public Response processPrepareTransaction(TransactionInfo info) throws Exception {
if( trackTransactions ) {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(info.getTransactionId());
transactionState.addCommand(info);
return TRACKED_RESPONSE_MARKER;
}
return null;
return null;
}
public Response processCommitTransactionOnePhase(TransactionInfo info) throws Exception {
if( trackTransactions ) {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(info.getTransactionId());
if( transactionState !=null ) {
transactionState.addCommand(info);
return new Tracked(new RemoveTransactionAction(info));
}
}
return null;
}
return null;
}
public Response processCommitTransactionTwoPhase(TransactionInfo info) throws Exception {
if( trackTransactions ) {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(info.getTransactionId());
if( transactionState !=null ) {
transactionState.addCommand(info);
return new Tracked(new RemoveTransactionAction(info));
}
}
return null;
return null;
}
public Response processRollbackTransaction(TransactionInfo info) throws Exception {
if( trackTransactions ) {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(info.getTransactionId());
if( transactionState !=null ) {
transactionState.addCommand(info);
return new Tracked(new RemoveTransactionAction(info));
}
}
return null;
}
public Response processEndTransaction(TransactionInfo info) throws Exception {
if( trackTransactions ) {
ConnectionId connectionId = info.getConnectionId();
ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
TransactionState transactionState = cs.getTransactionState(info.getTransactionId());
transactionState.addCommand(info);
return TRACKED_RESPONSE_MARKER;
}
return null;
}
public Response processRecoverTransactions(TransactionInfo info) {
return null;
}
public Response processForgetTransaction(TransactionInfo info) throws Exception {
return null;
}
public Response processWireFormat(WireFormatInfo info) throws Exception {
return null;
}
@ -370,6 +260,18 @@ public class ConnectionStateTracker implements CommandVisitor {
return null;
}
public Response processRecoverTransactions(TransactionInfo info) {
return null;
}
public Response processForgetTransaction(TransactionInfo info) throws Exception {
return null;
}
public Response processEndTransaction(TransactionInfo info) throws Exception {
return null;
}
public Response processFlush(FlushCommand command) throws Exception {
return null;
}
@ -405,20 +307,5 @@ public class ConnectionStateTracker implements CommandVisitor {
public void setRestoreSessions(boolean restoreSessions) {
this.restoreSessions = restoreSessions;
}
public boolean isTrackTransactions() {
return trackTransactions;
}
public void setTrackTransactions(boolean trackTransactions) {
this.trackTransactions = trackTransactions;
}
public boolean isRestoreTransaction() {
return restoreTransaction;
}
public void setRestoreTransaction(boolean restoreTransaction) {
this.restoreTransaction = restoreTransaction;
}
}

9
activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java
View File

@ -22,7 +22,6 @@ import org.apache.activemq.command.ProducerInfo;
public class ProducerState {
final ProducerInfo info;
private long lastSequenceId=-1;
public ProducerState(ProducerInfo info) {
this.info = info;
@ -32,11 +31,5 @@ public class ProducerState {
}
public ProducerInfo getInfo() {
return info;
}
public void setLastSequenceId(long lastSequenceId) {
this.lastSequenceId = lastSequenceId;
}
public long getLastSequenceId() {
return lastSequenceId;
}
}
}

3
activemq-core/src/main/java/org/apache/activemq/state/SessionState.java
View File

@ -74,9 +74,6 @@ public class SessionState {
public Collection getProducerStates() {
return producers.values();
}
public ProducerState getProducerState(ProducerId producerId) {
return (ProducerState) producers.get(producerId);
}
public Collection getConsumerStates() {
return consumers.values();

33
activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
View File

@ -28,7 +28,6 @@ import org.apache.activemq.command.BrokerInfo;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.Response;
import org.apache.activemq.state.ConnectionStateTracker;
import org.apache.activemq.state.Tracked;
import org.apache.activemq.thread.DefaultThreadPools;
import org.apache.activemq.thread.Task;
import org.apache.activemq.thread.TaskRunner;
@ -90,10 +89,7 @@ public class FailoverTransport implements CompositeTransport {
return;
}
if (command.isResponse()) {
Object object = requestMap.remove(new Integer(((Response) command).getCorrelationId()));
if( object!=null && object.getClass() == Tracked.class ) {
((Tracked)object).onResponses();
}
requestMap.remove(new Integer(((Response) command).getCorrelationId()));
}
if (!initialized){
if (command.isBrokerInfo()){
@ -140,8 +136,6 @@ public class FailoverTransport implements CompositeTransport {
public FailoverTransport() throws InterruptedIOException {
stateTracker.setTrackTransactions(true);
// Setup a task that is used to reconnect the a connection async.
reconnectTask = DefaultThreadPools.getDefaultTaskRunnerFactory().createTaskRunner(new Task() {
@ -378,10 +372,7 @@ public class FailoverTransport implements CompositeTransport {
// the state tracker,
// then hold it in the requestMap so that we can replay
// it later.
Tracked tracked = stateTracker.track(command);
if( tracked!=null && tracked.isWaitingForResponse() ) {
requestMap.put(new Integer(command.getCommandId()), tracked);
} else if ( tracked==null && command.isResponseRequired()) {
if (!stateTracker.track(command) && command.isResponseRequired()) {
requestMap.put(new Integer(command.getCommandId()), command);
}
@ -389,19 +380,13 @@ public class FailoverTransport implements CompositeTransport {
try {
connectedTransport.oneway(command);
} catch (IOException e) {
// If the command was not tracked.. we will retry in this method
if( tracked==null ) {
// since we will retry in this method.. take it out of the request
// map so that it is not sent 2 times on recovery
if( command.isResponseRequired() ) {
requestMap.remove(new Integer(command.getCommandId()));
}
// Rethrow the exception so it will handled by the outer catch
throw e;
}
// If there is an IOException in the send, remove the command from the requestMap
if (!stateTracker.track(command) && command.isResponseRequired()) {
requestMap.remove(new Integer(command.getCommandId()), command);
}
// Rethrow the exception so it will handled by the outer catch
throw e;
}
return;

2
activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
View File

@ -340,7 +340,7 @@ public class FanoutTransport implements CompositeTransport {
// then hold it in the requestMap so that we can replay
// it later.
boolean fanout = isFanoutCommand(command);
if (stateTracker.track(command)==null && command.isResponseRequired() ) {
if (!stateTracker.track(command) && command.isResponseRequired() ) {
int size = fanout ? minAckCount : 1;
requestMap.put(new Integer(command.getCommandId()), new RequestCounter(command, size));
}