Less usage of primaryShardReference

DaveCTurner · Apr 15, 2019 · a26a986 · a26a986
1 parent 1350c0f
commit a26a986
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...rc/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/...rc/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -364,9 +364,10 @@ public void handleException(TransportException exp) {
                         onCompletionListener.onResponse(response);
                     }, e -> handleException(primaryShardReference, e));
 
+                    final IndexShard shard = primaryShardReference.indexShard;
+
                     final ActionListener<Response> globalCheckpointSyncingListener = ActionListener.wrap(response -> {
                         if (syncGlobalCheckpointAfterOperation) {
-                            final IndexShard shard = primaryShardReference.indexShard;
                             try {
                                 shard.maybeSyncGlobalCheckpoint("post-operation");
                             } catch (final Exception e) {
@@ -376,7 +377,8 @@ public void handleException(TransportException exp) {
                                     // intentionally swallow, a missed global checkpoint sync should not fail this operation
                                     logger.info(
                                         new ParameterizedMessage(
-                                            "{} failed to execute post-operation global checkpoint sync", shard.shardId()), e);
+                                            "{} failed to execute post-operation global checkpoint sync",
+                                            primaryShardReference.routingEntry().shardId()), e);
                                 }
                             }
                         }