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 sh...@apache.org on 2018/12/24 18:11:38 UTC
[36/45] hadoop git commit: HDFS-14116. [SBN read] Fix class cast
error in NNThroughputBenchmark with ObserverReadProxyProvider. Contributed by
Chao Sun.
HDFS-14116. [SBN read] Fix class cast error in NNThroughputBenchmark with ObserverReadProxyProvider. Contributed by Chao Sun.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3efc299
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3efc299
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3efc299
Branch: refs/heads/trunk
Commit: c3efc299fe8a23eff49441f938834fccea89969b
Parents: ef3e192
Author: Chao Sun <su...@apache.org>
Authored: Mon Dec 17 16:32:54 2018 -0800
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Mon Dec 24 09:34:01 2018 -0800
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hdfs/DFSTestUtil.java | 12 +++++-------
.../hdfs/server/namenode/NNThroughputBenchmark.java | 6 ++++--
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3efc299/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
index 97609fb..e3cab7a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
@@ -71,7 +71,6 @@ import java.util.Random;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
@@ -2022,18 +2021,17 @@ public class DFSTestUtil {
* Get the RefreshUserMappingsProtocol RPC proxy for the NN associated with
* this DFSClient object
*
- * @param nameNodeUri the URI of the NN to get a proxy for.
+ * @param nnAddr the address of the NN to get a proxy for.
*
* @return the RefreshUserMappingsProtocol RPC proxy associated with this
* DFSClient object
*/
@VisibleForTesting
public static RefreshUserMappingsProtocol getRefreshUserMappingsProtocolProxy(
- Configuration conf, URI nameNodeUri) throws IOException {
- final AtomicBoolean nnFallbackToSimpleAuth = new AtomicBoolean(false);
- return NameNodeProxies.createProxy(conf,
- nameNodeUri, RefreshUserMappingsProtocol.class,
- nnFallbackToSimpleAuth).getProxy();
+ Configuration conf, InetSocketAddress nnAddr) throws IOException {
+ return NameNodeProxies.createNonHAProxy(
+ conf, nnAddr, RefreshUserMappingsProtocol.class,
+ UserGroupInformation.getCurrentUser(), false).getProxy();
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3efc299/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
index a9c4578..654a8a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.server.namenode;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1519,10 +1520,11 @@ public class NNThroughputBenchmark implements Tool {
nameNodeProto = DFSTestUtil.getNamenodeProtocolProxy(config, nnUri,
UserGroupInformation.getCurrentUser());
clientProto = dfs.getClient().getNamenode();
+ InetSocketAddress nnAddr = DFSUtilClient.getNNAddress(nnUri);
dataNodeProto = new DatanodeProtocolClientSideTranslatorPB(
- DFSUtilClient.getNNAddress(nnUri), config);
+ nnAddr, config);
refreshUserMappingsProto =
- DFSTestUtil.getRefreshUserMappingsProtocolProxy(config, nnUri);
+ DFSTestUtil.getRefreshUserMappingsProtocolProxy(config, nnAddr);
getBlockPoolId(dfs);
}
// run each benchmark
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org