Enhance logging messages

Author: jasontedor

server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseActions.java

@@ -115,7 +115,7 @@ public void onFailure(final Exception e) {
         }
 
         @Override
-        protected Response shardOperation(final T request, final ShardId shardId) throws IOException {
+        protected Response shardOperation(final T request, final ShardId shardId) {
             throw new UnsupportedOperationException();
         }
 

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java

@@ -325,15 +325,19 @@ public void restoreShard(IndexShard indexShard, SnapshotId snapshotId, Version v
         // schedule renewals to run during the restore
         final Scheduler.Cancellable renewable = threadPool.scheduleWithFixedDelay(
                 () -> {
-                    logger.trace("{} background renewal of retention lease during restore", shardId);
+                    logger.trace("{} background renewal of retention lease [{}] during restore", shardId, retentionLeaseId);
                     final ThreadContext threadContext = threadPool.getThreadContext();
                     try (ThreadContext.StoredContext ignore = threadContext.stashContext()) {
                         // we have to execute under the system context so that if security is enabled the renewal is authorized
                         threadContext.markAsSystemContext();
                         renewRetentionLease(leaderShardId, retentionLeaseId, remoteClient);
                     } catch (final Exception e) {
                         assert e instanceof ElasticsearchSecurityException == false : e;
-                        logger.warn(new ParameterizedMessage("{} background renewal of retention lease failed during restore", shardId), e);
+                        logger.warn(new ParameterizedMessage(
+                                        "{} background renewal of retention lease [{}] failed during restore",
+                                        shardId,
+                                        retentionLeaseId),
+                                e);
                         throw e;
                     }
                 },
@@ -375,12 +379,19 @@ void acquireRetentionLeaseOnLeader(
         final Optional<RetentionLeaseAlreadyExistsException> maybeAddAlready =
                 addRetentionLease(leaderShardId, retentionLeaseId, remoteClient);
         maybeAddAlready.ifPresent(addAlready -> {
-            logger.trace(() -> new ParameterizedMessage("{} retention lease already exists, requesting a renewal", shardId), addAlready);
+            logger.trace(() -> new ParameterizedMessage(
+                            "{} retention lease [{}] already exists, requesting a renewal",
+                            shardId,
+                            retentionLeaseId),
+                    addAlready);
             final Optional<RetentionLeaseNotFoundException> maybeRenewNotFound =
                     renewRetentionLease(leaderShardId, retentionLeaseId, remoteClient);
             maybeRenewNotFound.ifPresent(renewNotFound -> {
                 logger.trace(() -> new ParameterizedMessage(
-                        "{} retention lease not found while attempting to renew, requesting a final add", shardId), renewNotFound);
+                                "{} retention lease [{}] not found while attempting to renew, requesting a final add",
+                                shardId,
+                                retentionLeaseId),
+                        renewNotFound);
                 final Optional<RetentionLeaseAlreadyExistsException> maybeFallbackAddAlready =
                         addRetentionLease(leaderShardId, retentionLeaseId, remoteClient);
                 maybeFallbackAddAlready.ifPresent(fallbackAddAlready -> {

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java

@@ -154,7 +154,7 @@ public void testRetentionLeaseIsTakenAtTheStartOfRecovery() throws Exception {
         // ensure that a retention lease has been put in place on each shard
         assertBusy(() -> {
             final IndicesStatsResponse stats =
-                    leaderClient().admin().indices().stats(new IndicesStatsRequest().indices(leaderIndex)).actionGet();
+                    leaderClient().admin().indices().stats(new IndicesStatsRequest().clear().indices(leaderIndex)).actionGet();
             assertNotNull(stats.getShards());
             assertThat(stats.getShards(), arrayWithSize(numberOfShards * (1 + numberOfReplicas)));
             final List<ShardStats> shardStats = getShardStats(stats);
@@ -231,7 +231,7 @@ public void testRetentionLeaseIsRenewedDuringRecovery() throws Exception {
             assertBusy(() -> {
                 retentionLeases.clear();
                 final IndicesStatsResponse stats =
-                        leaderClient().admin().indices().stats(new IndicesStatsRequest().indices(leaderIndex)).actionGet();
+                        leaderClient().admin().indices().stats(new IndicesStatsRequest().clear().indices(leaderIndex)).actionGet();
                 assertNotNull(stats.getShards());
                 assertThat(stats.getShards(), arrayWithSize(numberOfShards * (1 + numberOfReplicas)));
                 final List<ShardStats> shardStats = getShardStats(stats);
@@ -251,7 +251,7 @@ public void testRetentionLeaseIsRenewedDuringRecovery() throws Exception {
             // now ensure that the retention leases are being renewed
             assertBusy(() -> {
                 final IndicesStatsResponse stats =
-                        leaderClient().admin().indices().stats(new IndicesStatsRequest().indices(leaderIndex)).actionGet();
+                        leaderClient().admin().indices().stats(new IndicesStatsRequest().clear().indices(leaderIndex)).actionGet();
                 assertNotNull(stats.getShards());
                 assertThat(stats.getShards(), arrayWithSize(numberOfShards * (1 + numberOfReplicas)));
                 final List<ShardStats> shardStats = getShardStats(stats);
@@ -316,7 +316,7 @@ public void testRetentionLeasesAreNotBeingRenewedAfterRecoveryCompletes() throws
         assertBusy(() -> {
             retentionLeases.clear();
             final IndicesStatsResponse stats =
-                    leaderClient().admin().indices().stats(new IndicesStatsRequest().indices(leaderIndex)).actionGet();
+                    leaderClient().admin().indices().stats(new IndicesStatsRequest().clear().indices(leaderIndex)).actionGet();
             assertNotNull(stats.getShards());
             assertThat(stats.getShards(), arrayWithSize(numberOfShards * (1 + numberOfReplicas)));
             final List<ShardStats> shardStats = getShardStats(stats);
@@ -346,7 +346,7 @@ public void testRetentionLeasesAreNotBeingRenewedAfterRecoveryCompletes() throws
         // now ensure that the retention leases are the same
         assertBusy(() -> {
             final IndicesStatsResponse stats =
-                    leaderClient().admin().indices().stats(new IndicesStatsRequest().indices(leaderIndex)).actionGet();
+                    leaderClient().admin().indices().stats(new IndicesStatsRequest().clear().indices(leaderIndex)).actionGet();
             assertNotNull(stats.getShards());
             assertThat(stats.getShards(), arrayWithSize(numberOfShards * (1 + numberOfReplicas)));
             final List<ShardStats> shardStats = getShardStats(stats);