Remote reindex migration removed from OS3 module (#24095)

Co-authored-by: Matthias Oesterheld <[email protected]>

Author: todvora

graylog-storage-elasticsearch7/src/main/java/org/graylog/storage/elasticsearch7/UnsupportedRemoteReindexingMigrationAdapterES7.java

@@ -31,11 +31,6 @@ public class UnsupportedRemoteReindexingMigrationAdapterES7 implements RemoteRei
 
     public static final String UNSUPPORTED_MESSAGE = "This operation should never be called. We remote-reindex into the DataNode that contains OpenSearch. This adapter only exists for API completeness";
 
-    @Override
-    public boolean isMigrationRunning(IndexSet indexSet) {
-        return false; // we'll never run a remote reindex migration against elasticsearch target. It's always OS in datanode.
-    }
-
     @Override
     public String start(RemoteReindexRequest request) {
         throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);

graylog-storage-opensearch2/src/main/java/org/graylog/storage/opensearch2/RemoteReindexingMigrationAdapterOS2.java

@@ -28,8 +28,8 @@
 import jakarta.annotation.Nullable;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
-import org.apache.commons.io.IOUtils;
 import jakarta.ws.rs.ForbiddenException;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.time.DurationFormatUtils;
 import org.graylog.shaded.opensearch2.org.opensearch.OpenSearchException;
 import org.graylog.shaded.opensearch2.org.opensearch.action.admin.cluster.health.ClusterHealthRequest;
@@ -169,14 +169,6 @@ public RemoteReindexingMigrationAdapterOS2(final OpenSearchClient client,
         this.migrationLockService = migrationLockService;
     }
 
-    @Override
-    public boolean isMigrationRunning(IndexSet indexSet) {
-        return reindexMigrationService.getLatestMigrationId()
-                .map(this::status)
-                .map(migration -> isIndexSetCurrentlyMigrated(indexSet, migration))
-                .orElse(false);
-    }
-
     @Nonnull
     private Boolean isIndexSetCurrentlyMigrated(IndexSet indexSet, RemoteReindexMigration mig) {
         if (mig.status() == Status.NOT_STARTED || mig.status() == Status.RUNNING) {

graylog-storage-opensearch3/src/main/java/org/graylog/storage/opensearch3/OpenSearch3Module.java

@@ -93,7 +93,7 @@ protected void configure() {
         bindForSupportedVersion(QuerySuggestionsService.class).to(QuerySuggestionsOS2.class);
 
         bindForSupportedVersion(ProxyRequestAdapter.class).to(ProxyRequestAdapterOS2.class);
-        bindForSupportedVersion(RemoteReindexingMigrationAdapter.class).to(RemoteReindexingMigrationAdapterOS2.class);
+        bindForSupportedVersion(RemoteReindexingMigrationAdapter.class).to(UnsupportedRemoteReindexMigrationAdapterOS.class);
 
         install(new FactoryModuleBuilder().build(ScrollResultOS2.Factory.class));