Skip to content

Commit

Permalink
InternalClusterInfoService should not ignore hidden indices (#62995) (#…
Browse files Browse the repository at this point in the history 
…63048)

Today InternalClusterInfoService ignores hidden indices when
retrieving shard stats of the cluster. This can lead to suboptimal
shard allocation decisions as the size of shards are taken into
account when allocating new shards or rebalancing existing shards.
  • Loading branch information
@tlrx
tlrx authored Sep 30, 2020
1 parent ee985ea commit b099bfb
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 11 deletions.
29 changes: 23 additions & 6 deletions server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@
import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.index.store.Store;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.SystemIndexDescriptor;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.plugins.SystemIndexPlugin;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.InternalTestCluster;
import org.elasticsearch.test.transport.MockTransportService;
Expand All @@ -51,7 +53,9 @@

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

Expand All @@ -70,7 +74,9 @@
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
public class ClusterInfoServiceIT extends ESIntegTestCase {

public static class TestPlugin extends Plugin implements ActionPlugin {
private static final String TEST_SYSTEM_INDEX_NAME = ".test-cluster-info-system-index";

public static class TestPlugin extends Plugin implements ActionPlugin, SystemIndexPlugin {

private final BlockingActionFilter blockingActionFilter;

Expand All @@ -82,6 +88,12 @@ public TestPlugin() {
public List<ActionFilter> getActionFilters() {
return singletonList(blockingActionFilter);
}

@Override
public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings settings) {
return Collections.singletonList(new SystemIndexDescriptor(TEST_SYSTEM_INDEX_NAME,
"System index for [" + getTestClass().getName() + ']'));
}
}

public static class BlockingActionFilter extends org.elasticsearch.action.support.ActionFilter.Simple {
Expand Down Expand Up @@ -117,13 +129,18 @@ private void setClusterInfoTimeout(String timeValue) {

public void testClusterInfoServiceCollectsInformation() {
internalCluster().startNodes(2);
assertAcked(prepareCreate("test").setSettings(Settings.builder()
.put(Store.INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), 0)
.put(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), EnableAllocationDecider.Rebalance.NONE).build()));

final String indexName = randomBoolean() ? randomAlphaOfLength(5).toLowerCase(Locale.ROOT) : TEST_SYSTEM_INDEX_NAME;
assertAcked(prepareCreate(indexName)
.setSettings(Settings.builder()
.put(Store.INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), 0)
.put(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), EnableAllocationDecider.Rebalance.NONE)
.put(IndexMetadata.SETTING_INDEX_HIDDEN, randomBoolean())
.build()));
if (randomBoolean()) {
assertAcked(client().admin().indices().prepareClose("test"));
assertAcked(client().admin().indices().prepareClose(indexName));
}
ensureGreen("test");
ensureGreen(indexName);
InternalTestCluster internalTestCluster = internalCluster();
// Get the cluster info service on the master node
final InternalClusterInfoService infoService = (InternalClusterInfoService) internalTestCluster
Expand Down
10 changes: 5 additions & 5 deletions server/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ protected CountDownLatch updateIndicesStats(final ActionListener<IndicesStatsRes
final IndicesStatsRequest indicesStatsRequest = new IndicesStatsRequest();
indicesStatsRequest.clear();
indicesStatsRequest.store(true);
indicesStatsRequest.indicesOptions(IndicesOptions.STRICT_EXPAND_OPEN_CLOSED);
indicesStatsRequest.indicesOptions(IndicesOptions.STRICT_EXPAND_OPEN_CLOSED_HIDDEN);

client.admin().indices().stats(indicesStatsRequest, new LatchedActionListener<>(listener, latch));
return latch;
Expand Down Expand Up @@ -348,8 +348,8 @@ static void buildShardLevelInfo(Logger logger, ShardStats[] stats, ImmutableOpen
}

static void fillDiskUsagePerNode(Logger logger, List<NodeStats> nodeStatsArray,
ImmutableOpenMap.Builder<String, DiskUsage> newLeastAvaiableUsages,
ImmutableOpenMap.Builder<String, DiskUsage> newMostAvaiableUsages) {
ImmutableOpenMap.Builder<String, DiskUsage> newLeastAvailableUsages,
ImmutableOpenMap.Builder<String, DiskUsage> newMostAvailableUsages) {
for (NodeStats nodeStats : nodeStatsArray) {
if (nodeStats.getFs() == null) {
logger.warn("Unable to retrieve node FS stats for {}", nodeStats.getNode().getName());
Expand Down Expand Up @@ -380,7 +380,7 @@ static void fillDiskUsagePerNode(Logger logger, List<NodeStats> nodeStatsArray,
nodeId, leastAvailablePath.getTotal().getBytes());
}
} else {
newLeastAvaiableUsages.put(nodeId, new DiskUsage(nodeId, nodeName, leastAvailablePath.getPath(),
newLeastAvailableUsages.put(nodeId, new DiskUsage(nodeId, nodeName, leastAvailablePath.getPath(),
leastAvailablePath.getTotal().getBytes(), leastAvailablePath.getAvailable().getBytes()));
}
if (mostAvailablePath.getTotal().getBytes() < 0) {
Expand All @@ -389,7 +389,7 @@ static void fillDiskUsagePerNode(Logger logger, List<NodeStats> nodeStatsArray,
nodeId, mostAvailablePath.getTotal().getBytes());
}
} else {
newMostAvaiableUsages.put(nodeId, new DiskUsage(nodeId, nodeName, mostAvailablePath.getPath(),
newMostAvailableUsages.put(nodeId, new DiskUsage(nodeId, nodeName, mostAvailablePath.getPath(),
mostAvailablePath.getTotal().getBytes(), mostAvailablePath.getAvailable().getBytes()));
}

Expand Down

0 comments on commit b099bfb

Please sign in to comment.