Rename methods

Author: tlrx

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

@@ -355,12 +355,12 @@ protected void doRun() throws Exception {
             }
 
             acquirePrimaryOperationPermit(indexShard, request, ActionListener.wrap(
-                releasable -> runWithReleasable(new PrimaryShardReference(indexShard, releasable)),
+                releasable -> runWithPrimaryShardReference(new PrimaryShardReference(indexShard, releasable)),
                 this::onFailure
             ));
         }
 
-        void runWithReleasable(final PrimaryShardReference primaryShardReference) {
+        void runWithPrimaryShardReference(final PrimaryShardReference primaryShardReference) {
             try {
                 final ClusterState clusterState = clusterService.state();
                 final IndexMetaData indexMetaData = clusterState.metaData().getIndexSafe(primaryShardReference.routingEntry().index());

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

@@ -2306,9 +2306,9 @@ public void acquirePrimaryOperationPermit(ActionListener<Releasable> onPermitAcq
      * Acquire all primary operation permits. Once all permits are acquired, the provided ActionListener is called.
      * It is the responsibility of the caller to close the {@link Releasable}.
      */
-    public void acquirePrimaryAllOperationsPermits(final ActionListener<Releasable> onPermitAcquired, final TimeValue timeout) {
+    public void acquireAllPrimaryOperationsPermits(final ActionListener<Releasable> onPermitAcquired, final TimeValue timeout) {
         verifyNotClosed();
-        assert shardRouting.primary() : "acquirePrimaryAllOperationsPermits should only be called on primary shard: " + shardRouting;
+        assert shardRouting.primary() : "acquireAllPrimaryOperationsPermits should only be called on primary shard: " + shardRouting;
 
         indexShardOperationPermits.asyncBlockOperations(onPermitAcquired, timeout.duration(), timeout.timeUnit());
     }
@@ -2458,7 +2458,7 @@ public void acquireReplicaOperationPermit(final long opPrimaryTerm,
 
     /**
      * Acquire all replica operation permits whenever the shard is ready for indexing (see
-     * {@link #acquirePrimaryAllOperationsPermits(ActionListener, TimeValue)}. If the given primary term is lower than then one in
+     * {@link #acquireAllPrimaryOperationsPermits(ActionListener, TimeValue)}. If the given primary term is lower than then one in
      * {@link #shardRouting}, the {@link ActionListener#onFailure(Exception)} method of the provided listener is invoked with an
      * {@link IllegalStateException}.
      *

server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java

@@ -208,11 +208,11 @@ protected void doRun() throws Exception {
                         }
 
                         @Override
-                        void runWithReleasable(final TransportReplicationAction.PrimaryShardReference reference) {
+                        void runWithPrimaryShardReference(final TransportReplicationAction.PrimaryShardReference reference) {
                             assertThat(reference.indexShard.getActiveOperationsCount(), greaterThan(0));
                             assertSame(primary, reference.indexShard);
                             assertBlockIsPresentForDelayedOp();
-                            super.runWithReleasable(reference);
+                            super.runWithPrimaryShardReference(reference);
                         }
 
                         @Override
@@ -250,7 +250,7 @@ private void assertBlockIsPresentForDelayedOp() {
             TransportReplicationAction.AsyncPrimaryAction asyncPrimaryAction =
                 allPermitsAction.new AsyncPrimaryAction(request(), allocationId(), primaryTerm(), transportChannel(allPermitFuture), null) {
                     @Override
-                    void runWithReleasable(final TransportReplicationAction.PrimaryShardReference reference) {
+                    void runWithPrimaryShardReference(final TransportReplicationAction.PrimaryShardReference reference) {
                         assertEquals("All permits must be acquired", 0, reference.indexShard.getActiveOperationsCount());
                         assertSame(primary, reference.indexShard);
 
@@ -274,7 +274,7 @@ void runWithReleasable(final TransportReplicationAction.PrimaryShardReference re
                         } catch (InterruptedException | BrokenBarrierException e) {
                             onFailure(e);
                         }
-                        super.runWithReleasable(reference);
+                        super.runWithPrimaryShardReference(reference);
                     }
                 };
             asyncPrimaryAction.run();
@@ -434,7 +434,7 @@ protected void acquirePrimaryOperationPermit(IndexShard shard, Request request,
             assertTrue(shard.routingEntry().primary());
             assertSame(primary, shard);
             if (acquireAllPermits) {
-                shard.acquirePrimaryAllOperationsPermits(onAcquired, timeout);
+                shard.acquireAllPrimaryOperationsPermits(onAcquired, timeout);
             } else {
                 super.acquirePrimaryOperationPermit(shard, request, onAcquired);
             }

server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java

@@ -313,7 +313,7 @@ public void testClosesPreventsNewOperations() throws Exception {
         expectThrows(IndexShardClosedException.class,
             () -> indexShard.acquirePrimaryOperationPermit(null, ThreadPool.Names.WRITE, ""));
         expectThrows(IndexShardClosedException.class,
-            () -> indexShard.acquirePrimaryAllOperationsPermits(null, TimeValue.timeValueSeconds(30L)));
+            () -> indexShard.acquireAllPrimaryOperationsPermits(null, TimeValue.timeValueSeconds(30L)));
         expectThrows(IndexShardClosedException.class,
             () -> indexShard.acquireReplicaOperationPermit(indexShard.getPendingPrimaryTerm(), SequenceNumbers.UNASSIGNED_SEQ_NO,
                 randomNonNegativeLong(), null, ThreadPool.Names.WRITE, ""));
@@ -665,7 +665,7 @@ public void onFailure(final Exception e) {
                 if (singlePermit) {
                     indexShard.acquirePrimaryOperationPermit(future, ThreadPool.Names.WRITE, "");
                 } else {
-                    indexShard.acquirePrimaryAllOperationsPermits(future, TimeValue.timeValueHours(1L));
+                    indexShard.acquireAllPrimaryOperationsPermits(future, TimeValue.timeValueHours(1L));
                 }
                 assertEquals(0, indexShard.getActiveOperationsCount());
             });
@@ -688,7 +688,7 @@ public void onResponse(final Releasable releasable) {
                 }
             }
         };
-        indexShard.acquirePrimaryAllOperationsPermits(futureAllPermits, TimeValue.timeValueSeconds(30L));
+        indexShard.acquireAllPrimaryOperationsPermits(futureAllPermits, TimeValue.timeValueSeconds(30L));
         allPermitsAcquired.await();
         assertTrue(blocked.get());
         assertEquals(0, indexShard.getActiveOperationsCount());
@@ -781,7 +781,7 @@ public void testOperationPermitOnReplicaShards() throws Exception {
             assertThat(e, hasToString(containsString("acquirePrimaryOperationPermit should only be called on primary shard")));
 
             e = expectThrows(AssertionError.class,
-                    () -> indexShard.acquirePrimaryAllOperationsPermits(null, TimeValue.timeValueSeconds(30L)));
+                    () -> indexShard.acquireAllPrimaryOperationsPermits(null, TimeValue.timeValueSeconds(30L)));
             assertThat(e, hasToString(containsString("acquirePrimaryAllOperationsPermits should only be called on primary shard")));
         }