Skipping serialization of node attributes in Leader and follower checks

Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
opensearch-project · Aug 23, 2024 · b8383ce · b8383ce
1 parent b830d68
commit b8383ce
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java b/server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java
@@ -504,6 +504,11 @@ public void writeTo(final StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeLong(term);
             sender.writeTo(out);
+//            if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
+//                sender.writeToWithoutAttribute(out);
+//            } else {
+//                sender.writeTo(out);
+//            }
         }
 
         @Override

diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java
@@ -358,17 +358,35 @@ public DiscoveryNode(StreamInput in) throws IOException {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
+        writeToUtil(out, true);
+    }
+
+    public void writeToWithoutAttribute(StreamOutput out) throws IOException {
+        if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
+            writeToUtil(out, false);
+        } else {
+            writeToUtil(out, true);
+        }
+    }
+
+    private void writeToUtil(StreamOutput out, boolean includeAttributes) throws IOException {
         out.writeString(nodeName);
         out.writeString(nodeId);
         out.writeString(ephemeralId);
         out.writeString(hostName);
         out.writeString(hostAddress);
         address.writeTo(out);
-        out.writeVInt(attributes.size());
-        for (Map.Entry<String, String> entry : attributes.entrySet()) {
-            out.writeString(entry.getKey());
-            out.writeString(entry.getValue());
+        if (includeAttributes) {
+            out.writeVInt(attributes.size());
+            for (Map.Entry<String, String> entry : attributes.entrySet()) {
+                out.writeString(entry.getKey());
+                out.writeString(entry.getValue());
+            }
+        } else {
+            // Set the size of attribute as 0 so that no attribute is read from stream on receiver node.
+            out.writeVInt(0);
         }
+
         out.writeVInt(roles.size());
         for (final DiscoveryNodeRole role : roles) {
             final DiscoveryNodeRole compatibleRole = role.getCompatibilityRole(out.getVersion());
@@ -566,7 +584,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field("name", getName());
         builder.field("ephemeral_id", getEphemeralId());
         builder.field("transport_address", getAddress().toString());
-
         builder.startObject("attributes");
         for (Map.Entry<String, String> entry : attributes.entrySet()) {
             builder.field(entry.getKey(), entry.getValue());