Added logging for skipping index rotation

Graylog2 · Aug 20, 2024 · 6e48d4d · 6e48d4d
1 parent e644002
commit 6e48d4d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/periodical/IndexRotationThread.java b/graylog2-server/src/main/java/org/graylog2/periodical/IndexRotationThread.java
@@ -113,7 +113,11 @@ public void doRun() {
 
 
     private boolean isCurrentlyMigrated(IndexSet indexSet) {
-        return migrationService.isMigrationRunning(indexSet);
+        final boolean migrationIsRunning = migrationService.isMigrationRunning(indexSet);
+        if (migrationIsRunning) {
+            LOG.info("Index set {} is being migrated, skipping index rotation", indexSet.getConfig().title());
+        }
+        return migrationIsRunning;
     }
 
     @Override

diff --git a/graylog2-server/src/test/java/org/graylog2/periodical/IndexRotationThreadTest.java b/graylog2-server/src/test/java/org/graylog2/periodical/IndexRotationThreadTest.java
@@ -44,7 +44,6 @@
 import jakarta.inject.Provider;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 
 import static org.mockito.Mockito.never;
@@ -129,8 +128,8 @@ public void testDoNotPerformRotation() throws NoTargetIndexException {
     @Test
     public void testSkipRotationDuringMigration() throws NoTargetIndexException {
         TestableRotationStrategy testableRotationStrategy = new TestableRotationStrategy();
-        final IndexSet indexSetFinished = mockIndexSet(true, testableRotationStrategy);
-        final IndexSet indexSetMigrated = mockIndexSet(true, testableRotationStrategy);
+        final IndexSet indexSetFinished = mockIndexSet("finished_index_set", true, testableRotationStrategy);
+        final IndexSet indexSetMigrated = mockIndexSet("migrating_index_set", true, testableRotationStrategy);
 
         final IndexRotationThread rotationThread = new IndexRotationThread(
                 Mockito.mock(NotificationService.class),
@@ -157,11 +156,12 @@ private RemoteReindexingMigrationAdapter mockMigrationAdapter(IndexSet migration
         return migrationAdapter;
     }
 
-    private IndexSet mockIndexSet(boolean writable, RotationStrategy testableRotationStrategy) {
+    private IndexSet mockIndexSet(String indexSetTitle, boolean writable, RotationStrategy testableRotationStrategy) {
         final IndexSet indexSet = Mockito.mock(IndexSet.class);
         final IndexSetConfig config = Mockito.mock(IndexSetConfig.class);
         Mockito.when(config.isWritable()).thenReturn(writable);
         Mockito.when(config.rotationStrategyClass()).thenReturn(testableRotationStrategy.getStrategyName());
+        Mockito.when(config.title()).thenReturn(indexSetTitle);
         Mockito.when(indexSet.getConfig()).thenReturn(config);
         return indexSet;
     }