honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Set<Role> to EnumSet<Role> in DiscoveryNode

This commit is contained in:
javanna 2016-03-29 12:33:14 +02:00 committed by Luca Cavanna
parent 5794455912
commit f7becf1f53
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
View File

@ -33,8 +33,8 @@ import org.elasticsearch.node.Node;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -88,7 +88,7 @@ public class DiscoveryNode implements Writeable<DiscoveryNode>, ToXContent {
private final TransportAddress address; private final TransportAddress address;
private final Map<String, String> attributes; private final Map<String, String> attributes;
private final Version version; private final Version version;
private final Set<Role> roles; private final EnumSet<Role> roles;
/** /**
* Creates a new {@link DiscoveryNode} by reading from the stream provided as argument * Creates a new {@link DiscoveryNode} by reading from the stream provided as argument
@ -107,13 +107,13 @@ public class DiscoveryNode implements Writeable<DiscoveryNode>, ToXContent {
this.attributes.put(in.readString(), in.readString()); this.attributes.put(in.readString(), in.readString());
} }
int rolesSize = in.readVInt(); int rolesSize = in.readVInt();
this.roles = new HashSet<>(rolesSize); this.roles = EnumSet.noneOf(Role.class);
for (int i = 0; i < rolesSize; i++) { for (int i = 0; i < rolesSize; i++) {
int ordinal = in.readVInt(); int ordinal = in.readVInt();
if (ordinal < 0 || ordinal >= Role.values().length) { if (ordinal < 0 || ordinal >= Role.values().length) {
throw new IOException("Unknown Role ordinal [" + ordinal + "]"); throw new IOException("Unknown Role ordinal [" + ordinal + "]");
} }
roles.add(Role.values()[in.readVInt()]); this.roles.add(Role.values()[in.readVInt()]);
} }
this.version = Version.readVersion(in); this.version = Version.readVersion(in);
} }
@ -218,7 +218,9 @@ public class DiscoveryNode implements Writeable<DiscoveryNode>, ToXContent {
assert attributes.containsKey(role.getRoleName()) == false : "role name [" + role.getRoleName() + "] found in attributes"; assert attributes.containsKey(role.getRoleName()) == false : "role name [" + role.getRoleName() + "] found in attributes";
} }
} }
this.roles = roles; Set<Role> rolesSet = Collections.unmodifiableSet(roles);
this.roles = EnumSet.noneOf(Role.class);
this.roles.addAll(rolesSet);
} }
/** /**
@ -305,6 +307,10 @@ public class DiscoveryNode implements Writeable<DiscoveryNode>, ToXContent {
return roles.contains(Role.INGEST); return roles.contains(Role.INGEST);
} }
/**
* Returns a set of all the roles that the node fulfills.
* If the node doesn't have any specific role, the set is returned empty, which means that the node is a coordinating only node.
*/
public Set<Role> getRoles() { public Set<Role> getRoles() {
return roles; return roles;
} }
@ -401,6 +407,10 @@ public class DiscoveryNode implements Writeable<DiscoveryNode>, ToXContent {
return builder; return builder;
} }
/**
* Enum that holds all the possible roles that that a node can fulfill in a cluster.
* Each role has its name and a corresponding abbreviation used by cat apis.
*/
public enum Role { public enum Role {
MASTER("master", "m"), MASTER("master", "m"),
DATA("data", "d"), DATA("data", "d"),

4
core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java
View File

@ -31,7 +31,6 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.node.Node; import org.elasticsearch.node.Node;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -83,7 +82,6 @@ public class DiscoveryNodeService extends AbstractComponent {
roles.add(role); roles.add(role);
} }
} }
for (CustomAttributesProvider provider : customAttributesProviders) { for (CustomAttributesProvider provider : customAttributesProviders) {
try { try {
Map<String, String> customAttributes = provider.buildAttributes(); Map<String, String> customAttributes = provider.buildAttributes();
@ -99,7 +97,7 @@ public class DiscoveryNodeService extends AbstractComponent {
} }
} }
return new DiscoveryNode(Node.NODE_NAME_SETTING.get(settings), nodeId, publishAddress, attributes, return new DiscoveryNode(Node.NODE_NAME_SETTING.get(settings), nodeId, publishAddress, attributes,
Collections.unmodifiableSet(roles), version); roles, version);
} }
public interface CustomAttributesProvider { public interface CustomAttributesProvider {