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 br...@apache.org on 2018/10/30 06:03:14 UTC
[44/50] [abbrv] hadoop git commit: Revert "HADOOP-15864. Job
submitter / executor fail when SBN domain name can not resolved. Contributed
by He Xiaoqiao."
Revert "HADOOP-15864. Job submitter / executor fail when SBN domain name can not resolved. Contributed by He Xiaoqiao."
This reverts commit fb2b72e6fce019130e10964a644b94cddbab1c06.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f46e57a6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f46e57a6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f46e57a6
Branch: refs/heads/HDFS-13891
Commit: f46e57a60c56e039c1e3c6b6453a8e0f4f3907e1
Parents: 01815e6
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Sun Oct 28 17:04:59 2018 -0700
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Oct 30 11:31:17 2018 +0530
----------------------------------------------------------------------
.../apache/hadoop/security/SecurityUtil.java | 9 ++++----
.../namenode/ha/TestDelegationTokensWithHA.java | 23 --------------------
2 files changed, 4 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f46e57a6/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
index b573234..aa12b93 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
@@ -424,7 +424,7 @@ public final class SecurityUtil {
*/
public static void setTokenService(Token<?> token, InetSocketAddress addr) {
Text service = buildTokenService(addr);
- if (token != null && service != null) {
+ if (token != null) {
token.setService(service);
if (LOG.isDebugEnabled()) {
LOG.debug("Acquired token "+token); // Token#toString() prints service
@@ -444,10 +444,9 @@ public final class SecurityUtil {
String host = null;
if (useIpForTokenService) {
if (addr.isUnresolved()) { // host has no ip address
- LOG.warn("unable to resolve host name " + addr
- + ". Failure to construct a correct token service "
- + "name may result in operation failures");
- return null;
+ throw new IllegalArgumentException(
+ new UnknownHostException(addr.getHostName())
+ );
}
host = addr.getAddress().getHostAddress();
} else {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f46e57a6/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
index e78cee9..7076ec6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
@@ -332,29 +332,6 @@ public class TestDelegationTokensWithHA {
}
}
- @Test(timeout = 300000)
- public void testHAUtilClonesDTsDomainNameResolvedFail() throws Exception {
- final Token<DelegationTokenIdentifier> token =
- getDelegationToken(fs, "JobTracker");
-
- UserGroupInformation ugi = UserGroupInformation.createRemoteUser("test");
-
- URI haUri = new URI("hdfs://my-ha-uri/");
- token.setService(HAUtilClient.buildTokenServiceForLogicalUri(haUri,
- HdfsConstants.HDFS_URI_SCHEME));
- ugi.addToken(token);
-
- Collection<InetSocketAddress> nnAddrs = new HashSet<InetSocketAddress>();
- nnAddrs.add(new InetSocketAddress("domainname.doesnot.exist",
- nn0.getNameNodeAddress().getPort()));
- nnAddrs.add(new InetSocketAddress("localhost",
- nn1.getNameNodeAddress().getPort()));
- HAUtilClient.cloneDelegationTokenForLogicalUri(ugi, haUri, nnAddrs);
-
- Collection<Token<? extends TokenIdentifier>> tokens = ugi.getTokens();
- assertEquals(3, tokens.size());
- }
-
/**
* HDFS-3062: DistributedFileSystem.getCanonicalServiceName() throws an
* exception if the URI is a logical URI. This bug fails the combination of
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org