fixup! Remove security migrations improvement

Author: jfreden

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityMigrationExecutor.java

@@ -10,8 +10,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.admin.indices.refresh.RefreshAction;
-import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.support.ThreadedActionListener;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.core.TimeValue;
@@ -26,9 +24,6 @@
 import java.util.TreeMap;
 import java.util.concurrent.Executor;
 
-import static org.elasticsearch.xpack.core.ClientHelper.SECURITY_ORIGIN;
-import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
-
 public class SecurityMigrationExecutor extends PersistentTasksExecutor<SecurityMigrationTaskParams> {
 
     private static final Logger logger = LogManager.getLogger(SecurityMigrationExecutor.class);
@@ -88,17 +83,13 @@ private void applyOutstandingMigrations(AllocatedPersistentTask task, int curren
                         response -> updateMigrationVersion(
                             migrationEntry.getKey(),
                             securityIndexManager.getConcreteIndexName(),
-                            new ThreadedActionListener<>(this.getExecutor(), ActionListener.wrap(updateResponse -> {
-                                refreshSecurityIndex(
-                                    new ThreadedActionListener<>(
-                                        this.getExecutor(),
-                                        ActionListener.wrap(
-                                            refreshResponse -> applyOutstandingMigrations(task, migrationEntry.getKey(), listener),
-                                            listener::onFailure
-                                        )
-                                    )
-                                );
-                            }, listener::onFailure))
+                            new ThreadedActionListener<>(
+                                this.getExecutor(),
+                                ActionListener.wrap(
+                                    updateResponse -> applyOutstandingMigrations(task, migrationEntry.getKey(), listener),
+                                    listener::onFailure
+                                )
+                            )
                         ),
                         listener::onFailure
                     )
@@ -109,21 +100,6 @@ private void applyOutstandingMigrations(AllocatedPersistentTask task, int curren
         }
     }
 
-    /**
-     * Refresh security index to make sure that docs that were migrated are visible to the next migration and to prevent version conflicts
-     * or unexpected behaviour by APIs relying on migrated docs.
-     */
-    private void refreshSecurityIndex(ActionListener<Void> listener) {
-        RefreshRequest refreshRequest = new RefreshRequest(securityIndexManager.getConcreteIndexName());
-        executeAsyncWithOrigin(
-            client,
-            SECURITY_ORIGIN,
-            RefreshAction.INSTANCE,
-            refreshRequest,
-            ActionListener.wrap(response -> listener.onResponse(null), listener::onFailure)
-        );
-    }
-
     private void updateMigrationVersion(int migrationVersion, String indexName, ActionListener<Void> listener) {
         client.execute(
             UpdateIndexMigrationVersionAction.INSTANCE,