Remove RecoverySourceHandler#shardId (#95401)

This field is only used as a prefix for log messages, but the logger
already uses a prefix which includes the full shard ID (not just the
number) so there's no need to write the number again.

Author: DaveCTurner

server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java

@@ -110,7 +110,6 @@ public class RecoverySourceHandler {
     protected final Logger logger;
     // Shard that is going to be recovered (the "source")
     private final IndexShard shard;
-    private final int shardId;
     // Request containing source and target node information
     private final StartRecoveryRequest request;
     private final int chunkSizeInBytes;
@@ -142,7 +141,6 @@ public RecoverySourceHandler(
         this.threadPool = threadPool;
         this.recoveryPlannerService = recoveryPlannerService;
         this.request = request;
-        this.shardId = this.request.shardId().id();
         this.logger = Loggers.getLogger(getClass(), request.shardId(), "recover to " + request.targetNode().getName());
         this.chunkSizeInBytes = fileChunkSizeInBytes;
         this.maxConcurrentFileChunks = maxConcurrentFileChunks;
@@ -1433,7 +1431,7 @@ private void handleErrorOnSendFiles(Store store, Exception e, StoreFileMetadata[
                 cancellableThreads.checkForCancel();
                 logger.debug("checking integrity for file {} after remove corruption exception", md);
                 if (store.checkIntegrityNoException(md) == false) { // we are corrupted on the primary -- fail!
-                    logger.warn("{} Corrupted file detected {} checksum mismatch", shardId, md);
+                    logger.warn("Corrupted file detected {} checksum mismatch", md);
                     if (localException == null) {
                         localException = corruptIndexException;
                     }
@@ -1449,12 +1447,7 @@ private void handleErrorOnSendFiles(Store store, Exception e, StoreFileMetadata[
                 );
                 remoteException.addSuppressed(e);
                 logger.warn(
-                    () -> format(
-                        "%s Remote file corruption on node %s, recovering %s. local checksum OK",
-                        shardId,
-                        request.targetNode(),
-                        mds
-                    ),
+                    () -> format("Remote file corruption on node %s, recovering %s. local checksum OK", request.targetNode(), mds),
                     corruptIndexException
                 );
                 throw remoteException;