Skip to content

Introduce Primary Terms #14062

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

Closed
wants to merge 19 commits into from
Closed

Introduce Primary Terms #14062

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a798db3
initial commit
bleskes Oct 9, 2015
905404c
better handling of primary term in builder
bleskes Oct 10, 2015
3dff0ea
fix StartedShardsRoutingTests
bleskes Oct 10, 2015
47ff727
fix ClusterStateCreationUtils
bleskes Oct 10, 2015
849876b
move primary term syncing with meta data to AllocationService.
bleskes Oct 10, 2015
f8c6e6b
add primary terms to ClusterState's XContent rendering
bleskes Oct 11, 2015
2ea979d
add some assertions to RecoveryFromGatewayIT
bleskes Oct 11, 2015
f1434f4
failed to increment routing table and meta data table
bleskes Oct 11, 2015
3d3df93
truely copy the primaryTerms array
bleskes Oct 11, 2015
82f65fa
fix RoutingTableTests to user routing results
bleskes Oct 11, 2015
58446fc
minor tweak java docs
bleskes Oct 12, 2015
c325413
fix double term increment
bleskes Oct 13, 2015
2430a3b
hash codes for the works (and some feedback)
bleskes Oct 13, 2015
69c98d6
feedback review
bleskes Oct 15, 2015
ae1690c
move to writVIntArray
bleskes Oct 15, 2015
f5499d3
fancy hashing
bleskes Oct 16, 2015
3d5afcb
fix double version increments + some improved docs
bleskes Oct 19, 2015
21d2654
move primaryTerm to a long
bleskes Oct 19, 2015
a13a424
final feeback
bleskes Oct 21, 2015
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
31 changes: 14 additions & 17 deletions core/src/main/java/org/elasticsearch/cluster/ClusterState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import com.carrotsearch.hppc.cursors.ObjectCursor;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;

import org.elasticsearch.cluster.DiffableUtils.KeyedReader;
import org.elasticsearch.cluster.block.ClusterBlock;
import org.elasticsearch.cluster.block.ClusterBlocks;
Expand All @@ -31,12 +30,7 @@
import org.elasticsearch.cluster.metadata.MetaData;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.routing.IndexRoutingTable;
import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
import org.elasticsearch.cluster.routing.RoutingNode;
import org.elasticsearch.cluster.routing.RoutingNodes;
import org.elasticsearch.cluster.routing.RoutingTable;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.*;
import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
import org.elasticsearch.cluster.service.InternalClusterService;
import org.elasticsearch.common.Nullable;
Expand All @@ -57,11 +51,7 @@
import org.elasticsearch.discovery.zen.publish.PublishClusterStateAction;

import java.io.IOException;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.*;

/**
* Represents the current state of the cluster.
Expand Down Expand Up @@ -137,7 +127,7 @@ public static <T extends Custom> T lookupPrototype(String type) {

public static <T extends Custom> T lookupPrototypeSafe(String type) {
@SuppressWarnings("unchecked")
T proto = (T)customPrototypes.get(type);
T proto = (T) customPrototypes.get(type);
if (proto == null) {
throw new IllegalArgumentException("No custom state prototype registered for type [" + type + "]");
}
Expand Down Expand Up @@ -478,6 +468,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
}
builder.endArray();

builder.startObject("primary_terms");
for (int shard = 0; shard < indexMetaData.getNumberOfShards(); shard++) {
builder.field(Integer.toString(shard), indexMetaData.primaryTerm(shard));
}
builder.endObject();

builder.endObject();
}
builder.endObject();
Expand Down Expand Up @@ -593,6 +589,7 @@ public Builder nodes(DiscoveryNodes nodes) {

public Builder routingResult(RoutingAllocation.Result routingResult) {
this.routingTable = routingResult.routingTable();
this.metaData = routingResult.metaData();
return this;
}

Expand Down Expand Up @@ -673,16 +670,16 @@ public static byte[] toBytes(ClusterState state) throws IOException {
}

/**
* @param data input bytes
* @param localNode used to set the local node in the cluster state.
* @param data input bytes
* @param localNode used to set the local node in the cluster state.
*/
public static ClusterState fromBytes(byte[] data, DiscoveryNode localNode) throws IOException {
return readFrom(StreamInput.wrap(data), localNode);
}

/**
* @param in input stream
* @param localNode used to set the local node in the cluster state. can be null.
* @param in input stream
* @param localNode used to set the local node in the cluster state. can be null.
*/
public static ClusterState readFrom(StreamInput in, @Nullable DiscoveryNode localNode) throws IOException {
return PROTO.readFrom(in, localNode);
Expand Down
Loading