Skip to content

Commit

Permalink
Skipping serialization of node attributes in Leader and follower checks
Browse files Browse the repository at this point in the history
Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
  • Loading branch information
RS146BIJAY committed Sep 1, 2024
1 parent 71d122b commit f87625f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.opensearch.Version;
import org.opensearch.cluster.ClusterManagerMetrics;
import org.opensearch.cluster.coordination.Coordinator.Mode;
import org.opensearch.cluster.node.DiscoveryNode;
Expand Down Expand Up @@ -503,7 +504,11 @@ public FollowerCheckRequest(final StreamInput in) throws IOException {
public void writeTo(final StreamOutput out) throws IOException {
super.writeTo(out);
out.writeLong(term);
sender.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
sender.writeToWithoutAttribute(out);
} else {
sender.writeTo(out);
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
*
* @opensearch.api
*/
@PublicApi(since = "1.0.0")
@PublicApi(since = "2.17.0")
public class DiscoveryNode implements Writeable, ToXContentFragment {

static final String COORDINATING_ONLY = "coordinating_only";
Expand Down Expand Up @@ -369,13 +369,34 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeString(entry.getKey());
out.writeString(entry.getValue());
}

out.writeVInt(roles.size());
for (final DiscoveryNodeRole role : roles) {
final DiscoveryNodeRole compatibleRole = role.getCompatibilityRole(out.getVersion());
out.writeString(compatibleRole.roleName());
out.writeString(compatibleRole.roleNameAbbreviation());
out.writeBoolean(compatibleRole.canContainData());
}

out.writeVersion(version);
}

public void writeToWithoutAttribute(StreamOutput out) throws IOException {
out.writeString(nodeName);
out.writeString(nodeId);
out.writeString(ephemeralId);
out.writeString(hostName);
out.writeString(hostAddress);
address.writeTo(out);
out.writeVInt(0);
out.writeVInt(roles.size());
for (final DiscoveryNodeRole role : roles) {
final DiscoveryNodeRole compatibleRole = role.getCompatibilityRole(out.getVersion());
out.writeString(compatibleRole.roleName());
out.writeString(compatibleRole.roleNameAbbreviation());
out.writeBoolean(compatibleRole.canContainData());
}

out.writeVersion(version);
}

Expand Down Expand Up @@ -572,7 +593,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.field(entry.getKey(), entry.getValue());
}
builder.endObject();

builder.endObject();
return builder;
}
Expand Down

0 comments on commit f87625f

Please sign in to comment.