remove replica

Author: tlrx

server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java

@@ -663,8 +663,6 @@ private final class AsyncReplicaAction extends AbstractRunnable implements Actio
         // something we want to avoid at all costs
         private final ClusterStateObserver observer = new ClusterStateObserver(clusterService, null, logger, threadPool.getThreadContext());
         private final ConcreteReplicaRequest<ReplicaRequest> replicaRequest;
-        private final Supplier<Long> localCheckpointSupplier;
-        private final Supplier<Long> globalCheckpointSupplier;
 
         AsyncReplicaAction(
             ConcreteReplicaRequest<ReplicaRequest> replicaRequest,
@@ -677,9 +675,6 @@ private final class AsyncReplicaAction extends AbstractRunnable implements Actio
             final ShardId shardId = replicaRequest.getRequest().shardId();
             assert shardId != null : "request shardId must be set";
             this.replica = getIndexShard(shardId);
-            this.localCheckpointSupplier = replica.getLocalCheckpointSupplier();
-            this.globalCheckpointSupplier = replica.getLastSyncedGlobalCheckpointSupplier();
-
         }
 
         @Override
@@ -690,7 +685,10 @@ public void onResponse(Releasable releasable) {
                     replicaRequest.getRequest(),
                     replica,
                     ActionListener.wrap((replicaResult) -> replicaResult.runPostReplicaActions(ActionListener.wrap(r -> {
-                        final ReplicaResponse response = new ReplicaResponse(localCheckpointSupplier.get(), globalCheckpointSupplier.get());
+                        final ReplicaResponse response = new ReplicaResponse(
+                            replica.getLocalCheckpoint(),
+                            replica.getLastSyncedGlobalCheckpoint()
+                        );
                         releasable.close(); // release shard operation lock before responding to caller
                         if (logger.isTraceEnabled()) {
                             logger.trace(

server/src/main/java/org/elasticsearch/index/engine/SafeEngineAccessThreadLocal.java

@@ -82,15 +82,14 @@ public static void accessEnd() {
     /**
      * Use this method to assert that the current thread has not entered a protected execution code block.
      */
-    public static boolean assertNoAccessByCurrentThread() {
+    public static void checkAccess() {
         ensureAssertionsEnabled();
         final var accessor = getAccessorSafe();
         if (accessor != null) {
             var message = "thread [" + accessor + "] should not access the engine using the getEngineOrNull() method";
             accessor.setFailure(new AssertionError(message)); // to be thrown later
             assert false : message;
         }
-        return true;
     }
 
     private static void ensureAssertionsEnabled() {

server/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -3364,7 +3364,7 @@ Engine getEngine() {
      * closed.
      */
     public Engine getEngineOrNull() {
-        assert SafeEngineAccessThreadLocal.assertNoAccessByCurrentThread();
+        SafeEngineAccessThreadLocal.checkAccess();
         return this.currentEngineReference.get();
     }