Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.12] Map data tiers roles onto DATA legacy role for <7.3 (#71628) #71672

Merged
merged 1 commit into from
Apr 14, 2021
Merged

[7.12] Map data tiers roles onto DATA legacy role for <7.3 (#71628) #71672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -330,8 +329,11 @@ public void writeTo(StreamOutput out) throws IOException {
}
} else {
// an old node will only understand legacy roles since pluggable roles is a new concept
final List<DiscoveryNodeRole> rolesToWrite =
roles.stream().filter(DiscoveryNodeRole.LEGACY_ROLES::contains).collect(Collectors.toList());
final Set<DiscoveryNodeRole> rolesToWrite = roles.stream()
.map(role -> role.getCompatibilityRole(out.getVersion()))
.filter(DiscoveryNodeRole.LEGACY_ROLES::contains)
.collect(Collectors.toSet());

out.writeVInt(rolesToWrite.size());
for (final DiscoveryNodeRole role : rolesToWrite) {
if (role == DiscoveryNodeRole.MASTER_ROLE) {
Expand Down
16 changes: 16 additions & 0 deletions server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,22 @@ public DiscoveryNodeRole getCompatibilityRole(Version nodeVersion) {
equalTo("data"));
}

{
// a pre 7.3.0 node will only understand legacy roles so let's test a custom data containing node role is mapped onto the
// `DATA` role
DiscoveryNode nodeToWrite = new DiscoveryNode("name1", "id1", transportAddress, emptyMap(),
org.elasticsearch.common.collect.Set.of(customRole, DiscoveryNodeRole.MASTER_ROLE), Version.CURRENT);

BytesStreamOutput streamOutput = new BytesStreamOutput();
streamOutput.setVersion(Version.V_7_2_0);
nodeToWrite.writeTo(streamOutput);

StreamInput in = StreamInput.wrap(streamOutput.bytes().toBytesRef().bytes);
in.setVersion(Version.V_7_2_0);
DiscoveryNode serialized = new DiscoveryNode(in);
assertThat(serialized.getRoles().stream().map(DiscoveryNodeRole::roleName).sorted().collect(Collectors.joining(",")),
equalTo("data,master"));
}
}

public void testDiscoveryNodeIsRemoteClusterClientDefault() {
Expand Down