From b8840f2ef63ab8e45cf1245e4ec6598d8c515c93 Mon Sep 17 00:00:00 2001
From: Ashish Singh <ssashish@amazon.com>
Date: Tue, 26 Sep 2023 14:00:30 +0530
Subject: [PATCH] Add shardId to logger and more logs

Signed-off-by: Ashish Singh <ssashish@amazon.com>
---
 .../opensearch/index/shard/RemoteStoreRefreshListener.java   | 1 +
 .../opensearch/index/translog/InternalTranslogManager.java   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
index d83af28b54921..695c01367171a 100644
--- a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
+++ b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
@@ -301,6 +301,7 @@ private void onSuccessfulSegmentsSync(
         indexShard.getEngine().translogManager().setMinSeqNoToKeep(lastRefreshedCheckpoint + 1);
         // Publishing the new checkpoint which is used for remote store + segrep indexes
         checkpointPublisher.publish(indexShard, checkpoint);
+        logger.debug("onSuccessfulSegmentsSync lastRefreshedCheckpoint={} checkpoint={}", lastRefreshedCheckpoint, checkpoint);
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/translog/InternalTranslogManager.java b/server/src/main/java/org/opensearch/index/translog/InternalTranslogManager.java
index 6b51cb17dcc41..4bc9a711894b7 100644
--- a/server/src/main/java/org/opensearch/index/translog/InternalTranslogManager.java
+++ b/server/src/main/java/org/opensearch/index/translog/InternalTranslogManager.java
@@ -8,10 +8,10 @@
 
 package org.opensearch.index.translog;
 
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.store.AlreadyClosedException;
+import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.util.concurrent.ReleasableLock;
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.core.index.shard.ShardId;
@@ -43,7 +43,7 @@ public class InternalTranslogManager implements TranslogManager, Closeable {
     private final AtomicBoolean pendingTranslogRecovery = new AtomicBoolean(false);
     private final TranslogEventListener translogEventListener;
     private final Supplier<LocalCheckpointTracker> localCheckpointTrackerSupplier;
-    private static final Logger logger = LogManager.getLogger(InternalTranslogManager.class);
+    private final Logger logger;
 
     public InternalTranslogManager(
         TranslogConfig translogConfig,
@@ -76,6 +76,7 @@ public InternalTranslogManager(
         assert pendingTranslogRecovery.get() == false : "translog recovery can't be pending before we set it";
         // don't allow commits until we are done with recovering
         pendingTranslogRecovery.set(true);
+        this.logger = Loggers.getLogger(getClass(), shardId);
     }
 
     /**