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

Simplify assignToNode to only do initializing 

The method really only should do the move from unassigned to initializing, all the other moves have explicit methods like relocate
This commit is contained in:
Shay Banon 2015-07-14 15:47:32 +02:00
parent 5324855224
commit c6b110c6ef
8 changed files with 39 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java
View File

@ -363,37 +363,16 @@ public class RoutingNodes implements Iterable<RoutingNode> {
} }
/** /**
* Assign a shard to a node. This will increment the inactiveShardCount counter * Moves a shard from unassigned to initialize state
* and the inactivePrimaryCount counter if the shard is the primary.
* In case the shard is already assigned and started, it will be marked as
* relocating, which is accounted for, too, so the number of concurrent relocations
* can be retrieved easily.
* This method can be called several times for the same shard, only the first time
* will change the state.
*
* INITIALIZING => INITIALIZING
* UNASSIGNED => INITIALIZING
* STARTED => RELOCATING
* RELOCATING => RELOCATING
*
* @param shard the shard to be assigned
* @param nodeId the nodeId this shard should initialize on or relocate from
*/ */
public void assign(ShardRouting shard, String nodeId) { public void initialize(ShardRouting shard, String nodeId) {
// state will not change if the shard is already initializing. assert shard.unassigned() : shard;
ShardRoutingState oldState = shard.state(); shard.initialize(nodeId);
shard.assignToNode(nodeId);
node(nodeId).add(shard); node(nodeId).add(shard);
if (oldState == ShardRoutingState.UNASSIGNED) {
inactiveShardCount++; inactiveShardCount++;
if (shard.primary()) { if (shard.primary()) {
inactivePrimaryCount++; inactivePrimaryCount++;
} }
}
if (shard.state() == ShardRoutingState.RELOCATING) {
relocatingShards++;
}
assignedShardsAdd(shard); assignedShardsAdd(shard);
} }
@ -406,7 +385,8 @@ public class RoutingNodes implements Iterable<RoutingNode> {
relocatingShards++; relocatingShards++;
shard.relocate(nodeId); shard.relocate(nodeId);
ShardRouting target = shard.buildTargetRelocatingShard(); ShardRouting target = shard.buildTargetRelocatingShard();
assign(target, target.currentNodeId()); node(target.currentNodeId()).add(target);
assignedShardsAdd(target);
return target; return target;
} }

29
core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java
View File

@ -350,7 +350,7 @@ public final class ShardRouting implements Streamable, ToXContent {
void moveToUnassigned(UnassignedInfo unassignedInfo) { void moveToUnassigned(UnassignedInfo unassignedInfo) {
ensureNotFrozen(); ensureNotFrozen();
version++; version++;
assert state != ShardRoutingState.UNASSIGNED; assert state != ShardRoutingState.UNASSIGNED : this;
state = ShardRoutingState.UNASSIGNED; state = ShardRoutingState.UNASSIGNED;
currentNodeId = null; currentNodeId = null;
relocatingNodeId = null; relocatingNodeId = null;
@ -358,24 +358,15 @@ public final class ShardRouting implements Streamable, ToXContent {
} }
/** /**
* Assign this shard to a node. * Initializes an unassigned shard on a node.
*
* @param nodeId id of the node to assign this shard to
*/ */
void assignToNode(String nodeId) { void initialize(String nodeId) {
ensureNotFrozen(); ensureNotFrozen();
version++; version++;
if (currentNodeId == null) { assert state == ShardRoutingState.UNASSIGNED : this;
assert state == ShardRoutingState.UNASSIGNED; assert relocatingNodeId == null : this;
state = ShardRoutingState.INITIALIZING; state = ShardRoutingState.INITIALIZING;
currentNodeId = nodeId; currentNodeId = nodeId;
relocatingNodeId = null;
} else if (state == ShardRoutingState.STARTED) {
state = ShardRoutingState.RELOCATING;
relocatingNodeId = nodeId;
} else if (state == ShardRoutingState.RELOCATING) {
assert nodeId.equals(relocatingNodeId);
}
} }
/** /**
@ -386,7 +377,7 @@ public final class ShardRouting implements Streamable, ToXContent {
void relocate(String relocatingNodeId) { void relocate(String relocatingNodeId) {
ensureNotFrozen(); ensureNotFrozen();
version++; version++;
assert state == ShardRoutingState.STARTED; assert state == ShardRoutingState.STARTED : this;
state = ShardRoutingState.RELOCATING; state = ShardRoutingState.RELOCATING;
this.relocatingNodeId = relocatingNodeId; this.relocatingNodeId = relocatingNodeId;
} }
@ -398,9 +389,9 @@ public final class ShardRouting implements Streamable, ToXContent {
void cancelRelocation() { void cancelRelocation() {
ensureNotFrozen(); ensureNotFrozen();
version++; version++;
assert state == ShardRoutingState.RELOCATING; assert state == ShardRoutingState.RELOCATING : this;
assert assignedToNode(); assert assignedToNode() : this;
assert relocatingNodeId != null; assert relocatingNodeId != null : this;
state = ShardRoutingState.STARTED; state = ShardRoutingState.STARTED;
relocatingNodeId = null; relocatingNodeId = null;
@ -424,7 +415,7 @@ public final class ShardRouting implements Streamable, ToXContent {
void moveToStarted() { void moveToStarted() {
ensureNotFrozen(); ensureNotFrozen();
version++; version++;
assert state == ShardRoutingState.INITIALIZING || state == ShardRoutingState.RELOCATING; assert state == ShardRoutingState.INITIALIZING || state == ShardRoutingState.RELOCATING : this;
relocatingNodeId = null; relocatingNodeId = null;
restoreSource = null; restoreSource = null;
state = ShardRoutingState.STARTED; state = ShardRoutingState.STARTED;

5
core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
View File

@ -688,7 +688,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
logger.trace("Assigned shard [{}] to [{}]", shard, minNode.getNodeId()); logger.trace("Assigned shard [{}] to [{}]", shard, minNode.getNodeId());
} }
routingNodes.assign(shard, routingNodes.node(minNode.getNodeId()).nodeId()); routingNodes.initialize(shard, routingNodes.node(minNode.getNodeId()).nodeId());
changed = true; changed = true;
continue; // don't add to ignoreUnassigned continue; // don't add to ignoreUnassigned
} else { } else {
@ -783,8 +783,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
routingNodes.relocate(candidate, lowRoutingNode.nodeId()); routingNodes.relocate(candidate, lowRoutingNode.nodeId());
} else { } else {
assert candidate.unassigned(); routingNodes.initialize(candidate, routingNodes.node(minNode.getNodeId()).nodeId());
routingNodes.assign(candidate, routingNodes.node(minNode.getNodeId()).nodeId());
} }
return true; return true;

2
core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java
View File

@ -225,7 +225,7 @@ public class AllocateAllocationCommand implements AllocationCommand {
continue; continue;
} }
it.remove(); it.remove();
routingNodes.assign(shardRouting, routingNode.nodeId()); routingNodes.initialize(shardRouting, routingNode.nodeId());
if (shardRouting.primary()) { if (shardRouting.primary()) {
// we need to clear the post allocation flag, since its an explicit allocation of the primary shard // we need to clear the post allocation flag, since its an explicit allocation of the primary shard
// and we want to force allocate it (and create a new index for it) // and we want to force allocate it (and create a new index for it)

6
core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
View File

@ -339,7 +339,7 @@ public class GatewayAllocator extends AbstractComponent {
// we found a match // we found a match
changed = true; changed = true;
// make sure we create one with the version from the recovered state // make sure we create one with the version from the recovered state
routingNodes.assign(new ShardRouting(shard, highestVersion), node.nodeId()); routingNodes.initialize(new ShardRouting(shard, highestVersion), node.nodeId());
unassignedIterator.remove(); unassignedIterator.remove();
// found a node, so no throttling, no "no", and break out of the loop // found a node, so no throttling, no "no", and break out of the loop
@ -359,7 +359,7 @@ public class GatewayAllocator extends AbstractComponent {
// we found a match // we found a match
changed = true; changed = true;
// make sure we create one with the version from the recovered state // make sure we create one with the version from the recovered state
routingNodes.assign(new ShardRouting(shard, highestVersion), node.nodeId()); routingNodes.initialize(new ShardRouting(shard, highestVersion), node.nodeId());
unassignedIterator.remove(); unassignedIterator.remove();
} }
} else { } else {
@ -514,7 +514,7 @@ public class GatewayAllocator extends AbstractComponent {
} }
// we found a match // we found a match
changed = true; changed = true;
routingNodes.assign(shard, lastNodeMatched.nodeId()); routingNodes.initialize(shard, lastNodeMatched.nodeId());
unassignedIterator.remove(); unassignedIterator.remove();
} }
} else if (hasReplicaData == false) { } else if (hasReplicaData == false) {

2
core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java
View File

@ -82,7 +82,7 @@ public class ShardRoutingTests extends ElasticsearchTestCase {
} }
try { try {
routing.assignToNode("boom"); routing.initialize("boom");
fail("must be frozen"); fail("must be frozen");
} catch (IllegalStateException ex) { } catch (IllegalStateException ex) {
// expected // expected

2
core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java
View File

@ -189,7 +189,7 @@ public class UnassignedInfoTests extends ElasticsearchAllocationTestCase {
ShardRouting shard = TestShardRouting.newShardRouting("test", 1, null, null, null, true, ShardRoutingState.UNASSIGNED, 1, new UnassignedInfo(UnassignedInfo.Reason.INDEX_CREATED, null)); ShardRouting shard = TestShardRouting.newShardRouting("test", 1, null, null, null, true, ShardRoutingState.UNASSIGNED, 1, new UnassignedInfo(UnassignedInfo.Reason.INDEX_CREATED, null));
ShardRouting mutable = new ShardRouting(shard); ShardRouting mutable = new ShardRouting(shard);
assertThat(mutable.unassignedInfo(), notNullValue()); assertThat(mutable.unassignedInfo(), notNullValue());
mutable.assignToNode("test_node"); mutable.initialize("test_node");
assertThat(mutable.state(), equalTo(ShardRoutingState.INITIALIZING)); assertThat(mutable.state(), equalTo(ShardRoutingState.INITIALIZING));
assertThat(mutable.unassignedInfo(), notNullValue()); assertThat(mutable.unassignedInfo(), notNullValue());
mutable.moveToStarted(); mutable.moveToStarted();

20
core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java
View File

@ -369,37 +369,37 @@ public class BalanceConfigurationTests extends ElasticsearchAllocationTestCase {
switch (sr.id()) { switch (sr.id()) {
case 0: case 0:
if (sr.primary()) { if (sr.primary()) {
allocation.routingNodes().assign(sr, "node1"); allocation.routingNodes().initialize(sr, "node1");
} else { } else {
allocation.routingNodes().assign(sr, "node0"); allocation.routingNodes().initialize(sr, "node0");
} }
break; break;
case 1: case 1:
if (sr.primary()) { if (sr.primary()) {
allocation.routingNodes().assign(sr, "node1"); allocation.routingNodes().initialize(sr, "node1");
} else { } else {
allocation.routingNodes().assign(sr, "node2"); allocation.routingNodes().initialize(sr, "node2");
} }
break; break;
case 2: case 2:
if (sr.primary()) { if (sr.primary()) {
allocation.routingNodes().assign(sr, "node3"); allocation.routingNodes().initialize(sr, "node3");
} else { } else {
allocation.routingNodes().assign(sr, "node2"); allocation.routingNodes().initialize(sr, "node2");
} }
break; break;
case 3: case 3:
if (sr.primary()) { if (sr.primary()) {
allocation.routingNodes().assign(sr, "node3"); allocation.routingNodes().initialize(sr, "node3");
} else { } else {
allocation.routingNodes().assign(sr, "node1"); allocation.routingNodes().initialize(sr, "node1");
} }
break; break;
case 4: case 4:
if (sr.primary()) { if (sr.primary()) {
allocation.routingNodes().assign(sr, "node2"); allocation.routingNodes().initialize(sr, "node2");
} else { } else {
allocation.routingNodes().assign(sr, "node0"); allocation.routingNodes().initialize(sr, "node0");
} }
break; break;
} }