spotless

Author: JVerwolf

modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/FeatureMigrationIT.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.migration;
 
-import com.carrotsearch.randomizedtesting.annotations.Timeout;
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.action.admin.cluster.migration.GetFeatureUpgradeStatusAction;
 import org.elasticsearch.action.admin.cluster.migration.GetFeatureUpgradeStatusRequest;

server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java

@@ -208,10 +208,13 @@ public void run(SystemIndexMigrationTaskState taskState) {
 
         // Kick off our callback "loop" - finishIndexAndLoop calls back into prepareNextIndex
         logger.debug("cleaning up previous migration, task state: [{}]", taskState == null ? "null" : Strings.toString(taskState));
-        clearResults(clusterService, ActionListener.wrap(state ->
-                prepareNextIndex(state2 ->
-                    migrateSingleIndex(state2, this::finishIndexAndLoop), stateFeatureName),
-            this::markAsFailed));
+        clearResults(
+            clusterService,
+            ActionListener.wrap(
+                state -> prepareNextIndex(state2 -> migrateSingleIndex(state2, this::finishIndexAndLoop), stateFeatureName),
+                this::markAsFailed
+            )
+        );
     }
 
     private void finishIndexAndLoop(BulkByScrollResponse bulkResponse) {
@@ -251,10 +254,7 @@ private void finishIndexAndLoop(BulkByScrollResponse bulkResponse) {
                 }, this::markAsFailed)
             );
         } else {
-            prepareNextIndex(
-                state2 -> migrateSingleIndex(state2, this::finishIndexAndLoop),
-                lastMigrationInfo.getFeatureName()
-            );
+            prepareNextIndex(state2 -> migrateSingleIndex(state2, this::finishIndexAndLoop), lastMigrationInfo.getFeatureName());
         }
     }
 
@@ -468,7 +468,7 @@ private void migrateSingleIndex(ClusterState clusterState, Consumer<BulkByScroll
         }
     }
 
-    //        ActionListener<BulkByScrollResponse> innerListener = ActionListener.wrap(listener::accept, this::markAsFailed);
+    // ActionListener<BulkByScrollResponse> innerListener = ActionListener.wrap(listener::accept, this::markAsFailed);
     private <T> void retryAfterFailureHandler(
         ActionListener<T> listener,
         Consumer<ActionListener<T>> retryableAction,
@@ -482,11 +482,7 @@ private <T> void retryAfterFailureHandler(
     }
 
     private void createIndex(SystemIndexMigrationInfo migrationInfo, ActionListener<ShardsAcknowledgedResponse> listener) {
-        logger.info(
-            "creating new system index [{}] from feature [{}]",
-            migrationInfo.getNextIndexName(),
-            migrationInfo.getFeatureName()
-        );
+        logger.info("creating new system index [{}] from feature [{}]", migrationInfo.getNextIndexName(), migrationInfo.getFeatureName());
 
         final CreateIndexClusterStateUpdateRequest createRequest = new CreateIndexClusterStateUpdateRequest(
             "migrate-system-index",
@@ -513,38 +509,25 @@ private void createIndex(SystemIndexMigrationInfo migrationInfo, ActionListener<
         );
     }
 
-
     private void createIndexRetryOnFailure(SystemIndexMigrationInfo migrationInfo, ActionListener<ShardsAcknowledgedResponse> listener) {
         createIndex(migrationInfo, ActionListener.wrap(listener::onResponse, e -> {
-            logger.warn(
-                "createIndex failed, retrying after removing index [{}] from previous attempt",
-                migrationInfo.getNextIndexName()
-            );
-            deleteIndex(migrationInfo, ActionListener.wrap(
-                cleanupResponse -> createIndex(migrationInfo, listener),
-                e2 -> {
-                    logger.warn("createIndex failed after retrying, aborting", e2);
-                    listener.onFailure(e2);
-                }
-            ));
+            logger.warn("createIndex failed, retrying after removing index [{}] from previous attempt", migrationInfo.getNextIndexName());
+            deleteIndex(migrationInfo, ActionListener.wrap(cleanupResponse -> createIndex(migrationInfo, listener), e2 -> {
+                logger.warn("createIndex failed after retrying, aborting", e2);
+                listener.onFailure(e2);
+            }));
         }));
     }
 
-    private <T> void deleteIndex(
-        SystemIndexMigrationInfo migrationInfo,
-        ActionListener<AcknowledgedResponse> listener
-    ) {
+    private <T> void deleteIndex(SystemIndexMigrationInfo migrationInfo, ActionListener<AcknowledgedResponse> listener) {
         logger.info("removing index [{}] from feature [{}]", migrationInfo.getNextIndexName(), migrationInfo.getFeatureName());
         String newIndexName = migrationInfo.getNextIndexName();
-        baseClient.admin()
-            .indices()
-            .prepareDelete(newIndexName)
-            .execute(ActionListener.wrap(ackedResponse -> {
-                if (ackedResponse.isAcknowledged()) {
-                    logger.info("successfully removed index [{}]", newIndexName);
-                    listener.onResponse(ackedResponse);
-                }
-            }, listener::onFailure));
+        baseClient.admin().indices().prepareDelete(newIndexName).execute(ActionListener.wrap(ackedResponse -> {
+            if (ackedResponse.isAcknowledged()) {
+                logger.info("successfully removed index [{}]", newIndexName);
+                listener.onResponse(ackedResponse);
+            }
+        }, listener::onFailure));
     }
 
     private void setAliasAndRemoveOldIndex(SystemIndexMigrationInfo migrationInfo, ActionListener<IndicesAliasesResponse> listener) {
@@ -651,7 +634,8 @@ public void markAsFailed(Exception e) {
         String featureName = Optional.ofNullable(migrationInfo).map(SystemIndexMigrationInfo::getFeatureName).orElse("<unknown feature>");
         String indexName = Optional.ofNullable(migrationInfo).map(SystemIndexMigrationInfo::getCurrentIndexName).orElse("<unknown index>");
 
-        MigrationResultsUpdateTask.upsert( // this is for the Custom Metadata, not the Persistent Task
+        MigrationResultsUpdateTask.upsert(
+            // this is for the Custom Metadata, not the Persistent Task
             featureName,
             SingleFeatureMigrationResult.failure(indexName, e),
             ActionListener.wrap(state -> super.markAsFailed(e), exception -> super.markAsFailed(e))