Skip to content

Fix flaky tests in MetadataIndexStateServiceIT #17866

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

Merged
merged 2 commits into from
Apr 9, 2025
Merged

Fix flaky tests in MetadataIndexStateServiceIT #17866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa32964
Fix flaky tests MetadataIndexStateServiceIT
prudhvigodithi Apr 9, 2025
6a89b83
Update the test
prudhvigodithi Apr 9, 2025
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
52 changes: 20 additions & 32 deletions ...internalClusterTest/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

package org.opensearch.cluster.metadata;

import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
import org.opensearch.action.admin.indices.open.OpenIndexResponse;
import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse;
import org.opensearch.action.search.SearchResponse;
import org.opensearch.action.support.WriteRequest;
import org.opensearch.common.settings.Settings;
Expand Down Expand Up @@ -54,19 +51,13 @@ public void testIndexCloseAndOpen() throws Exception {
}

assertAcked(client().admin().indices().prepareClose(TEST_INDEX).get());
assertEquals(
IndexMetadata.State.CLOSE,
client().admin().cluster().prepareState().get().getState().metadata().index(TEST_INDEX).getState()
);

ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().get();
IndexMetadata indexMetadata = clusterStateResponse.getState().metadata().index(TEST_INDEX);
assertEquals(IndexMetadata.State.CLOSE, indexMetadata.getState());

OpenIndexResponse openIndexResponse = client().admin().indices().prepareOpen(TEST_INDEX).get();

assertTrue("Open operation should be acknowledged", openIndexResponse.isAcknowledged());
assertTrue("Open operation shards should be acknowledged", openIndexResponse.isShardsAcknowledged());

clusterStateResponse = client().admin().cluster().prepareState().get();
indexMetadata = clusterStateResponse.getState().metadata().index(TEST_INDEX);
assertEquals(IndexMetadata.State.OPEN, indexMetadata.getState());
assertAcked(client().admin().indices().prepareOpen(TEST_INDEX).get());
ensureGreen(TEST_INDEX);

assertBusy(() -> {
SearchResponse searchResponse = client().prepareSearch(TEST_INDEX).get();
Expand Down Expand Up @@ -99,26 +90,23 @@ public void testIndexCloseAndOpenWithSearchOnlyMode() throws Exception {
assertAcked(client().admin().indices().prepareScaleSearchOnly(TEST_INDEX, true).get());
ensureGreen(TEST_INDEX);

GetSettingsResponse settingsResponse = client().admin().indices().prepareGetSettings(TEST_INDEX).get();
assertTrue(settingsResponse.getSetting(TEST_INDEX, IndexMetadata.INDEX_BLOCKS_SEARCH_ONLY_SETTING.getKey()).equals("true"));
assertTrue(
client().admin()
.indices()
.prepareGetSettings(TEST_INDEX)
.get()
.getSetting(TEST_INDEX, IndexMetadata.INDEX_BLOCKS_SEARCH_ONLY_SETTING.getKey())
.equals("true")
);

assertAcked(client().admin().indices().prepareClose(TEST_INDEX).get());
assertEquals(
IndexMetadata.State.CLOSE,
client().admin().cluster().prepareState().get().getState().metadata().index(TEST_INDEX).getState()
);

ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().get();
IndexMetadata indexMetadata = clusterStateResponse.getState().metadata().index(TEST_INDEX);
assertEquals(IndexMetadata.State.CLOSE, indexMetadata.getState());

OpenIndexResponse openIndexResponse = client().admin().indices().prepareOpen(TEST_INDEX).get();

assertTrue("Open operation should be acknowledged", openIndexResponse.isAcknowledged());
assertTrue("Open operation shards should be acknowledged", openIndexResponse.isShardsAcknowledged());

clusterStateResponse = client().admin().cluster().prepareState().get();
indexMetadata = clusterStateResponse.getState().metadata().index(TEST_INDEX);
assertEquals(IndexMetadata.State.OPEN, indexMetadata.getState());

settingsResponse = client().admin().indices().prepareGetSettings(TEST_INDEX).get();
assertTrue(settingsResponse.getSetting(TEST_INDEX, IndexMetadata.INDEX_BLOCKS_SEARCH_ONLY_SETTING.getKey()).equals("true"));
assertAcked(client().admin().indices().prepareOpen(TEST_INDEX).get());
ensureGreen(TEST_INDEX);

assertBusy(() -> {
SearchResponse searchResponse = client().prepareSearch(TEST_INDEX).get();
Expand Down
Loading