This is an automated email from the ASF dual-hosted git repository.

shishkovilja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 4580a1399bf IGNITE-27605 Use MessageSerializer for 
ChangeGlobalStateFinishMessage (#12645)
4580a1399bf is described below

commit 4580a1399bf3aef7dc35994d2d00b22ce2172ad4
Author: Dmitry Werner <[email protected]>
AuthorDate: Fri Mar 6 11:53:35 2026 +0500

    IGNITE-27605 Use MessageSerializer for ChangeGlobalStateFinishMessage 
(#12645)
---
 .../discovery/DiscoveryMessageFactory.java         |  3 ++
 .../cluster/ChangeGlobalStateFinishMessage.java    | 32 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
index f15a181026a..e3b3ca17333 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
@@ -41,6 +41,8 @@ import 
org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposed
 import 
org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposedMessageSerializer;
 import 
org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAcceptedMessage;
 import 
org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAcceptedMessageSerializer;
+import 
org.apache.ignite.internal.processors.cluster.ChangeGlobalStateFinishMessage;
+import 
org.apache.ignite.internal.processors.cluster.ChangeGlobalStateFinishMessageSerializer;
 import 
org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessage;
 import 
org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessageSerializer;
 import 
org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage;
@@ -168,5 +170,6 @@ public class DiscoveryMessageFactory implements 
MessageFactoryProvider {
             new TxTimeoutOnPartitionMapExchangeChangeMessageSerializer());
         factory.register((short)510, UserAcceptedMessage::new, new 
UserAcceptedMessageSerializer());
         factory.register((short)511, UserProposedMessage::new, new 
UserProposedMessageSerializer());
+        factory.register((short)512, ChangeGlobalStateFinishMessage::new, new 
ChangeGlobalStateFinishMessageSerializer());
     }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
index 9f73c154db6..c4cb43c9b1a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateFinishMessage.java
@@ -19,45 +19,58 @@ package org.apache.ignite.internal.processors.cluster;
 
 import java.util.UUID;
 import org.apache.ignite.cluster.ClusterState;
+import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoCache;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  *
  */
-public class ChangeGlobalStateFinishMessage implements DiscoveryCustomMessage {
+public class ChangeGlobalStateFinishMessage implements DiscoveryCustomMessage, 
Message {
     /** */
     private static final long serialVersionUID = 0L;
 
     /** Custom message ID. */
-    private final IgniteUuid id = IgniteUuid.randomUuid();
+    @Order(0)
+    IgniteUuid id;
 
     /** State change request ID. */
-    private final UUID reqId;
+    @Order(1)
+    UUID reqId;
 
     /** New cluster state. */
-    private final ClusterState state;
+    @Order(2)
+    ClusterState state;
 
     /** State change error. */
-    private Boolean transitionRes;
+    @Order(3)
+    boolean transitionRes;
+
+    /** Constructor. */
+    public ChangeGlobalStateFinishMessage() {
+        // No-op.
+    }
 
     /**
      * @param reqId State change request ID.
      * @param state New cluster state.
+     * @param transitionRes State change error.
      */
     public ChangeGlobalStateFinishMessage(
         UUID reqId,
         ClusterState state,
-        Boolean transitionRes
+        boolean transitionRes
     ) {
         assert reqId != null;
         assert state != null;
 
+        id = IgniteUuid.randomUuid();
         this.reqId = reqId;
         this.state = state;
         this.transitionRes = transitionRes;
@@ -83,7 +96,7 @@ public class ChangeGlobalStateFinishMessage implements 
DiscoveryCustomMessage {
      * @return Transition success status.
      */
     public boolean success() {
-        return transitionRes == null ? state.active() : transitionRes;
+        return transitionRes;
     }
 
     /**
@@ -118,4 +131,9 @@ public class ChangeGlobalStateFinishMessage implements 
DiscoveryCustomMessage {
     @Override public String toString() {
         return S.toString(ChangeGlobalStateFinishMessage.class, this);
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 512;
+    }
 }

Reply via email to