[05/35] hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-07 Thread xyao 
MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a95a452
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a95a452
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a95a452

Branch: refs/heads/HDDS-4
Commit: 1a95a4524a8c6c7be601ce8b92640a6a76164a2c
Parents: 3726926
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:14:28 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a95a452/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 12fced9..1156c67 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a95a452/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf, 
renewer);
 verify(fs).addDelegationTokens(eq(renewer), eq(credentials));
   }
 
@@ -105,23 +105,23 @@ public class TestTokenCache {
 checkToken(creds, newerToken1);

[26/50] [abbrv] hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-04 Thread xkrogen 
MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a95a452
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a95a452
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a95a452

Branch: refs/heads/HDFS-12943
Commit: 1a95a4524a8c6c7be601ce8b92640a6a76164a2c
Parents: 3726926
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:14:28 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a95a452/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 12fced9..1156c67 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a95a452/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf, 
renewer);
 verify(fs).addDelegationTokens(eq(renewer), eq(credentials));
   }
 
@@ -105,23 +105,23 @@ public class TestTokenCache {
 checkToken(creds, newerToken1);

[50/50] [abbrv] hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread shv 
MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 
(cherry picked from commit 1a95a4524a8c6c7be601ce8b92640a6a76164a2c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58bcb90e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58bcb90e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58bcb90e

Branch: refs/heads/YARN-8200
Commit: 58bcb90e7039bd4cec116fe66f1b1428dd493372
Parents: 06632c0
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:45:24 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58bcb90e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 78f6c16..8cd407c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -24,6 +24,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/58bcb90e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf, 
renewer);
 verify(fs).addDelegationTokens(eq(renewer),

hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 56026c3a8 -> 26d140d62


MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 
(cherry picked from commit 1a95a4524a8c6c7be601ce8b92640a6a76164a2c)
(cherry picked from commit 58bcb90e7039bd4cec116fe66f1b1428dd493372)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26d140d6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26d140d6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26d140d6

Branch: refs/heads/branch-2.8
Commit: 26d140d62145ec4d1d6e224fe9efe1b1176c8fac
Parents: 56026c3
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:56:09 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/26d140d6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 78f6c16..8cd407c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -24,6 +24,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/26d140d6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs =

hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 b5f13f6dc -> e5f47dab7


MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 
(cherry picked from commit 1a95a4524a8c6c7be601ce8b92640a6a76164a2c)
(cherry picked from commit 58bcb90e7039bd4cec116fe66f1b1428dd493372)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5f47dab
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5f47dab
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5f47dab

Branch: refs/heads/branch-2.9
Commit: e5f47dab720e369987cc3a4baff1f8a341a60a35
Parents: b5f13f6
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:45:58 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5f47dab/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 78f6c16..8cd407c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -24,6 +24,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5f47dab/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs =

hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 06632c066 -> 58bcb90e7


MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 
(cherry picked from commit 1a95a4524a8c6c7be601ce8b92640a6a76164a2c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58bcb90e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58bcb90e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58bcb90e

Branch: refs/heads/branch-2
Commit: 58bcb90e7039bd4cec116fe66f1b1428dd493372
Parents: 06632c0
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:45:24 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58bcb90e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 78f6c16..8cd407c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -24,6 +24,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/58bcb90e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials,

hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 221db515a -> e6e2146ae


MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 
(cherry picked from commit 1a95a4524a8c6c7be601ce8b92640a6a76164a2c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e6e2146a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e6e2146a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e6e2146a

Branch: refs/heads/branch-3.0
Commit: e6e2146ae0acaade1c65110427e3c7aa5eadbc28
Parents: 221db51
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:35:18 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6e2146a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 12fced9..1156c67 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6e2146a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf, 
renewer);

hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 5fef28d0d -> 254933cf3


MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 
(cherry picked from commit 1a95a4524a8c6c7be601ce8b92640a6a76164a2c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/254933cf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/254933cf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/254933cf

Branch: refs/heads/branch-3.1
Commit: 254933cf310fddc0975217575f946c8edac77170
Parents: 5fef28d
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:15:18 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/254933cf/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 12fced9..1156c67 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/254933cf/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf, 
renewer);

hadoop git commit: MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

2018-05-02 Thread aajisaka 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 37269261d -> 1a95a4524


MAPREDUCE-7073. Optimize TokenCache#obtainTokensForNamenodesInternal

Signed-off-by: Akira Ajisaka 


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a95a452
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a95a452
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a95a452

Branch: refs/heads/trunk
Commit: 1a95a4524a8c6c7be601ce8b92640a6a76164a2c
Parents: 3726926
Author: Bibin A Chundatt 
Authored: Wed May 2 16:14:28 2018 +0900
Committer: Akira Ajisaka 
Committed: Wed May 2 16:14:28 2018 +0900

--
 .../hadoop/mapreduce/security/TokenCache.java | 14 +-
 .../hadoop/mapreduce/security/TestTokenCache.java | 18 +-
 2 files changed, 18 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a95a452/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 12fced9..1156c67 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -96,8 +97,9 @@ public class TokenCache {
 for(Path p: ps) {
   fsSet.add(p.getFileSystem(conf));
 }
+String masterPrincipal = Master.getMasterPrincipal(conf);
 for (FileSystem fs : fsSet) {
-  obtainTokensForNamenodesInternal(fs, credentials, conf);
+  obtainTokensForNamenodesInternal(fs, credentials, conf, masterPrincipal);
 }
   }
 
@@ -122,15 +124,17 @@ public class TokenCache {
* @param conf
* @throws IOException
*/
-  static void obtainTokensForNamenodesInternal(FileSystem fs, 
-  Credentials credentials, Configuration conf) throws IOException {
+  static void obtainTokensForNamenodesInternal(FileSystem fs,
+  Credentials credentials, Configuration conf, String renewer)
+  throws IOException {
 // RM skips renewing token with empty renewer
 String delegTokenRenewer = "";
 if (!isTokenRenewalExcluded(fs, conf)) {
-  delegTokenRenewer = Master.getMasterPrincipal(conf);
-  if (delegTokenRenewer == null || delegTokenRenewer.length() == 0) {
+  if (StringUtils.isEmpty(renewer)) {
 throw new IOException(
 "Can't get Master Kerberos principal for use as renewer");
+  } else {
+delegTokenRenewer = renewer;
   }
 }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a95a452/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 127f8ae..a44e533 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -56,8 +56,8 @@ public class TestTokenCache {
   @Test
   public void testObtainTokens() throws Exception {
 Credentials credentials = new Credentials();
-FileSystem fs = mock(FileSystem.class);  
-TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf);
+FileSystem fs = mock(FileSystem.class);
+TokenCache.obtainTokensForNamenodesInternal(fs, credentials, conf, 
renewer);
 verify(fs).addDelegationTokens(eq(renewer), eq(credentials));
   }
 
@@ -105,23