ARTEMIS-5573 and ARTEMIS-5975 Improve AMQP Size estimation#6323
ARTEMIS-5573 and ARTEMIS-5975 Improve AMQP Size estimation#6323clebertsuconic wants to merge 1 commit intoapache:mainfrom
Conversation
f70cda5 to
be90ac4
Compare
0611d5a to
03b7176
Compare
94efe35 to
70beb3a
Compare
tabish121
left a comment
There was a problem hiding this comment.
Overall looks good, nice simplification of some of the message handling
...mqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
Outdated
Show resolved
Hide resolved
...mqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
Outdated
Show resolved
Hide resolved
...rotocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
Outdated
Show resolved
Hide resolved
7c02c99 to
8f1e497
Compare
...mqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
Show resolved
Hide resolved
8f1e497 to
6606896
Compare
...mqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
Outdated
Show resolved
Hide resolved
|
|
||
|
|
||
| // this is "borrowed" from: | ||
| // https://github.com/apache/qpid-proton-j/blob/6dc5587f1d1b23969a8994f1755198e638e92bc4/proton-j/src/main/java/org/apache/qpid/proton/codec/messaging/FastPathApplicationPropertiesType.java#L93-L115 |
There was a problem hiding this comment.
This was inspired by the proton-j version but isn't a copy and it omits some of the actual validation checks that are done in the proton-j version which are not as thorough as they likely should be but are still better than not validating the encoding at all.
There was a problem hiding this comment.
@tabish121 I don't understand what you're asking me to do here? update the comment?
There was a problem hiding this comment.
@tabish121 this is being called right after the readConstructor was read. the only thing that would be decoded would be either this, or the skipValue() which is doing pretty much the same as this code is doing now.
I'm confused on what are you asking
There was a problem hiding this comment.
I'm saying this does no validation on the data it reads, such as checking that the size value is smaller than the data remaining or on enforcing that the count is actually divisible by two which could indicate that the payload is corrupt if it isn't. I know proton-j does check at least the size data or maybe it checks that count isn't large than the data remaining in the buffer.
My point is that some validation might be sensible here to ensure valid data is being used up front.
There was a problem hiding this comment.
This is doing the same validation thst was being done before.
If you follow the previous call all cobstructor.skipvalue does is read the value and move the bytes.
There was a problem hiding this comment.
I can add the validation though, but this is the same semantic as before.
...ocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
Outdated
Show resolved
Hide resolved
...ocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
Show resolved
Hide resolved
.../org/apache/activemq/artemis/tests/integration/amqp/AMQPDecodeApplicationPropertiesTest.java
Outdated
Show resolved
Hide resolved
|
I added a commit to be squashed, returning the RELOAD state and persisting the memory estimate on the storage (journal or paging). I honestly don't think the scan will make any difference.. The real issue is that the estimates were wrong in the first place... But this commit should settle any discussion. I think There are already version tests in the Version tests. but i will make sure about it soon. |
|
for some reason I'm having to use a different persister, and I would have to digg on previous versions to understand why. I will do some investigation tomorrow, but most likely I will need the V4 persister. |
09bb86b to
540ad20
Compare
|
The reason I had to add a V4 is because of Paging: On this part here, I encode the number of queues and the queueIDs: At the point of the encoder I don't have any reference to the number of bytes used by its own decoder. I'm adding one on V4 now, if in the future anything else is added, we will stop reading at that marker. |
1cb4403 to
fa1128e
Compare
...mqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
Outdated
Show resolved
Hide resolved
|
I intend to squash the second commit on the first as soon some review is done on the new persister. |
|
I'm setting it as ready to review. but this commit should be squashed before merged. |
|
I needed to add versioning to AMQPLargeMessagePersister as well. I could choose to skip memory calculations on large message... however I will prefer to keep it the same way as StandardMessage. this is also better for future additions |
...l/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersisterV4.java
Outdated
Show resolved
Hide resolved
...l/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersisterV4.java
Outdated
Show resolved
Hide resolved
.../main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessagePersisterV2.java
Outdated
Show resolved
Hide resolved
...mqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
Outdated
Show resolved
Hide resolved
...ocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
Show resolved
Hide resolved
- making it immutable to avoid races after updates like we had in the past - avoiding scanning after reloading by persisting extra data on storage
No description provided.