HDFS-9659. EditLogTailerThread to Active Namenode RPC should timeout (Contributed by surendra singh lilhore)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8f2622b6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f2622b6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f2622b6 Branch: refs/heads/HDFS-7240 Commit: 8f2622b6a0603f92e8b5784879da28d3d5797fc1 Parents: e418bd1 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Mon Feb 1 14:10:55 2016 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Mon Feb 1 14:10:55 2016 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f2622b6/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 432e686..5a8b525 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -903,6 +903,9 @@ Trunk (Unreleased) HDFS-9575. Use byte array for internal block indices in a striped block. (jing9 via szetszwo) + HDFS-9659. EditLogTailerThread to Active Namenode RPC should timeout + (surendra singh lilhore via vinayakumarb) + Release 2.9.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f2622b6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java index 6e60dba..405bf4f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java @@ -450,8 +450,12 @@ public class EditLogTailer { currentNN = nnLookup.next(); try { + int rpcTimeout = conf.getInt( + DFSConfigKeys.DFS_HA_LOGROLL_RPC_TIMEOUT_KEY, + DFSConfigKeys.DFS_HA_LOGROLL_RPC_TIMEOUT_DEFAULT); NamenodeProtocolPB proxy = RPC.waitForProxy(NamenodeProtocolPB.class, - RPC.getProtocolVersion(NamenodeProtocolPB.class), currentNN.getIpcAddress(), conf); + RPC.getProtocolVersion(NamenodeProtocolPB.class), currentNN.getIpcAddress(), conf, + rpcTimeout, Long.MAX_VALUE); cachedActiveProxy = new NamenodeProtocolTranslatorPB(proxy); break; } catch (IOException e) {