-
Notifications
You must be signed in to change notification settings - Fork 25.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Prevent snapshots to be mounted as system indices #61517
Merged
tlrx
merged 5 commits into
elastic:master
from
tlrx:prevent-system-indices-to-be-mounted
Aug 31, 2020
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
42b2cf2
Prevent snapshots to be mounted as system indices
tlrx 4d6a2c0
Merge branch 'master' into prevent-system-indices-to-be-mounted
tlrx ae58433
Use systemIndices
tlrx 3e173cb
use createAndPopulateIndex()
tlrx e648ca4
Merge branch 'master' into prevent-system-indices-to-be-mounted
tlrx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
127 changes: 127 additions & 0 deletions
127
...g/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsSystemIndicesIntegTests.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,127 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
package org.elasticsearch.xpack.searchablesnapshots; | ||
|
||
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; | ||
import org.elasticsearch.action.bulk.BulkRequest; | ||
import org.elasticsearch.action.bulk.BulkResponse; | ||
import org.elasticsearch.action.index.IndexRequest; | ||
import org.elasticsearch.client.Client; | ||
import org.elasticsearch.client.OriginSettingClient; | ||
import org.elasticsearch.cluster.metadata.IndexMetadata; | ||
import org.elasticsearch.common.Strings; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.indices.InvalidIndexNameException; | ||
import org.elasticsearch.indices.SystemIndexDescriptor; | ||
import org.elasticsearch.plugins.Plugin; | ||
import org.elasticsearch.plugins.SystemIndexPlugin; | ||
import org.elasticsearch.xpack.core.ClientHelper; | ||
import org.elasticsearch.xpack.core.searchablesnapshots.MountSearchableSnapshotAction; | ||
import org.elasticsearch.xpack.core.searchablesnapshots.MountSearchableSnapshotRequest; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collection; | ||
import java.util.List; | ||
import java.util.Locale; | ||
|
||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; | ||
import static org.hamcrest.Matchers.containsString; | ||
import static org.hamcrest.Matchers.equalTo; | ||
import static org.hamcrest.Matchers.is; | ||
|
||
public class SearchableSnapshotsSystemIndicesIntegTests extends BaseSearchableSnapshotsIntegTestCase { | ||
|
||
@Override | ||
protected Collection<Class<? extends Plugin>> nodePlugins() { | ||
final List<Class<? extends Plugin>> plugins = new ArrayList<>(super.nodePlugins()); | ||
plugins.add(TestSystemIndexPlugin.class); | ||
return plugins; | ||
} | ||
|
||
public void testCannotMountSystemIndex() { | ||
final String systemIndexName = '.' + randomAlphaOfLength(10).toLowerCase(Locale.ROOT); | ||
executeTest(systemIndexName, client()); | ||
} | ||
|
||
public void testCannotMountSystemIndexWithDescriptor() { | ||
// TODO replace STACK_ORIGIN with searchable snapshot origin | ||
executeTest(TestSystemIndexPlugin.INDEX_NAME, new OriginSettingClient(client(), ClientHelper.STACK_ORIGIN)); | ||
} | ||
|
||
private void executeTest(final String indexName, final Client client) { | ||
final boolean isHidden = randomBoolean(); | ||
assertAcked( | ||
client.admin() | ||
.indices() | ||
.prepareCreate(indexName) | ||
.setSettings(Settings.builder().put(IndexMetadata.SETTING_INDEX_HIDDEN, isHidden).build()) | ||
); | ||
|
||
final int nbDocs = scaledRandomIntBetween(0, 100); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: we could use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes we can - I pushed 3e173cb |
||
if (nbDocs > 0) { | ||
final BulkRequest bulkRequest = new BulkRequest(); | ||
for (int i = 0; i < nbDocs; i++) { | ||
IndexRequest indexRequest = new IndexRequest(indexName); | ||
indexRequest.source("value", i); | ||
bulkRequest.add(indexRequest); | ||
} | ||
final BulkResponse bulkResponse = client.bulk(bulkRequest).actionGet(); | ||
assertThat(bulkResponse.hasFailures(), is(false)); | ||
} | ||
flushAndRefresh(indexName); | ||
assertHitCount(client.prepareSearch(indexName).get(), nbDocs); | ||
|
||
final String repositoryName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); | ||
createRepo(repositoryName); | ||
|
||
final String snapshotName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); | ||
final CreateSnapshotResponse snapshotResponse = client.admin() | ||
.cluster() | ||
.prepareCreateSnapshot(repositoryName, snapshotName) | ||
.setIndices(indexName) | ||
.setWaitForCompletion(true) | ||
.get(); | ||
|
||
final int numPrimaries = getNumShards(indexName).numPrimaries; | ||
assertThat(snapshotResponse.getSnapshotInfo().successfulShards(), equalTo(numPrimaries)); | ||
assertThat(snapshotResponse.getSnapshotInfo().failedShards(), equalTo(0)); | ||
|
||
if (randomBoolean()) { | ||
assertAcked(client.admin().indices().prepareClose(indexName)); | ||
} else { | ||
assertAcked(client.admin().indices().prepareDelete(indexName)); | ||
} | ||
|
||
final MountSearchableSnapshotRequest mountRequest = new MountSearchableSnapshotRequest( | ||
indexName, | ||
repositoryName, | ||
snapshotName, | ||
indexName, | ||
Settings.builder().put(IndexMetadata.SETTING_INDEX_HIDDEN, randomBoolean()).build(), | ||
Strings.EMPTY_ARRAY, | ||
true | ||
); | ||
|
||
final InvalidIndexNameException exception = expectThrows( | ||
InvalidIndexNameException.class, | ||
() -> client.execute(MountSearchableSnapshotAction.INSTANCE, mountRequest).actionGet() | ||
); | ||
assertThat(exception.getIndex().getName(), equalTo(indexName)); | ||
assertThat(exception.getMessage(), containsString("system indices cannot be mounted as searchable snapshots")); | ||
} | ||
|
||
public static class TestSystemIndexPlugin extends Plugin implements SystemIndexPlugin { | ||
|
||
static final String INDEX_NAME = ".test-system-index"; | ||
|
||
@Override | ||
public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings settings) { | ||
return List.of(new SystemIndexDescriptor(INDEX_NAME, "System index for [" + getTestClass().getName() + ']')); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be best to pull in the
SystemIndices
class since we're in a transport action. We can bind the instance inNode
and make it available for guice to inject. Then a simple modification to the theSystemIndices
class could be made that adds a method to check the name (currently there is a method that takes anIndex
object but only looks at the name) against the defined set of system indices.The primary reason for this is users could have data indices in 7.x that start with a
.
so we shouldn'tbreak that for themrestrict them from being able to use this feature on that data.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are also hidden indices that start with a dot (e.g.
.watcher-history*
), which there's no reason to prevent being backed by a searchable snapshot. Using theSystemIndices
class would avoid that issue as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I merged #61540 which adds the method in
SystemIndices
to check a string name without needing theIndex
object.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks everybody. I'm waiting for #60522 to be merged and I'll update this PR.