Skip to content
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.

Sign up for GitHub

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

Make searchable snapshot indexes read-only but allow deletion #4764

Merged
merged 11 commits into from
Oct 27, 2022
Merged

Make searchable snapshot indexes read-only but allow deletion #4764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c7b8d6
Make the index restored by remote snapshot as read only but deletable
Vishalks Oct 13, 2022
00d6f47
Changelog updation
Vishalks Oct 13, 2022
0a85671
Merge branch 'main' into make_remote_snapshot_index_read_only
Vishalks Oct 13, 2022
932a6ac
Filtering out remote snapshot based index from being released out of …
Vishalks Oct 19, 2022
aee4e97
Replacing read only allow delete block with write block
Vishalks Oct 21, 2022
5019b33
Merge branch 'main' into make_remote_snapshot_index_read_only
Vishalks Oct 21, 2022
f5f1f16
Adding Integration tests for searchable snapshot
Vishalks Oct 25, 2022
e2f7b25
introducing new cluster block for remote snapshot
Vishalks Oct 26, 2022
e37308e
PR review implementation
Vishalks Oct 27, 2022
f4b0564
Gradle precommit
Vishalks Oct 27, 2022
5cb3101
Merge branch 'main' into make_remote_snapshot_index_read_only
Vishalks Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make the index restored by remote snapshot as read only but deletable 
Signed-off-by: Vishal Sarda <vsarda@amazon.com>
  • Loading branch information
@Vishalks
Vishalks committed Oct 13, 2022
commit 5c7b8d63d575ca54648f7dcdc5a9178c574d5f41
3 changes: 0 additions & 3 deletions server/src/main/java/org/opensearch/index/engine/ReadOnlyEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,16 @@ public boolean isThrottled() {

@Override
public IndexResult index(Index index) {
assert false : "this should not be called";
throw new UnsupportedOperationException("indexing is not supported on a read-only engine");
}

@Override
public DeleteResult delete(Delete delete) {
assert false : "this should not be called";
throw new UnsupportedOperationException("deletes are not supported on a read-only engine");
}

@Override
public NoOpResult noOp(NoOp noOp) {
assert false : "this should not be called";
throw new UnsupportedOperationException("no-ops are not supported on a read-only engine");
}

Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/org/opensearch/snapshots/RestoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@ private static IndexMetadata addSnapshotToIndexSettings(IndexMetadata metadata,
.put(IndexSettings.SEARCHABLE_SNAPSHOT_ID_UUID.getKey(), snapshot.getSnapshotId().getUUID())
.put(IndexSettings.SEARCHABLE_SNAPSHOT_ID_NAME.getKey(), snapshot.getSnapshotId().getName())
.put(IndexSettings.SEARCHABLE_SNAPSHOT_INDEX_ID.getKey(), indexId.getId())
.put(IndexMetadata.APIBlock.READ_ONLY_ALLOW_DELETE.settingName(), true)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With DiskThresholdDecider be able to revert this?

.put(metadata.getSettings())
.build();
return IndexMetadata.builder(metadata).settings(newSettings).build();
Expand Down
5 changes: 1 addition & 4 deletions server/src/test/java/org/opensearch/index/engine/ReadOnlyEngineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.Version;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
Expand Down Expand Up @@ -218,9 +217,7 @@ public void testReadOnly() throws IOException {
EngineConfig config = config(defaultSettings, store, createTempDir(), newMergePolicy(), null, null, globalCheckpoint::get);
store.createEmpty(Version.CURRENT.luceneVersion);
try (ReadOnlyEngine readOnlyEngine = new ReadOnlyEngine(config, null, new TranslogStats(), true, Function.identity(), true)) {
Class<? extends Throwable> expectedException = LuceneTestCase.TEST_ASSERTS_ENABLED
? AssertionError.class
: UnsupportedOperationException.class;
Class<? extends Throwable> expectedException = UnsupportedOperationException.class;
expectThrows(expectedException, () -> readOnlyEngine.index(null));
expectThrows(expectedException, () -> readOnlyEngine.delete(null));
expectThrows(expectedException, () -> readOnlyEngine.noOp(null));
Expand Down