You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/11/17 06:21:34 UTC

hadoop git commit: HDFS-7394. Log at INFO level, not WARN level, when InvalidToken is seen in ShortCircuitCache (Keith Pak via Colin P. McCabe) (cherry picked from commit 26d3b7e6ae867596bbced0bfddde22d3c0d976bb)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 41275755c -> 5d3c130e8


HDFS-7394. Log at INFO level, not WARN level, when InvalidToken is seen in ShortCircuitCache (Keith Pak via Colin P. McCabe)
(cherry picked from commit 26d3b7e6ae867596bbced0bfddde22d3c0d976bb)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d3c130e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d3c130e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d3c130e

Branch: refs/heads/branch-2
Commit: 5d3c130e8f0526c9c3a24d5e83cc3fddb56cb95f
Parents: 4127575
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Sun Nov 16 21:20:53 2014 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Sun Nov 16 21:21:24 2014 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                      | 3 +++
 .../org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d3c130e/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e69c7a3..694be33 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -104,6 +104,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-7386. Replace check "port number < 1024" with shared isPrivilegedPort
     method. (Yongjun Zhang via cnauroth)
 
+    HDFS-7394. Log at INFO level, not WARN level, when InvalidToken is seen in
+    ShortCircuitCache (Keith Pak via Colin P. McCabe)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d3c130e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
index a4b852f..3edf9a9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
@@ -743,7 +743,7 @@ public class ShortCircuitCache implements Closeable {
       throw new RetriableException("interrupted");
     }
     if (info.getInvalidTokenException() != null) {
-      LOG.warn(this + ": could not get " + key + " due to InvalidToken " +
+      LOG.info(this + ": could not get " + key + " due to InvalidToken " +
             "exception.", info.getInvalidTokenException());
       return info;
     }
@@ -802,7 +802,7 @@ public class ShortCircuitCache implements Closeable {
         Waitable<ShortCircuitReplicaInfo> waitableInMap = replicaInfoMap.get(key);
         if (waitableInMap == newWaitable) replicaInfoMap.remove(key);
         if (info.getInvalidTokenException() != null) {
-          LOG.warn(this + ": could not load " + key + " due to InvalidToken " +
+          LOG.info(this + ": could not load " + key + " due to InvalidToken " +
               "exception.", info.getInvalidTokenException());
         } else {
           LOG.warn(this + ": failed to load " + key);