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

Remove unneeded bwc code

This commit is contained in:
Simon Willnauer 2015-02-09 11:04:30 +01:00
parent 98a2482825
commit 93df178469
1 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
View File

@ -112,9 +112,6 @@ public class MembershipAction extends AbstractComponent {
DiscoveryNode node; DiscoveryNode node;
// here for backward compatibility. nodes with a version lower than 1.4.0 send this flag
boolean withClusterState = false;
private JoinRequest() { private JoinRequest() {
} }
@ -126,50 +123,16 @@ public class MembershipAction extends AbstractComponent {
public void readFrom(StreamInput in) throws IOException { public void readFrom(StreamInput in) throws IOException {
super.readFrom(in); super.readFrom(in);
node = DiscoveryNode.readNode(in); node = DiscoveryNode.readNode(in);
if (in.getVersion().before(Version.V_1_4_0_Beta1)) {
withClusterState = in.readBoolean();
}
} }
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out); super.writeTo(out);
node.writeTo(out); node.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0_Beta1)) {
// old with cluster state flag
out.writeBoolean(false);
}
} }
} }
// used to reply to nodes from a version older than 1.4.0 which may expect this
@Deprecated
class JoinResponse extends TransportResponse {
ClusterState clusterState;
JoinResponse() {
}
JoinResponse(ClusterState clusterState) {
this.clusterState = clusterState;
}
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
// we don't care about cluster name. This cluster state is never used.
clusterState = ClusterState.Builder.readFrom(in, nodesProvider.nodes().localNode(), null);
}
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
ClusterState.Builder.writeTo(clusterState, out);
}
}
private class JoinRequestRequestHandler extends BaseTransportRequestHandler<JoinRequest> { private class JoinRequestRequestHandler extends BaseTransportRequestHandler<JoinRequest> {
@Override @Override
@ -183,12 +146,7 @@ public class MembershipAction extends AbstractComponent {
@Override @Override
public void onSuccess() { public void onSuccess() {
try { try {
// nodes from a version older than 1.4.0 may ask for this
if (request.withClusterState) {
channel.sendResponse(new JoinResponse(clusterService.state()));
} else {
channel.sendResponse(TransportResponse.Empty.INSTANCE); channel.sendResponse(TransportResponse.Empty.INSTANCE);
}
} catch (Throwable t) { } catch (Throwable t) {
onFailure(t); onFailure(t);
} }
@ -215,23 +173,6 @@ public class MembershipAction extends AbstractComponent {
ValidateJoinRequest() { ValidateJoinRequest() {
} }
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
if (in.getVersion().before(Version.V_1_4_0_Beta1)) {
// cluster name doesn't matter...
ClusterState.Builder.readFrom(in, nodesProvider.nodes().localNode(), null);
}
}
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().before(Version.V_1_4_0_Beta1)) {
ClusterState.Builder.writeTo(clusterService.state(), out);
}
}
} }
private class ValidateJoinRequestRequestHandler extends BaseTransportRequestHandler<ValidateJoinRequest> { private class ValidateJoinRequestRequestHandler extends BaseTransportRequestHandler<ValidateJoinRequest> {