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 cl...@apache.org on 2019/03/28 17:39:59 UTC
[hadoop] branch branch-2 updated: HDFS-14391. Backport HDFS-9659 to
branch-2. Contributed by Chao Sun.
This is an automated email from the ASF dual-hosted git repository.
cliang pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 99e4129 HDFS-14391. Backport HDFS-9659 to branch-2. Contributed by Chao Sun.
99e4129 is described below
commit 99e41293eee8f1fe931290e141b73f4beb51c3c5
Author: Chen Liang <cl...@apache.org>
AuthorDate: Thu Mar 28 10:39:45 2019 -0700
HDFS-14391. Backport HDFS-9659 to branch-2. Contributed by Chao Sun.
---
.../org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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 73e43b2..b981c00 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
@@ -499,8 +499,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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org