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

Apply `ignore_throttled` also to concrete indices (#35335) 

Today we only apply `ingore_throttled` to expansions from wildcards,
date math expressions and aliases. Yet, this is tricky since we might
have resolved certain expressions in pre-filter steps like security.
It's more consistent to apply this logic to all expressions including
concrete indices.

Relates to #34354
This commit is contained in:
Simon Willnauer 2018-11-07 18:43:27 +01:00 committed by GitHub
parent 5ae03195d3
commit 2131e119d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java
View File

@ -248,7 +248,7 @@ public class IndicesOptions implements ToXContentFragment {
/** /**
* *
* @return whether indices that are marked as throttled should be ignored when resolving a wildcard or alias * @return whether indices that are marked as throttled should be ignored
*/ */
public boolean ignoreThrottled() { public boolean ignoreThrottled() {
return options.contains(Option.IGNORE_THROTTLED); return options.contains(Option.IGNORE_THROTTLED);

16
server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
View File

@ -147,7 +147,6 @@ public class IndexNameExpressionResolver {
if (indexExpressions == null || indexExpressions.length == 0) { if (indexExpressions == null || indexExpressions.length == 0) {
indexExpressions = new String[]{MetaData.ALL}; indexExpressions = new String[]{MetaData.ALL};
} }
Set<String> originalIndexExpression = Sets.newHashSet(indexExpressions);
MetaData metaData = context.getState().metaData(); MetaData metaData = context.getState().metaData();
IndicesOptions options = context.getOptions(); IndicesOptions options = context.getOptions();
final boolean failClosed = options.forbidClosedIndices() && options.ignoreUnavailable() == false; final boolean failClosed = options.forbidClosedIndices() && options.ignoreUnavailable() == false;
@ -197,7 +196,7 @@ public class IndexNameExpressionResolver {
" The write index may be explicitly disabled using is_write_index=false or the alias points to multiple" + " The write index may be explicitly disabled using is_write_index=false or the alias points to multiple" +
" indices without one being designated as a write index"); " indices without one being designated as a write index");
} }
if (addIndex(writeIndex, context, originalIndexExpression)) { if (addIndex(writeIndex, context)) {
concreteIndices.add(writeIndex.getIndex()); concreteIndices.add(writeIndex.getIndex());
} }
} else { } else {
@ -216,12 +215,12 @@ public class IndexNameExpressionResolver {
if (failClosed) { if (failClosed) {
throw new IndexClosedException(index.getIndex()); throw new IndexClosedException(index.getIndex());
} else { } else {
if (options.forbidClosedIndices() == false && addIndex(index, context, originalIndexExpression)) { if (options.forbidClosedIndices() == false && addIndex(index, context)) {
concreteIndices.add(index.getIndex()); concreteIndices.add(index.getIndex());
} }
} }
} else if (index.getState() == IndexMetaData.State.OPEN) { } else if (index.getState() == IndexMetaData.State.OPEN) {
if (addIndex(index, context, originalIndexExpression)) { if (addIndex(index, context)) {
concreteIndices.add(index.getIndex()); concreteIndices.add(index.getIndex());
} }
} else { } else {
@ -239,13 +238,8 @@ public class IndexNameExpressionResolver {
return concreteIndices.toArray(new Index[concreteIndices.size()]); return concreteIndices.toArray(new Index[concreteIndices.size()]);
} }
private static boolean addIndex(IndexMetaData metaData, Context context, Set<String> originalIndices) { private static boolean addIndex(IndexMetaData metaData, Context context) {
if (context.options.ignoreThrottled()) { return (context.options.ignoreThrottled() && IndexSettings.INDEX_SEARCH_THROTTLED.get(metaData.getSettings())) == false;
if (originalIndices.contains(metaData.getIndex().getName()) == false) {
return IndexSettings.INDEX_SEARCH_THROTTLED.get(metaData.getSettings()) == false;
}
}
return true;
} }
private static IllegalArgumentException aliasesNotSupportedException(String expression) { private static IllegalArgumentException aliasesNotSupportedException(String expression) {

6
server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java
View File

@ -1357,10 +1357,9 @@ public class IndexNameExpressionResolverTests extends ESTestCase {
{ {
Index[] indices = indexNameExpressionResolver.concreteIndices(state, Index[] indices = indexNameExpressionResolver.concreteIndices(state,
IndicesOptions.STRICT_EXPAND_OPEN_FORBID_CLOSED_IGNORE_THROTTLED, "ind*", "test-index"); IndicesOptions.STRICT_EXPAND_OPEN_FORBID_CLOSED_IGNORE_THROTTLED, "ind*", "test-index");
assertEquals(2, indices.length); assertEquals(1, indices.length);
Arrays.sort(indices, Comparator.comparing(Index::getName)); Arrays.sort(indices, Comparator.comparing(Index::getName));
assertEquals("index", indices[0].getName()); assertEquals("index", indices[0].getName());
assertEquals("test-index", indices[1].getName());
} }
{ {
@ -1368,10 +1367,9 @@ public class IndexNameExpressionResolverTests extends ESTestCase {
new IndicesOptions(EnumSet.of(IndicesOptions.Option.ALLOW_NO_INDICES, new IndicesOptions(EnumSet.of(IndicesOptions.Option.ALLOW_NO_INDICES,
IndicesOptions.Option.IGNORE_THROTTLED), IndicesOptions.Option.IGNORE_THROTTLED),
EnumSet.of(IndicesOptions.WildcardStates.OPEN)), "ind*", "test-index"); EnumSet.of(IndicesOptions.WildcardStates.OPEN)), "ind*", "test-index");
assertEquals(2, indices.length); assertEquals(1, indices.length);
Arrays.sort(indices, Comparator.comparing(Index::getName)); Arrays.sort(indices, Comparator.comparing(Index::getName));
assertEquals("index", indices[0].getName()); assertEquals("index", indices[0].getName());
assertEquals("test-index", indices[1].getName());
} }
{ {
Index[] indices = indexNameExpressionResolver.concreteIndices(state, Index[] indices = indexNameExpressionResolver.concreteIndices(state,

3
server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
View File

@ -533,7 +533,8 @@ public class SearchServiceTests extends ESSingleNodeTestCase {
Index index = resolveIndex("throttled_threadpool_index"); Index index = resolveIndex("throttled_threadpool_index");
assertTrue(service.getIndicesService().indexServiceSafe(index).getIndexSettings().isSearchThrottled()); assertTrue(service.getIndicesService().indexServiceSafe(index).getIndexSettings().isSearchThrottled());
client().prepareIndex("throttled_threadpool_index", "_doc", "1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); client().prepareIndex("throttled_threadpool_index", "_doc", "1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get();
SearchResponse searchResponse = client().prepareSearch("throttled_threadpool_index").setSize(1).get(); SearchResponse searchResponse = client().prepareSearch("throttled_threadpool_index")
.setIndicesOptions(IndicesOptions.STRICT_EXPAND_OPEN_FORBID_CLOSED).setSize(1).get();
assertSearchHits(searchResponse, "1"); assertSearchHits(searchResponse, "1");
// we add a search action listener in a plugin above to assert that this is actually used // we add a search action listener in a plugin above to assert that this is actually used
client().execute( client().execute(