ARTEMIS-490 Fixing LargeMessage copy through replication
this will fix cases like DLQ and Diverts
This commit is contained in:
parent
dcf651376f
commit
e81fa5c359
|
@ -29,6 +29,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
|
||||||
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
|
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
|
||||||
import org.apache.activemq.artemis.api.core.ActiveMQException;
|
import org.apache.activemq.artemis.api.core.ActiveMQException;
|
||||||
import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException;
|
import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException;
|
||||||
|
import org.apache.activemq.artemis.core.io.util.FileIOUtil;
|
||||||
import org.apache.activemq.artemis.core.journal.EncodingSupport;
|
import org.apache.activemq.artemis.core.journal.EncodingSupport;
|
||||||
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
|
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
|
||||||
import org.apache.activemq.artemis.core.io.buffer.TimedBuffer;
|
import org.apache.activemq.artemis.core.io.buffer.TimedBuffer;
|
||||||
|
@ -113,14 +114,7 @@ public abstract class AbstractSequentialFile implements SequentialFile {
|
||||||
|
|
||||||
ByteBuffer buffer = ByteBuffer.allocate(10 * 1024);
|
ByteBuffer buffer = ByteBuffer.allocate(10 * 1024);
|
||||||
|
|
||||||
for (;;) {
|
FileIOUtil.copyData(this, newFileName, buffer);
|
||||||
buffer.rewind();
|
|
||||||
int size = this.read(buffer);
|
|
||||||
newFileName.writeDirect(buffer, false);
|
|
||||||
if (size < 10 * 1024) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
newFileName.close();
|
newFileName.close();
|
||||||
this.close();
|
this.close();
|
||||||
}
|
}
|
||||||
|
|
|
@ -264,51 +264,63 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized ServerMessage copy() {
|
public ServerMessage copy() {
|
||||||
SequentialFile newfile = storageManager.createFileForLargeMessage(messageID, durable);
|
SequentialFile newfile = storageManager.createFileForLargeMessage(messageID, durable);
|
||||||
|
|
||||||
ServerMessage newMessage = new LargeServerMessageImpl(this, properties, newfile, messageID);
|
ServerMessage newMessage = new LargeServerMessageImpl(this, properties, newfile, messageID);
|
||||||
return newMessage;
|
return newMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void copyFrom(final SequentialFile fileSource) throws Exception {
|
|
||||||
this.bodySize = -1;
|
|
||||||
this.pendingCopy = fileSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void finishCopy() throws Exception {
|
public ServerMessage copy(final long newID) {
|
||||||
if (pendingCopy != null) {
|
|
||||||
SequentialFile copyTo = createFile();
|
|
||||||
try {
|
try {
|
||||||
this.pendingRecordID = storageManager.storePendingLargeMessage(this.messageID);
|
LargeServerMessage newMessage = storageManager.createLargeMessage(newID, this);
|
||||||
copyTo.open();
|
|
||||||
pendingCopy.open();
|
|
||||||
pendingCopy.copyTo(copyTo);
|
byte[] bufferBytes = new byte[100 * 1024];
|
||||||
|
|
||||||
|
ByteBuffer buffer = ByteBuffer.wrap(bufferBytes);
|
||||||
|
|
||||||
|
long oldPosition = file.position();
|
||||||
|
|
||||||
|
boolean originallyOpen = file.isOpen();
|
||||||
|
file.open();
|
||||||
|
file.position(0);
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
// The buffer is reused...
|
||||||
|
// We need to make sure we clear the limits and the buffer before reusing it
|
||||||
|
buffer.clear();
|
||||||
|
int bytesRead = file.read(buffer);
|
||||||
|
|
||||||
|
byte[] bufferToWrite;
|
||||||
|
if (bytesRead == 0) {
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
finally {
|
else if (bytesRead == bufferBytes.length) {
|
||||||
copyTo.close();
|
bufferToWrite = bufferBytes;
|
||||||
pendingCopy.close();
|
}
|
||||||
pendingCopy = null;
|
else {
|
||||||
|
bufferToWrite = new byte[bytesRead];
|
||||||
|
System.arraycopy(bufferBytes, 0, bufferToWrite, 0, bytesRead);
|
||||||
}
|
}
|
||||||
|
|
||||||
closeFile();
|
newMessage.addBytes(bufferToWrite);
|
||||||
bodySize = -1;
|
|
||||||
file = null;
|
if (bytesRead < bufferBytes.length) {
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
file.position(oldPosition);
|
||||||
* The copy of the file itself will be done later by {@link LargeServerMessageImpl#finishCopy()}
|
|
||||||
*/
|
if (!originallyOpen) {
|
||||||
@Override
|
file.close();
|
||||||
public synchronized ServerMessage copy(final long newID) {
|
}
|
||||||
try {
|
|
||||||
SequentialFile newfile = storageManager.createFileForLargeMessage(newID, durable);
|
|
||||||
|
|
||||||
LargeServerMessageImpl newMessage = new LargeServerMessageImpl(this, properties, newfile, newID);
|
|
||||||
newMessage.copyFrom(createFile());
|
|
||||||
return newMessage;
|
return newMessage;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(e, this);
|
ActiveMQServerLogger.LOGGER.lareMessageErrorCopying(e, this);
|
||||||
|
|
|
@ -48,8 +48,6 @@ public interface ServerMessage extends MessageInternal, EncodingSupport {
|
||||||
|
|
||||||
ServerMessage copy(long newID);
|
ServerMessage copy(long newID);
|
||||||
|
|
||||||
void finishCopy() throws Exception;
|
|
||||||
|
|
||||||
ServerMessage copy();
|
ServerMessage copy();
|
||||||
|
|
||||||
int getMemoryEstimate();
|
int getMemoryEstimate();
|
||||||
|
|
|
@ -148,7 +148,6 @@ public class Redistributor implements Consumer {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!reference.getMessage().isLargeMessage()) {
|
if (!reference.getMessage().isLargeMessage()) {
|
||||||
routingInfo.getB().finishCopy();
|
|
||||||
|
|
||||||
postOffice.processRoute(routingInfo.getB(), routingInfo.getA(), false);
|
postOffice.processRoute(routingInfo.getB(), routingInfo.getA(), false);
|
||||||
|
|
||||||
|
@ -160,7 +159,6 @@ public class Redistributor implements Consumer {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
routingInfo.getB().finishCopy();
|
|
||||||
|
|
||||||
postOffice.processRoute(routingInfo.getB(), routingInfo.getA(), false);
|
postOffice.processRoute(routingInfo.getB(), routingInfo.getA(), false);
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,6 @@ public class DivertImpl implements Divert {
|
||||||
// Shouldn't copy if it's not routed anywhere else
|
// Shouldn't copy if it's not routed anywhere else
|
||||||
if (!forwardAddress.equals(message.getAddress())) {
|
if (!forwardAddress.equals(message.getAddress())) {
|
||||||
copy = message.copy(id);
|
copy = message.copy(id);
|
||||||
copy.finishCopy();
|
|
||||||
|
|
||||||
// This will set the original MessageId, and the original address
|
// This will set the original MessageId, and the original address
|
||||||
copy.setOriginalHeaders(message, null, false);
|
copy.setOriginalHeaders(message, null, false);
|
||||||
|
|
|
@ -2222,7 +2222,6 @@ public class QueueImpl implements Queue {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
copyMessage.finishCopy();
|
|
||||||
postOffice.processRoute(copyMessage, routingContext, false);
|
postOffice.processRoute(copyMessage, routingContext, false);
|
||||||
|
|
||||||
ref.handled();
|
ref.handled();
|
||||||
|
|
|
@ -185,10 +185,6 @@ public class ServerMessageImpl extends MessageImpl implements ServerMessage {
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void finishCopy() throws Exception {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ServerMessage copy() {
|
public ServerMessage copy() {
|
||||||
// This is a simple copy, used only to avoid changing original properties
|
// This is a simple copy, used only to avoid changing original properties
|
||||||
|
@ -216,7 +212,6 @@ public class ServerMessageImpl extends MessageImpl implements ServerMessage {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ServerMessage copy = copy(newID);
|
ServerMessage copy = copy(newID);
|
||||||
copy.finishCopy();
|
|
||||||
|
|
||||||
if (copyOriginalHeaders) {
|
if (copyOriginalHeaders) {
|
||||||
copy.setOriginalHeaders(this, originalReference, expiry);
|
copy.setOriginalHeaders(this, originalReference, expiry);
|
||||||
|
|
|
@ -336,11 +336,6 @@ public class ScheduledDeliveryHandlerTest extends Assert {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void finishCopy() throws Exception {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ServerMessage copy() {
|
public ServerMessage copy() {
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue