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

r241@34: chirino | 2007-02-23 14:49:05 -0500 

Fixed some Stream tests that broke a little with the latest changes..
 Added better network flow control.
 


git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-4.1@511085 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2007-02-23 20:24:30 +00:00
parent efebbf70b8
commit 6916299290
10 changed files with 126 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
View File

@ -50,8 +50,6 @@ public class ActiveMQInputStream extends InputStream implements ActiveMQDispatch
// These are the messages waiting to be delivered to the client
private final MessageDispatchChannel unconsumedMessages = new MessageDispatchChannel();
private int deliveredCounter = 0;
private MessageDispatch lastDelivered;
private boolean eosReached;
private byte buffer[];
private int pos;
@ -117,10 +115,6 @@ public class ActiveMQInputStream extends InputStream implements ActiveMQDispatch
public void close() throws IOException {
if (!unconsumedMessages.isClosed()) {
try {
if (lastDelivered != null) {
MessageAck ack = new MessageAck(lastDelivered, MessageAck.STANDARD_ACK_TYPE, deliveredCounter);
connection.asyncSendPacket(ack);
}
dispose();
this.connection.syncSendPacket(info.createRemoveCommand());
} catch (JMSException e) {
@ -150,16 +144,8 @@ public class ActiveMQInputStream extends InputStream implements ActiveMQDispatch
if (md == null || unconsumedMessages.isClosed() || md.getMessage().isExpired())
return null;
deliveredCounter++;
if ((0.75 * info.getPrefetchSize()) <= deliveredCounter) {
MessageAck ack = new MessageAck(md, MessageAck.STANDARD_ACK_TYPE, deliveredCounter);
connection.asyncSendPacket(ack);
deliveredCounter = 0;
lastDelivered = null;
} else {
lastDelivered = md;
}
MessageAck ack = new MessageAck(md, MessageAck.STANDARD_ACK_TYPE, 1);
connection.asyncSendPacket(ack);
return (ActiveMQMessage) md.getMessage();
}

54
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
View File

@ -582,6 +582,9 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
public void dispose() throws JMSException {
if (!unconsumedMessages.isClosed()) {
//log.warn("Consumer is being disposed.", new Exception("trace exception."));
// Do we have any acks we need to send out before closing?
// Ack any delivered messages now. (session may still
// commit/rollback the acks).
@ -833,31 +836,36 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
public void dispatch(MessageDispatch md) {
MessageListener listener = this.messageListener;
try {
synchronized(unconsumedMessages.getMutex()){
if (!unconsumedMessages.isClosed()) {
if (listener != null && unconsumedMessages.isRunning() ) {
ActiveMQMessage message = createActiveMQMessage(md);
beforeMessageIsConsumed(md);
try {
listener.onMessage(message);
afterMessageIsConsumed(md, false);
} catch (RuntimeException e) {
if ( session.isDupsOkAcknowledge() || session.isAutoAcknowledge() ) {
// Redeliver the message
} else {
// Transacted or Client ack: Deliver the next message.
afterMessageIsConsumed(md, false);
}
log.warn("Exception while processing message: " + e, e);
}
} else {
unconsumedMessages.enqueue(md);
if (availableListener != null) {
availableListener.onMessageAvailable(this);
}
}
if (unconsumedMessages.isClosed()) {
return;
}
if (listener == null || !unconsumedMessages.isRunning() ) {
unconsumedMessages.enqueue(md);
if (availableListener != null) {
availableListener.onMessageAvailable(this);
}
return;
}
}
ActiveMQMessage message = createActiveMQMessage(md);
beforeMessageIsConsumed(md);
try {
listener.onMessage(message);
afterMessageIsConsumed(md, false);
} catch (RuntimeException e) {
if ( session.isDupsOkAcknowledge() || session.isAutoAcknowledge() ) {
// Redeliver the message
} else {
// Transacted or Client ack: Deliver the next message.
afterMessageIsConsumed(md, false);
}
}
log.warn("Exception while processing message: " + e, e);
}
} catch (Exception e) {
session.connection.onAsyncException(e);
}

9
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -790,13 +790,10 @@ public class TransportConnection implements Service, Connection, Task, CommandVi
MessageDispatch md=(MessageDispatch) command;
Runnable sub=(Runnable) md.getConsumer();
broker.processDispatch(md);
try{
dispatch(command);
}finally{
if(sub!=null){
sub.run();
}
if(sub!=null){
sub.run();
}
dispatch(command);
} else if( command.isShutdownInfo() ) {
dispatch(command);
dispatchStopped.countDown();

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

@ -71,4 +71,11 @@ public interface ConnectionViewMBean extends Service {
*/
public String getRemoteAddress();
/**
* Returns the JMS connection id for this connection
*
* @return the JMS connection id for this connection
*/
public String getConnectionId();
}

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

@ -280,8 +280,8 @@ public class Queue implements Destination {
public void send(final ConnectionContext context, final Message message) throws Exception {
if (context.isProducerFlowControl() && !context.isNetworkConnection()) {
if( message.isResponseRequired() ) {
if (context.isProducerFlowControl() ) {
if( message.isResponseRequired() || context.isNetworkConnection() ) {
if( usageManager.isFull() ) {
// System.out.println("Registering callback...");
Runnable callback = new Runnable() {

1
activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
View File

@ -38,7 +38,6 @@ public class TempQueueRegion extends AbstractRegion {
super(broker,destinationStatistics, memoryManager, taskRunnerFactory, destinationFactory);
// We should allow the following to be configurable via a Destination Policy
// setAutoCreateDestinations(false);
System.out.println("test");
}
protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {

2
activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
View File

@ -232,7 +232,7 @@ public class Topic implements Destination {
public void send(final ConnectionContext context, final Message message) throws Exception {
if (context.isProducerFlowControl() && !context.isNetworkConnection() ) {
if (context.isProducerFlowControl() ) {
if (usageManager.isSendFailIfNoSpace() && usageManager.isFull()) {
throw new javax.jms.ResourceAllocationException("Usage Manager memory limit reached");
} else {

3
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -490,8 +490,7 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
log.trace("bridging "+localBrokerName+" -> "+remoteBrokerName+": "+message);
if( !message.isResponseRequired() ) {
if( !( message.isResponseRequired() || message.getDestination().isQueue() ) ) {
// If the message was originally sent using async send, we will preserve that QOS
// by bridging it using an async send (small chance of message loss).

158
activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java
View File

@ -17,6 +17,7 @@ package org.apache.activemq;
* limitations under the License.
*/
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -59,99 +60,96 @@ public final class LargeStreamletTest extends TestCase {
final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(
BROKER_URL);
final ActiveMQConnection connection = (ActiveMQConnection) factory
.createConnection();
final ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection();
connection.start();
final ActiveMQConnection connection2 = (ActiveMQConnection) factory.createConnection();
connection2.start();
try {
final Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
try {
final Destination destination = session.createQueue("wibble");
final Thread readerThread = new Thread(new Runnable() {
final Destination destination = new ActiveMQQueue("streamtest");
final Thread readerThread = new Thread(new Runnable() {
public void run() {
totalRead.set(0);
public void run() {
totalRead.set(0);
try {
final InputStream inputStream = connection
.createInputStream(destination);
try {
final InputStream inputStream = connection
.createInputStream(destination);
try {
int read;
final byte[] buf = new byte[BUFFER_SIZE];
while (!stopThreads.get()
&& (read = inputStream.read(buf)) != -1) {
totalRead.addAndGet(read);
}
} finally {
inputStream.close();
int read;
final byte[] buf = new byte[BUFFER_SIZE];
while (!stopThreads.get()
&& (read = inputStream.read(buf)) != -1) {
totalRead.addAndGet(read);
}
} catch (Exception e) {
readerException = e;
e.printStackTrace();
} finally {
log.info(totalRead + " total bytes read.");
inputStream.close();
}
} catch (Exception e) {
readerException = e;
e.printStackTrace();
} finally {
log.info(totalRead + " total bytes read.");
}
});
final Thread writerThread = new Thread(new Runnable() {
public void run() {
totalWritten.set(0);
int count = MESSAGE_COUNT;
try {
final OutputStream outputStream = connection
.createOutputStream(destination);
try {
final byte[] buf = new byte[BUFFER_SIZE];
new Random().nextBytes(buf);
while (count > 0 && !stopThreads.get()) {
outputStream.write(buf);
totalWritten.addAndGet(buf.length);
count--;
}
} finally {
outputStream.close();
}
} catch (Exception e) {
writerException = e;
e.printStackTrace();
} finally {
log.info(totalWritten
+ " total bytes written.");
}
}
});
readerThread.start();
writerThread.start();
// Wait till reader is has finished receiving all the messages or he has stopped
// receiving messages.
Thread.sleep(1000);
int lastRead = totalRead.get();
while( readerThread.isAlive() ) {
readerThread.join(1000);
// No progress?? then stop waiting..
if( lastRead == totalRead.get() ) {
break;
}
lastRead = totalRead.get();
}
stopThreads.set(true);
});
assertTrue("Should not have received a reader exception", readerException == null);
assertTrue("Should not have received a writer exception", writerException == null);
Assert.assertEquals("Not all messages accounted for",
totalWritten.get(), totalRead.get());
} finally {
session.close();
final Thread writerThread = new Thread(new Runnable() {
public void run() {
totalWritten.set(0);
int count = MESSAGE_COUNT;
try {
final OutputStream outputStream = connection2
.createOutputStream(destination);
try {
final byte[] buf = new byte[BUFFER_SIZE];
new Random().nextBytes(buf);
while (count > 0 && !stopThreads.get()) {
outputStream.write(buf);
totalWritten.addAndGet(buf.length);
count--;
}
} finally {
outputStream.close();
}
} catch (Exception e) {
writerException = e;
e.printStackTrace();
} finally {
log.info(totalWritten
+ " total bytes written.");
}
}
});
readerThread.start();
writerThread.start();
// Wait till reader is has finished receiving all the messages or he has stopped
// receiving messages.
Thread.sleep(1000);
int lastRead = totalRead.get();
while( readerThread.isAlive() ) {
readerThread.join(1000);
// No progress?? then stop waiting..
if( lastRead == totalRead.get() ) {
break;
}
lastRead = totalRead.get();
}
stopThreads.set(true);
assertTrue("Should not have received a reader exception", readerException == null);
assertTrue("Should not have received a writer exception", writerException == null);
Assert.assertEquals("Not all messages accounted for",
totalWritten.get(), totalRead.get());
} finally {
connection.close();
connection2.close();
}
}

2
activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
View File

@ -135,7 +135,7 @@ public class ProducerFlowControlTest extends JmsTestSupport {
protected BrokerService createBroker() throws Exception {
BrokerService service = new BrokerService();
service.setPersistent(false);
service.setUseJmx(false);
service.setUseJmx(true);
// Setup a destination policy where it takes only 1 message at a time.
PolicyMap policyMap = new PolicyMap();