ARTEMIS-5573 and ARTEMIS-5975 Improve AMQP Size estimation#6323
ARTEMIS-5573 and ARTEMIS-5975 Improve AMQP Size estimation#6323clebertsuconic wants to merge 2 commits 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
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
|
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 |
|
I added a commit addressing the comments, let me know when I can squash it please |
|
I added another commit to be squashed after review |
| // this is to allow us to determine the boundary of this persister, for future use. | ||
| buffer.writeInt(PERSISTER_SIZE); |
There was a problem hiding this comment.
I can see is that this would in future allows older brokers unaware of future changes to this new persister, to skip over anything added that they dont understand...but, do we actually send these 'persister encodings' over the wire at all? Wouldnt that make these changes already incompatible with existing versions if so? I kinda wonder if thats worth it if so, in order to write information thats already available via the message.
Either way, if we ever changed this v4 persister (or the v2 large) in future to do something else, and start writing a bigger value here so that old brokers can skip it, then surely we end up having to have the new broker inspect the size during decode and guess from any possible 'past variants of v4' what specific things were added 'without changing he persister [version]' are actually present or not in any given v4 (/v2 large) message encountered, purely from the size it finds?
That seems like it could be a bit of a PITA. Would it not be simpler long term to just have a basic list/map/array style structure so that we can always easily determine/look-up the values the given version understands and not need to be concerned with manually determining anything when additions are made? If we did that at the start then perhaps it would still be the V1 persister in use, unless we made some sort of drastic removal?
There was a problem hiding this comment.
we already have extraProperties... but I don't want to use it here.. I wanted to keep it lean and just encoded
| } | ||
|
|
||
| combinations.add(new Object[]{ARTEMIS_2_44_0, SNAPSHOT}); | ||
| combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_44_0}); |
There was a problem hiding this comment.
Is it expected there are now no combinations with a new main broker and old backup? There were 3 before which seems a bit of a switch up. EDIT: ah, so is that about persister incompatibility?
There was a problem hiding this comment.
version compatibility support is alwasys forward . the backward compatibility is best effort.. and this case the journal persistence is broken by V4. the older version won't understand V4.
|
when I worked on this I wasn't planning to rewrite persistence for AMQP messages. I will work on something for those persisters. |
|
I am now using a MacCodec instead of a streamed bytes. I am not using a Hashmap to store records in between, but there's a codec that will store it like it was a hashMap. I also added a clustering compatibility tests since the persistence is used with clustering. |
- making it immutable to avoid races after updates like we had in the past - avoiding scanning after reloading by persisting extra data on storage
gemmellr
left a comment
There was a problem hiding this comment.
Gave it a skim over time, havent closely looked at most of it, but still had various comments so here they are. Most important one being, I do not think this should be in 2.54.0 at this stage.
| // 2.37.0 | ||
| public static final int ARTEMIS_2_37_0_VERSION = 136; | ||
|
|
||
| public static final int ARTEMIS_2_54_0_VERSION = 137; |
There was a problem hiding this comment.
I do not think this complex disk/wire level change should be targeting 2.54.0 at this late stage (it was already meant to be out).
There was a problem hiding this comment.
I will rename to whatever comes next.. I used 54 at it's the next one now...
There was a problem hiding this comment.
read it as TBD for now
| private static final ThreadLocal<AMQPMessageMapCodec> threadLocal = ThreadLocal.withInitial(AMQPMessageMapCodec::new); | ||
|
|
||
| public static AMQPMessageMapCodec getInstance() { | ||
| AMQPMessageMapCodec reader = threadLocal.get(); | ||
| return reader; | ||
| } |
There was a problem hiding this comment.
Possibly over-thinking it, but the this got me wondering if rather than a subclass, this would work nicer as a method that took a processor / callback-handler style argument. The persister would then just need 1 of those while it worked during startup and then it would go away when done, unlike this. You could also then separately test the codec class (current parent) and the processor/callback fully that way rather than e.g creating a test subclass to test the parent bits, and not really directly testing this class at all [it seems so far].
The large and regular persister could still use the same processor and then just toggle a flag to indicate which behaviour to give.
There was a problem hiding this comment.
@gemmellr I can do that. although I'm using a thread local now because of the state I needed to store before creating a message.
There's one changed I wanted to make on the constructors for AMQPStandardMessage and AMQPLargeMessage, that I could keep the implementation stateless, and just post data directly on the message. then I wouldn't need a ThreadLocal and I could just work with the message directly.
There was a problem hiding this comment.
not sure about a callback. I tried that before I sent the PR and I didn't like it.
|
@gemmellr I am marking this as draft because of the versioning.. whenever we decide to merge it I will change it and make it ready to commit |
No description provided.