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 ae...@apache.org on 2017/06/09 18:15:55 UTC
[1/2] hadoop git commit: HDFS-11958. Ozone: Ensure KSM is initiated
using ProtobufRpcEngine. Contributed by Weiwei Yang.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 423c4bde7 -> 0a05da9a8
HDFS-11958. Ozone: Ensure KSM is initiated using ProtobufRpcEngine. Contributed by Weiwei Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/62a1fa1a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/62a1fa1a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/62a1fa1a
Branch: refs/heads/HDFS-7240
Commit: 62a1fa1af0efde794f54c08d1a6ae59b12aa57ee
Parents: 423c4bd
Author: Anu Engineer <ae...@apache.org>
Authored: Fri Jun 9 10:37:51 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Fri Jun 9 10:37:51 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/datanode/ObjectStoreHandler.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/62a1fa1a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ObjectStoreHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ObjectStoreHandler.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ObjectStoreHandler.java
index a5d11c9..0bcb058 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ObjectStoreHandler.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ObjectStoreHandler.java
@@ -114,6 +114,8 @@ public final class ObjectStoreHandler implements Closeable {
NetUtils.getDefaultSocketFactory(conf),
Client.getRpcTimeout(conf)));
+ RPC.setProtocolEngine(conf, KeySpaceManagerProtocolPB.class,
+ ProtobufRpcEngine.class);
long ksmVersion =
RPC.getProtocolVersion(KeySpaceManagerProtocolPB.class);
InetSocketAddress ksmAddress = OzoneClientUtils.getKsmAddress(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HDFS-11845. Ozone: Output error when DN
handshakes with SCM. Contributed by Weiwei Yang
Posted by ae...@apache.org.
HDFS-11845. Ozone: Output error when DN handshakes with SCM. Contributed by Weiwei Yang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0a05da9a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a05da9a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a05da9a
Branch: refs/heads/HDFS-7240
Commit: 0a05da9a8915f523ddb2acd7ae57e8368fd492da
Parents: 62a1fa1
Author: Anu Engineer <ae...@apache.org>
Authored: Fri Jun 9 10:44:07 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Fri Jun 9 10:44:07 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a05da9a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java
index d343254..03591a1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/scm/ScmConfigKeys.java
@@ -122,7 +122,7 @@ public final class ScmConfigKeys {
public static final String OZONE_SCM_HEARTBEAT_RPC_TIMEOUT =
"ozone.scm.heartbeat.rpc-timeout";
public static final long OZONE_SCM_HEARTBEAT_RPC_TIMEOUT_DEFAULT =
- 100;
+ 1000;
/**
* Defines how frequently we will log the missing of heartbeat to a specific
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org