[
https://issues.apache.org/jira/browse/ARTEMIS-5573?focusedWorklogId=1014114&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-1014114
]
ASF GitHub Bot logged work on ARTEMIS-5573:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 08/Apr/26 22:10
Start Date: 08/Apr/26 22:10
Worklog Time Spent: 10m
Work Description: tabish121 commented on code in PR #6323:
URL: https://github.com/apache/artemis/pull/6323#discussion_r3054417561
##########
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessagePersisterV2.java:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.protocol.amqp.broker;
+
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.core.persistence.CoreMessageObjectPools;
+import org.apache.activemq.artemis.utils.DataConstants;
+
+import static
org.apache.activemq.artemis.core.persistence.PersisterIDs.AMQPLargeMessagePersisterV2_ID;
+
+public class AMQPLargeMessagePersisterV2 extends AMQPLargeMessagePersister {
+
+ public static final byte ID = AMQPLargeMessagePersisterV2_ID;
+
+ public static AMQPLargeMessagePersisterV2 theInstance;
+
+ public static AMQPLargeMessagePersisterV2 getInstance() {
+ if (theInstance == null) {
+ theInstance = new AMQPLargeMessagePersisterV2();
+ }
+ return theInstance;
+ }
+
+ @Override
+ public byte getID() {
+ return ID;
+ }
+
+ public AMQPLargeMessagePersisterV2() {
+ super();
+ }
+
+
+ @Override
+ public int getEncodeSize(Message record) {
+ return super.getEncodeSize(record) +
+ DataConstants.SIZE_INT + // size delimiter for future use to keep
compatibility better
+ DataConstants.SIZE_INT;
+ }
+
+ /**
+ * Sub classes must add the first short as the protocol-id
+ */
+ @Override
+ public void encode(ActiveMQBuffer buffer, Message record) {
+ super.encode(buffer, record);
+
+ AMQPLargeMessage msgEncode = (AMQPLargeMessage) record;
+ buffer.writeInt(DataConstants.SIZE_INT);
Review Comment:
Same comment as below here, writing 4 here means you've excluded the int
value of four from having any meaning in this field moving forward
##########
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessagePersisterV4.java:
##########
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.protocol.amqp.broker;
+
+import java.lang.invoke.MethodHandles;
+
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.core.persistence.CoreMessageObjectPools;
+import org.apache.activemq.artemis.utils.DataConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static
org.apache.activemq.artemis.core.persistence.PersisterIDs.AMQPMessagePersisterV4_ID;
+
+/**
+ * V4 adds a size field to determine persister boundaries, enabling
forward-compatible
+ * extensions without additional versioning.
+ **/
+public class AMQPMessagePersisterV4 extends AMQPMessagePersisterV3 {
+
+ private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ public static final byte ID = AMQPMessagePersisterV4_ID;
+
+ public static AMQPMessagePersisterV4 theInstance;
+
+ public static AMQPMessagePersisterV4 getInstance() {
+ if (theInstance == null) {
+ theInstance = new AMQPMessagePersisterV4();
+ }
+ return theInstance;
+ }
+
+ @Override
+ public byte getID() {
+ return ID;
+ }
+
+ public AMQPMessagePersisterV4() {
+ super();
+ }
+
+
+ @Override
+ public int getEncodeSize(Message record) {
+ int encodeSize = super.getEncodeSize(record) +
+ DataConstants.SIZE_INT + // size boundary, for future versions
+ DataConstants.SIZE_INT; // Memory estimate
+ return encodeSize;
+ }
+
+
+ /**
+ * Sub classes must add the first short as the protocol-id
+ */
+ @Override
+ public void encode(ActiveMQBuffer buffer, Message record) {
+ super.encode(buffer, record);
+
+ // this is to allow us to determine the boundary of this persister, for
future use.
+ buffer.writeInt(DataConstants.SIZE_INT); // for future use
+
+ buffer.writeInt(record.getMemoryEstimate());
+ }
+
+ @Override
+ public Message decode(ActiveMQBuffer buffer, Message ignore,
CoreMessageObjectPools pool) {
+ Message record = super.decode(buffer, ignore, pool);
+
+ assert record != null &&
AMQPStandardMessage.class.equals(record.getClass());
+
+ // This might be useful in the future if we need to add more data to
this persister. For now, it's just a filler.
+ int sizeV4 = buffer.readInt();
Review Comment:
So what would you want to store in this extra int field that you've written
the value if DataConstants.SIZE_INT which is four, so in the future you cannot
write anything into there that can be four and know if you are reading current
data or the old default. Would zero not be a better default as the absence of
something is surely easier to deal with moving forward?
Issue Time Tracking
-------------------
Worklog Id: (was: 1014114)
Time Spent: 7h 20m (was: 7h 10m)
> Make AMQP Size immutable
> ------------------------
>
> Key: ARTEMIS-5573
> URL: https://issues.apache.org/jira/browse/ARTEMIS-5573
> Project: Artemis
> Issue Type: Improvement
> Components: AMQP
> Affects Versions: 2.41.0
> Reporter: Clebert Suconic
> Assignee: Clebert Suconic
> Priority: Major
> Labels: pull-request-available
> Time Spent: 7h 20m
> Remaining Estimate: 0h
>
> I have had a lot of issues, even recently on races between re-evaluating a
> message size in AMQP.
> Say a lazy decode happens at the wrong time and the memory estimates can be
> wrong.
> We have fixed issues along the years, but this is still a fragile process
> that is bound to fail. If an user for instance add a plugin breaking the
> chain of events.
> For that reason the memory estimate should already include enough estimation
> for any properties decoded and the process should be simplified.
> Less moving parts would mean less possibilities for bugs.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
