Skip to content

Persist local indices on exporter type change #465

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Persist local indices on exporter type change #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions src/main/java/org/opensearch/plugin/insights/core/service/QueryInsightsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,6 @@ public void setExporterAndReaderType(final SinkType sinkType) {
// Configure the exporter for TopQueriesService in QueryInsightsService
final QueryInsightsExporter currentExporter = queryInsightsExporterFactory.getExporter(TOP_QUERIES_EXPORTER_ID);
final QueryInsightsReader currentReader = queryInsightsReaderFactory.getReader(TOP_QUERIES_READER_ID);
// Handles the cleanup when sink type is changed from LocalIndexExporter.
// Clears all local indices from storage when the exporter configuration
// is switched away from LocalIndexExporter type.
if (this.sinkType == SinkType.LOCAL_INDEX && currentExporter != null) {
deleteAllTopNIndices(client, (LocalIndexExporter) currentExporter);
}

// Close the current exporter and reader
if (currentExporter != null) {
Expand Down Expand Up @@ -704,26 +698,6 @@ void deleteExpiredTopNIndices() {
}
}

/**
* Deletes all Top N local indices
*
* @param client OpenSearch Client
* @param localIndexExporter the exporter to handle the local index operations
*/
void deleteAllTopNIndices(final Client client, final LocalIndexExporter localIndexExporter) {
Copy link
Member

@ansjcy ansjcy Oct 20, 2025

Choose a reason for hiding this comment

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

Do you think we should add an API endpoint to do this?

Copy link
Member Author

@dzane17 dzane17 Oct 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

No, admins can delete indices manually I believe and retention policy will still apply

Copy link
Member

@ansjcy ansjcy Oct 21, 2025

Choose a reason for hiding this comment

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

makes sense.

Copy link
Member

@ansjcy ansjcy Oct 24, 2025

Choose a reason for hiding this comment

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

I think one caveat here is, if there are issues with local index exporters, we won't have a quick solution to solve it. like, for the local index reader performance issue we encountered this year, we can simply disable this setting to remove all local index.

If any similar unknown issue happens later, we will need to delete user's indices manually (without the validation logic in our code), or wait for 1 day until the retention job kicks in.

That's the reason I feel it's better to have an API to delete all indices with correct validation logic would make sense. Another alternative is to lower the min value of the delete_after setting to say 1 hour. but the deletion logic will be more complicated since we will need to delete the documents instead of the indices.

final ClusterStateRequest clusterStateRequest = IndexDiscoveryHelper.createClusterStateRequest(IndicesOptions.strictExpand());

client.admin().cluster().state(clusterStateRequest, ActionListener.wrap(clusterStateResponse -> {
clusterStateResponse.getState()
.metadata()
.indices()
.entrySet()
.stream()
.filter(entry -> isTopQueriesIndex(entry.getKey(), entry.getValue()))
.forEach(entry -> localIndexExporter.deleteSingleIndex(entry.getKey(), client));
}, exception -> { logger.error("Error while deleting expired top_queries-* indices: ", exception); }));
}

/**
* Set query shape generator
*/
Expand Down
68 changes: 0 additions & 68 deletions src/test/java/org/opensearch/plugin/insights/core/service/QueryInsightsServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
Expand All @@ -36,8 +34,6 @@
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.HashMap;
Expand Down Expand Up @@ -324,61 +320,6 @@ public void testGetHealthStats() {
assertTrue(fieldTypeCacheStats.containsKey(MISS_COUNT));
}

public void testDeleteAllTopNIndices() throws IOException {
Copy link
Member

@ansjcy ansjcy Oct 24, 2025

Choose a reason for hiding this comment

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

instead of removing the tests, we should have tests to validate that the local index "will not be deleted" after disabling.

// Create 9 top_queries-* indices
Map<String, IndexMetadata> indexMetadataMap = new HashMap<>();
for (int i = 1; i < 10; i++) {
String indexName = "top_queries-2024.01.0"
+ i
+ "-"
+ generateLocalIndexDateHash(ZonedDateTime.of(2024, 1, i, 0, 0, 0, 0, ZoneId.of("UTC")).toLocalDate());
long creationTime = Instant.now().minus(i, ChronoUnit.DAYS).toEpochMilli();

IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
.settings(
Settings.builder()
.put("index.version.created", Version.CURRENT.id)
.put("index.number_of_shards", 1)
.put("index.number_of_replicas", 1)
.put(SETTING_CREATION_DATE, creationTime)
)
.putMapping(
new MappingMetadata("_doc", Map.of("_meta", Map.of(QUERY_INSIGHTS_INDEX_TAG_NAME, TOP_QUERIES_INDEX_TAG_VALUE)))
)
.build();
indexMetadataMap.put(indexName, indexMetadata);
}
// Create 5 user indices
for (int i = 0; i < 5; i++) {
String indexName = "my_index-" + i;
long creationTime = Instant.now().minus(i, ChronoUnit.DAYS).toEpochMilli();

IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
.settings(
Settings.builder()
.put("index.version.created", Version.CURRENT.id)
.put("index.number_of_shards", 1)
.put("index.number_of_replicas", 1)
.put(SETTING_CREATION_DATE, creationTime)
)
.putMapping(
new MappingMetadata("_doc", Map.of("_meta", Map.of(QUERY_INSIGHTS_INDEX_TAG_NAME, TOP_QUERIES_INDEX_TAG_VALUE)))
)
.build();
indexMetadataMap.put(indexName, indexMetadata);
}
List<AbstractLifecycleComponent> updatedService = createQueryInsightsServiceWithIndexState(indexMetadataMap);
QueryInsightsService updatedQueryInsightsService = (QueryInsightsService) updatedService.get(0);
ClusterService updatedClusterService = (ClusterService) updatedService.get(1);

updatedQueryInsightsService.deleteAllTopNIndices(client, mockLocalIndexExporter);
// All 10 top_queries-* indices should be deleted, while none of the users indices should be deleted
verify(mockLocalIndexExporter, times(9)).deleteSingleIndex(argThat(str -> str.matches("top_queries-.*")), any());

IOUtils.close(updatedClusterService);
updatedQueryInsightsService.doClose();
}

public void testDeleteExpiredTopNIndices() throws InterruptedException, IOException {
// Test with a new cluster state with expired index mappings
// Create 9 top_queries-* indices with creation dates older than the retention period
Expand Down Expand Up @@ -456,15 +397,13 @@ public void testValidateExporterDeleteAfter() {
public void testSetExporterAndReaderType_SwitchFromLocalIndexToNone() throws IOException {
// Mock current exporter and reader
queryInsightsServiceSpy.sinkType = SinkType.LOCAL_INDEX;
doNothing().when(queryInsightsServiceSpy).deleteAllTopNIndices(any(), any());
// Mock current exporter and reader
when(queryInsightsExporterFactory.getExporter(TopQueriesService.TOP_QUERIES_EXPORTER_ID)).thenReturn(mockLocalIndexExporter);
when(queryInsightsReaderFactory.getReader(TopQueriesService.TOP_QUERIES_READER_ID)).thenReturn(mockReader);

// Execute method
queryInsightsServiceSpy.setExporterAndReaderType(SinkType.NONE);
// Verify cleanup of local indices
verify(queryInsightsServiceSpy, times(1)).deleteAllTopNIndices(client, mockLocalIndexExporter);
verify(queryInsightsExporterFactory, times(1)).closeExporter(mockLocalIndexExporter);
verify(queryInsightsReaderFactory, times(1)).closeReader(mockReader);
// Verify exporter is set to NONE
Expand All @@ -474,15 +413,13 @@ public void testSetExporterAndReaderType_SwitchFromLocalIndexToNone() throws IOE
public void testSetExporterAndReaderType_SwitchFromLocalIndexToDebug() throws IOException {
// Mock current exporter and reader
queryInsightsServiceSpy.sinkType = SinkType.LOCAL_INDEX;
doNothing().when(queryInsightsServiceSpy).deleteAllTopNIndices(any(), any());
// Mock current exporter and reader
when(queryInsightsExporterFactory.getExporter(TopQueriesService.TOP_QUERIES_EXPORTER_ID)).thenReturn(mockLocalIndexExporter);
when(queryInsightsReaderFactory.getReader(TopQueriesService.TOP_QUERIES_READER_ID)).thenReturn(mockReader);

// Execute method
queryInsightsServiceSpy.setExporterAndReaderType(SinkType.DEBUG);
// Verify cleanup of local indices
verify(queryInsightsServiceSpy, times(1)).deleteAllTopNIndices(client, mockLocalIndexExporter);
verify(queryInsightsExporterFactory, times(1)).closeExporter(mockLocalIndexExporter);
verify(queryInsightsReaderFactory, times(1)).closeReader(mockReader);
// Verify exporter is set to NONE
Expand Down Expand Up @@ -510,7 +447,6 @@ public void testSetExporterAndReaderType_SwitchFromNoneToLocalIndex() throws IOE
);
verify(queryInsightsExporterFactory, times(0)).closeExporter(any());
verify(queryInsightsReaderFactory, times(0)).closeReader(any());
verify(queryInsightsServiceSpy, times(0)).deleteAllTopNIndices(any(), any());
assertEquals(SinkType.LOCAL_INDEX, queryInsightsServiceSpy.sinkType);
}

Expand All @@ -523,7 +459,6 @@ public void testSetExporterAndReaderType_SwitchFromNoneToDebug() throws IOExcept
queryInsightsServiceSpy.setExporterAndReaderType(SinkType.DEBUG);
// Verify new local index exporter setup
verify(queryInsightsExporterFactory, times(1)).createDebugExporter(eq(TopQueriesService.TOP_QUERIES_EXPORTER_ID));
verify(queryInsightsServiceSpy, times(0)).deleteAllTopNIndices(any(), any());
verify(queryInsightsExporterFactory, times(0)).closeExporter(any());
verify(queryInsightsReaderFactory, times(0)).closeReader(any());
assertEquals(SinkType.DEBUG, queryInsightsServiceSpy.sinkType);
Expand All @@ -550,7 +485,6 @@ public void testSetExporterAndReaderType_SwitchFromDebugToLocalIndex() throws IO
);
verify(queryInsightsExporterFactory, times(1)).closeExporter(mockDebugExporter);
verify(queryInsightsReaderFactory, times(1)).closeReader(mockReader);
verify(queryInsightsServiceSpy, times(0)).deleteAllTopNIndices(any(), any());
assertEquals(SinkType.LOCAL_INDEX, queryInsightsServiceSpy.sinkType);
}

Expand All @@ -563,15 +497,13 @@ public void testSetExporterAndReaderType_SwitchFromDebugToNone() throws IOExcept
queryInsightsServiceSpy.setExporterAndReaderType(SinkType.NONE);
// Verify new local index exporter setup
// 2 times, one for initialization, one for the above method call
verify(queryInsightsServiceSpy, times(0)).deleteAllTopNIndices(client, mockLocalIndexExporter);
verify(queryInsightsExporterFactory, times(1)).closeExporter(mockDebugExporter);
verify(queryInsightsReaderFactory, times(1)).closeReader(mockReader);
assertEquals(SinkType.NONE, queryInsightsServiceSpy.sinkType);
}

public void testSetExporterAndReaderType_CloseWithException() throws IOException {
queryInsightsServiceSpy.sinkType = SinkType.LOCAL_INDEX;
doNothing().when(queryInsightsServiceSpy).deleteAllTopNIndices(any(), any());
// Mock current exporter that throws an exception when closing
when(queryInsightsExporterFactory.getExporter(TopQueriesService.TOP_QUERIES_EXPORTER_ID)).thenReturn(mockLocalIndexExporter);
when(queryInsightsReaderFactory.getReader(TopQueriesService.TOP_QUERIES_READER_ID)).thenReturn(mockReader);
Expand Down
Loading