forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't close caches while there might still be in-flight requests. (el…
…astic#38958) Many of our index components use ref-counting so that in the event that a shard is closed while there are still ongoing requests, then the index reader and the store only effectively get closed when ongoing requests have finished. However we don't apply the same principle to the request and query caches, which might get closed while there are still in-flight requests. This commit adds ref-counting to `IndicesService` so that the caches and other components it maintains only get closed when all shards are effectively closed. Closes elastic#37117
- Loading branch information
Showing
6 changed files
with
180 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.indices; | ||
|
||
import org.elasticsearch.cluster.ClusterName; | ||
import org.elasticsearch.cluster.routing.allocation.DiskThresholdSettings; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.common.util.concurrent.EsExecutors; | ||
import org.elasticsearch.env.Environment; | ||
import org.elasticsearch.env.NodeEnvironment; | ||
import org.elasticsearch.index.IndexService; | ||
import org.elasticsearch.index.shard.IndexShard; | ||
import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; | ||
import org.elasticsearch.node.MockNode; | ||
import org.elasticsearch.node.Node; | ||
import org.elasticsearch.node.NodeValidationException; | ||
import org.elasticsearch.script.ScriptService; | ||
import org.elasticsearch.test.ESTestCase; | ||
import org.elasticsearch.test.InternalTestCluster; | ||
import org.elasticsearch.test.MockHttpTransport; | ||
import org.elasticsearch.transport.nio.MockNioTransportPlugin; | ||
|
||
import java.nio.file.Path; | ||
import java.util.Arrays; | ||
|
||
import static org.elasticsearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING; | ||
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS; | ||
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; | ||
import static org.elasticsearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; | ||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
|
||
public class IndicesServiceCloseTests extends ESTestCase { | ||
|
||
private Node startNode() throws NodeValidationException { | ||
final Path tempDir = createTempDir(); | ||
String nodeName = "node_s_0"; | ||
Settings settings = Settings.builder() | ||
.put(ClusterName.CLUSTER_NAME_SETTING.getKey(), InternalTestCluster.clusterName("single-node-cluster", random().nextLong())) | ||
.put(Environment.PATH_HOME_SETTING.getKey(), tempDir) | ||
.put(Environment.PATH_REPO_SETTING.getKey(), tempDir.resolve("repo")) | ||
.put(Environment.PATH_SHARED_DATA_SETTING.getKey(), createTempDir().getParent()) | ||
.put(Node.NODE_NAME_SETTING.getKey(), nodeName) | ||
.put(ScriptService.SCRIPT_MAX_COMPILATIONS_RATE.getKey(), "1000/1m") | ||
.put(EsExecutors.PROCESSORS_SETTING.getKey(), 1) // limit the number of threads created | ||
.put("transport.type", getTestTransportType()) | ||
.put(Node.NODE_DATA_SETTING.getKey(), true) | ||
.put(NodeEnvironment.NODE_ID_SEED_SETTING.getKey(), random().nextLong()) | ||
// default the watermarks low values to prevent tests from failing on nodes without enough disk space | ||
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), "1b") | ||
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING.getKey(), "1b") | ||
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_FLOOD_STAGE_WATERMARK_SETTING.getKey(), "1b") | ||
// turning on the real memory circuit breaker leads to spurious test failures. As have no full control over heap usage, we | ||
// turn it off for these tests. | ||
.put(HierarchyCircuitBreakerService.USE_REAL_MEMORY_USAGE_SETTING.getKey(), false) | ||
.putList(DISCOVERY_SEED_HOSTS_SETTING.getKey()) // empty list disables a port scan for other nodes | ||
.putList(INITIAL_MASTER_NODES_SETTING.getKey(), nodeName) | ||
.build(); | ||
|
||
Node node = new MockNode(settings, Arrays.asList(MockNioTransportPlugin.class, MockHttpTransport.TestPlugin.class), true); | ||
node.start(); | ||
return node; | ||
} | ||
|
||
public void testCloseEmptyIndicesService() throws Exception { | ||
Node node = startNode(); | ||
IndicesService indicesService = node.injector().getInstance(IndicesService.class); | ||
assertEquals(1, indicesService.indicesRefCount.refCount()); | ||
node.close(); | ||
assertEquals(0, indicesService.indicesRefCount.refCount()); | ||
} | ||
|
||
public void testCloseNonEmptyIndicesService() throws Exception { | ||
Node node = startNode(); | ||
IndicesService indicesService = node.injector().getInstance(IndicesService.class); | ||
assertEquals(1, indicesService.indicesRefCount.refCount()); | ||
|
||
assertAcked(node.client().admin().indices().prepareCreate("test") | ||
.setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0))); | ||
|
||
assertEquals(2, indicesService.indicesRefCount.refCount()); | ||
|
||
node.close(); | ||
assertEquals(0, indicesService.indicesRefCount.refCount()); | ||
} | ||
|
||
public void testCloseWhileOngoingRequest() throws Exception { | ||
Node node = startNode(); | ||
IndicesService indicesService = node.injector().getInstance(IndicesService.class); | ||
assertEquals(1, indicesService.indicesRefCount.refCount()); | ||
|
||
assertAcked(node.client().admin().indices().prepareCreate("test") | ||
.setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0))); | ||
|
||
assertEquals(2, indicesService.indicesRefCount.refCount()); | ||
|
||
IndexService indexService = indicesService.iterator().next(); | ||
IndexShard shard = indexService.getShard(0); | ||
shard.store().incRef(); | ||
|
||
node.close(); | ||
assertEquals(1, indicesService.indicesRefCount.refCount()); | ||
|
||
shard.store().decRef(); | ||
assertEquals(0, indicesService.indicesRefCount.refCount()); | ||
} | ||
|
||
} |