+8 −11

ClusterSearchShardsGroup.java

...n/admin/cluster/shards/ClusterSearchShardsGroup.java

+3 −3

TransportClusterSearchShardsAction.java

...uster/shards/TransportClusterSearchShardsAction.java

+2 −4

ShardSegments.java

...rch/action/admin/indices/segments/ShardSegments.java

+1 −3

ShardStats.java

...ticsearch/action/admin/indices/stats/ShardStats.java

+2 −4

ShardUpgradeStatus.java

...on/admin/indices/upgrade/get/ShardUpgradeStatus.java

+1 −1

TransportBroadcastByNodeAction.java

...t/broadcast/node/TransportBroadcastByNodeAction.java

+2 −4

ShardStateAction.java

...ticsearch/cluster/action/shard/ShardStateAction.java

+3 −1

AllocationId.java

.../org/elasticsearch/cluster/routing/AllocationId.java

+1 −1

IllegalShardRoutingStateException.java

...uster/routing/IllegalShardRoutingStateException.java

+19 −17

IndexRoutingTable.java

...elasticsearch/cluster/routing/IndexRoutingTable.java

+3 −2

IndexShardRoutingTable.java

...icsearch/cluster/routing/IndexShardRoutingTable.java

+42 −20

RoutingNode.java

...a/org/elasticsearch/cluster/routing/RoutingNode.java

+164 −81

RoutingNodes.java

.../org/elasticsearch/cluster/routing/RoutingNodes.java

+98 −210

ShardRouting.java

.../org/elasticsearch/cluster/routing/ShardRouting.java

+20 −7

UnassignedInfo.java

...rg/elasticsearch/cluster/routing/UnassignedInfo.java

+38 −26

AllocationService.java

...ch/cluster/routing/allocation/AllocationService.java

+23 −25

BalancedShardsAllocator.java

...ng/allocation/allocator/BalancedShardsAllocator.java

+6 −4

AbstractAllocateAllocationCommand.java

...ation/command/AbstractAllocateAllocationCommand.java

+10 −9

AllocateEmptyPrimaryAllocationCommand.java

...n/command/AllocateEmptyPrimaryAllocationCommand.java

+1 −1

CancelAllocationCommand.java

...ting/allocation/command/CancelAllocationCommand.java

+6 −19

IndicesClusterStateService.java

...arch/indices/cluster/IndicesClusterStateService.java

+1 −1

ShardsSyncedFlushResult.java

...ticsearch/indices/flush/ShardsSyncedFlushResult.java

+3 −3

ClusterAllocationExplanationTests.java

...er/allocation/ClusterAllocationExplanationTests.java

+2 −3

TransportReplicationActionTests.java

...ort/replication/TransportReplicationActionTests.java

+3 −4

ClusterStateDiffIT.java

...va/org/elasticsearch/cluster/ClusterStateDiffIT.java

+13 −12

DiskUsageTests.java

...t/java/org/elasticsearch/cluster/DiskUsageTests.java

+2 −1

AckIT.java

...c/test/java/org/elasticsearch/cluster/ack/AckIT.java

+4 −3

ShardFailedClusterStateTaskExecutorTests.java

.../shard/ShardFailedClusterStateTaskExecutorTests.java

+1 −1

ShardStateActionTests.java

...arch/cluster/action/shard/ShardStateActionTests.java

+10 −10

ClusterRerouteIT.java

...asticsearch/cluster/allocation/ClusterRerouteIT.java

+22 −21

AllocationIdTests.java

...elasticsearch/cluster/routing/AllocationIdTests.java

+6 −5

RandomShardRoutingMutator.java

...earch/cluster/routing/RandomShardRoutingMutator.java

+18 −18

ShardRoutingHelper.java

...lasticsearch/cluster/routing/ShardRoutingHelper.java

+16 −110

ShardRoutingTests.java

...elasticsearch/cluster/routing/ShardRoutingTests.java

+21 −16

UnassignedInfoTests.java

...asticsearch/cluster/routing/UnassignedInfoTests.java

+1 −0

AddIncrementallyTests.java

...luster/routing/allocation/AddIncrementallyTests.java

+5 −4

AllocationCommandsTests.java

...ster/routing/allocation/AllocationCommandsTests.java

+3 −3

ClusterRebalanceRoutingTests.java

...routing/allocation/ClusterRebalanceRoutingTests.java

+20 −20

DeadNodesAllocationTests.java

...ter/routing/allocation/DeadNodesAllocationTests.java

+6 −6

ExpectedShardSizeAllocationTests.java

...ing/allocation/ExpectedShardSizeAllocationTests.java

+20 −20

FailedShardsRoutingTests.java

...ter/routing/allocation/FailedShardsRoutingTests.java

+1 −0

FilterRoutingTests.java

...h/cluster/routing/allocation/FilterRoutingTests.java

+11 −10

StartedShardsRoutingTests.java

...er/routing/allocation/StartedShardsRoutingTests.java

+3 −3

ThrottlingAllocationTests.java

...er/routing/allocation/ThrottlingAllocationTests.java

+4 −4

DiskThresholdDeciderTests.java

...ng/allocation/decider/DiskThresholdDeciderTests.java

+34 −34

DiskThresholdDeciderUnitTests.java

...llocation/decider/DiskThresholdDeciderUnitTests.java

+4 −4

ReplicaShardAllocatorTests.java

...lasticsearch/gateway/ReplicaShardAllocatorTests.java

+30 −39

IndexShardTests.java

...a/org/elasticsearch/index/shard/IndexShardTests.java

+2 −11

IndexingMemoryControllerTests.java

...ticsearch/indices/IndexingMemoryControllerTests.java

+4 −5

IndicesLifecycleListenerSingleNodeTests.java

...indices/IndicesLifecycleListenerSingleNodeTests.java

+18 −17

TestShardRouting.java

.../elasticsearch/cluster/routing/TestShardRouting.java