commit 40817bfa1f76f4bc081359b335e7d743ac6e5960
author poorna <poorna@apache.org> Wed Apr 25 18:58:52 2018 -0700
committer poorna <poorna@apache.org> Tue May 01 16:53:51 2018 -0700
tree 75cced8b8549da4a55b10bbe385173ca3760e746
parent 84edc08ccc5b0cfc7112fb89ab3ebc343ab9fcb9

TEPHRA-266 Identify log messages when multiple instances of Tephra run on a single HBase cluster

Signed-off-by: poorna <poorna@apache.org>

tephra-core/src/main/java/org/apache/tephra/coprocessor/TransactionStateCache.java

diff --git a/tephra-core/src/main/java/org/apache/tephra/coprocessor/TransactionStateCache.java b/tephra-core/src/main/java/org/apache/tephra/coprocessor/TransactionStateCache.java
index ac329f9..95d15ae 100644
--- a/tephra-core/src/main/java/org/apache/tephra/coprocessor/TransactionStateCache.java
+++ b/tephra-core/src/main/java/org/apache/tephra/coprocessor/TransactionStateCache.java
@@ -55,6 +55,7 @@
   // snapshot refresh frequency in milliseconds
   private long snapshotRefreshFrequency;
   private boolean initialized;
+  private String logPrefix = "";
 
   public TransactionStateCache() {
   }
@@ -103,10 +104,10 @@
                                                      TxConstants.Manager.DEFAULT_TX_SNAPSHOT_INTERVAL) * 1000;
         this.initialized = true;
       } else {
-        LOG.info("Could not load configuration");
+        LOG.info(prefixLog("Could not load configuration"));
       }
     } catch (Exception e) {
-      LOG.info("Failed to initialize TransactionStateCache due to: ", e);
+      LOG.info(prefixLog("Failed to initialize TransactionStateCache due to: "), e);
     }
   }
 
@@ -131,7 +132,7 @@
             try {
               refreshState();
             } catch (IOException ioe) {
-              LOG.info("Error refreshing transaction state cache.", ioe);
+              LOG.info(prefixLog("Error refreshing transaction state cache."), ioe);
             }
           }
           try {
@@ -142,7 +143,7 @@
             break;
           }
         }
-        LOG.info("Exiting thread " + getName());
+        LOG.info(prefixLog("Exiting thread " + getName()));
       }
     };
     this.refreshService.setDaemon(true);
@@ -160,18 +161,18 @@
       TransactionVisibilityState currentState = storage.getLatestTransactionVisibilityState();
       if (currentState != null) {
         if (currentState.getTimestamp() < (now - 2 * snapshotRefreshFrequency)) {
-          LOG.info("Current snapshot is old, will force a refresh on next run.");
+          LOG.info(prefixLog("Current snapshot is old, will force a refresh on next run."));
           reset();
         } else {
           latestState = currentState;
-          LOG.info("Transaction state reloaded with snapshot from " + latestState.getTimestamp());
+          LOG.info(prefixLog("Transaction state reloaded with snapshot from " + latestState.getTimestamp()));
           if (LOG.isDebugEnabled()) {
-            LOG.debug("Latest transaction snapshot: " + latestState.toString());
+            LOG.debug(prefixLog("Latest transaction snapshot: " + latestState.toString()));
           }
           lastRefresh = now;
         }
       } else {
-        LOG.info("No transaction state found.");
+        LOG.info(prefixLog("No transaction state found."));
       }
     }
   }
@@ -180,4 +181,14 @@
   public TransactionVisibilityState getLatestState() {
     return latestState;
   }
+
+  protected void setId(@Nullable String id) {
+    if (id != null) {
+      this.logPrefix = "[" + id + "] ";
+    }
+  }
+
+  private String prefixLog(String message) {
+    return logPrefix + message;
+  }
 }