hadoop git commit: HADOOP-15223. Replace Collections.EMPTY* with empty* when available. Contributed by fang zhenyi.

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3 fe5fcc084 -> 692260754


HADOOP-15223. Replace Collections.EMPTY* with empty* when available. 
Contributed by fang zhenyi.


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

Branch: refs/heads/branch-3
Commit: 692260754c08029d3f58f5c9bc1787661677a131
Parents: fe5fcc0
Author: Akira Ajisaka 
Authored: Fri Feb 23 14:14:38 2018 +0900
Committer: Akira Ajisaka 
Committed: Fri Feb 23 14:14:38 2018 +0900

--
 .../org/apache/hadoop/crypto/key/KeyProvider.java |  6 ++
 .../lib/service/security/DummyGroupMapping.java   |  3 +--
 .../main/java/org/apache/hadoop/fs/s3a/Listing.java   |  2 +-
 .../java/org/apache/hadoop/fs/s3a/S3AFileSystem.java  |  2 +-
 .../apache/hadoop/tools/mapred/TestCopyCommitter.java |  2 +-
 .../hadoop/yarn/sls/scheduler/RMNodeWrapper.java  |  6 ++
 .../server/resourcemanager/DefaultAMSProcessor.java   |  4 ++--
 .../ProportionalCapacityPreemptionPolicy.java | 14 ++
 .../rmapp/attempt/RMAppAttemptImpl.java   |  2 +-
 .../server/resourcemanager/rmnode/RMNodeImpl.java |  2 +-
 .../resourcemanager/rmnode/RMNodeStatusEvent.java |  3 +--
 .../resourcemanager/TestResourceTrackerService.java   |  5 ++---
 ...ortionalCapacityPreemptionPolicyMockFramework.java |  2 +-
 13 files changed, 22 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java
index c1c371b..62cc381 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java
@@ -199,9 +199,8 @@ public abstract class KeyProvider {
   return cipher;
 }
 
-@SuppressWarnings("unchecked")
 public Map getAttributes() {
-  return (attributes == null) ? Collections.EMPTY_MAP : attributes;
+  return (attributes == null) ? Collections.emptyMap() : attributes;
 }
 
 /**
@@ -370,9 +369,8 @@ public abstract class KeyProvider {
   return description;
 }
 
-@SuppressWarnings("unchecked")
 public Map getAttributes() {
-  return (attributes == null) ? Collections.EMPTY_MAP : attributes;
+  return (attributes == null) ? Collections.emptyMap() : attributes;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java
 
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java
index 1676909..9ef786d 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/service/security/DummyGroupMapping.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.test.HadoopUsersConfTestHelper;
 public class DummyGroupMapping implements GroupMappingServiceProvider {
 
   @Override
-  @SuppressWarnings("unchecked")
   public List getGroups(String user) throws IOException {
 if (user.equals("root")) {
   return Arrays.asList("admin");
@@ -37,7 +36,7 @@ public class DummyGroupMapping implements 
GroupMappingServiceProvider {
   return Arrays.asList("nobody");
 } else {
   String[] groups = HadoopUsersConfTestHelper.getHadoopUserGroups(user);
-  return (groups != null) ? Arrays.asList(groups) : Collections.EMPTY_LIST;
+  return (groups != null) ? Arrays.asList(groups) : 
Collections.emptyList();
 }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/69226075/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java
--
diff --git 
a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java 
b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Listing.java
index 

hadoop git commit: HADOOP-15236. Fix typo in RequestHedgingProxyProvider and RequestHedgingRMFailoverProxyProvider

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3 5c6adb3dd -> fe5fcc084


HADOOP-15236. Fix typo in RequestHedgingProxyProvider and 
RequestHedgingRMFailoverProxyProvider

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


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

Branch: refs/heads/branch-3
Commit: fe5fcc08464eb688163204db4c153cc4fc35f4bc
Parents: 5c6adb3
Author: Gabor Bota 
Authored: Fri Feb 23 13:55:18 2018 +0900
Committer: Akira Ajisaka 
Committed: Fri Feb 23 14:02:30 2018 +0900

--
 .../hdfs/server/namenode/ha/RequestHedgingProxyProvider.java   | 2 +-
 .../hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe5fcc08/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
index b94e94d..8c8d129 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  * per-se. It constructs a wrapper proxy that sends the request to ALL
  * underlying proxies simultaneously. It assumes the in an HA setup, there will
  * be only one Active, and the active should respond faster than any configured
- * standbys. Once it receive a response from any one of the configred proxies,
+ * standbys. Once it receive a response from any one of the configured proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingProxyProvider extends

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fe5fcc08/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
index 4c16225..c1e9da1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
@@ -49,7 +49,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
  * underlying proxies simultaneously. Each proxy inside the wrapper proxy will
  * retry the corresponding target. It assumes the in an HA setup, there will be
  * only one Active, and the active should respond faster than any configured
- * standbys. Once it receives a response from any one of the configred proxies,
+ * standbys. Once it receives a response from any one of the configured 
proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingRMFailoverProxyProvider


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-15236. Fix typo in RequestHedgingProxyProvider and RequestHedgingRMFailoverProxyProvider

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7a6aa7bf9 -> 696e8e029


HADOOP-15236. Fix typo in RequestHedgingProxyProvider and 
RequestHedgingRMFailoverProxyProvider

Signed-off-by: Akira Ajisaka 
(cherry picked from commit c36b4aa31ce25fbe5fa173bce36da2950d74a475)
(cherry picked from commit b8942cb3bf4a458c78654bc166447806523409b5)


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

Branch: refs/heads/branch-2
Commit: 696e8e02991c2c65f05a7c39f6799a6e46d06751
Parents: 7a6aa7b
Author: Gabor Bota 
Authored: Fri Feb 23 13:55:18 2018 +0900
Committer: Akira Ajisaka 
Committed: Fri Feb 23 13:58:08 2018 +0900

--
 .../hdfs/server/namenode/ha/RequestHedgingProxyProvider.java   | 2 +-
 .../hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/696e8e02/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
index 86e92a8..010e9e5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * per-se. It constructs a wrapper proxy that sends the request to ALL
  * underlying proxies simultaneously. It assumes the in an HA setup, there will
  * be only one Active, and the active should respond faster than any configured
- * standbys. Once it recieve a response from any one of the configred proxies,
+ * standbys. Once it receive a response from any one of the configured proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingProxyProvider extends

http://git-wip-us.apache.org/repos/asf/hadoop/blob/696e8e02/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
index 4c16225..c1e9da1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
@@ -49,7 +49,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
  * underlying proxies simultaneously. Each proxy inside the wrapper proxy will
  * retry the corresponding target. It assumes the in an HA setup, there will be
  * only one Active, and the active should respond faster than any configured
- * standbys. Once it receives a response from any one of the configred proxies,
+ * standbys. Once it receives a response from any one of the configured 
proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingRMFailoverProxyProvider


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-15236. Fix typo in RequestHedgingProxyProvider and RequestHedgingRMFailoverProxyProvider

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 514794e1a -> c36b4aa31


HADOOP-15236. Fix typo in RequestHedgingProxyProvider and 
RequestHedgingRMFailoverProxyProvider

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/c36b4aa3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c36b4aa3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c36b4aa3

Branch: refs/heads/trunk
Commit: c36b4aa31ce25fbe5fa173bce36da2950d74a475
Parents: 514794e
Author: Gabor Bota 
Authored: Fri Feb 23 13:55:18 2018 +0900
Committer: Akira Ajisaka 
Committed: Fri Feb 23 13:55:18 2018 +0900

--
 .../hdfs/server/namenode/ha/RequestHedgingProxyProvider.java   | 2 +-
 .../hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c36b4aa3/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
index 08edfe2..010e9e5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * per-se. It constructs a wrapper proxy that sends the request to ALL
  * underlying proxies simultaneously. It assumes the in an HA setup, there will
  * be only one Active, and the active should respond faster than any configured
- * standbys. Once it receive a response from any one of the configred proxies,
+ * standbys. Once it receive a response from any one of the configured proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingProxyProvider extends

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c36b4aa3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
index 4c16225..c1e9da1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
@@ -49,7 +49,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
  * underlying proxies simultaneously. Each proxy inside the wrapper proxy will
  * retry the corresponding target. It assumes the in an HA setup, there will be
  * only one Active, and the active should respond faster than any configured
- * standbys. Once it receives a response from any one of the configred proxies,
+ * standbys. Once it receives a response from any one of the configured 
proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingRMFailoverProxyProvider


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-15236. Fix typo in RequestHedgingProxyProvider and RequestHedgingRMFailoverProxyProvider

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 7fac69ea4 -> b8942cb3b


HADOOP-15236. Fix typo in RequestHedgingProxyProvider and 
RequestHedgingRMFailoverProxyProvider

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


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

Branch: refs/heads/branch-3.1
Commit: b8942cb3bf4a458c78654bc166447806523409b5
Parents: 7fac69e
Author: Gabor Bota 
Authored: Fri Feb 23 13:55:18 2018 +0900
Committer: Akira Ajisaka 
Committed: Fri Feb 23 13:56:26 2018 +0900

--
 .../hdfs/server/namenode/ha/RequestHedgingProxyProvider.java   | 2 +-
 .../hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8942cb3/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
index 08edfe2..010e9e5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/RequestHedgingProxyProvider.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * per-se. It constructs a wrapper proxy that sends the request to ALL
  * underlying proxies simultaneously. It assumes the in an HA setup, there will
  * be only one Active, and the active should respond faster than any configured
- * standbys. Once it receive a response from any one of the configred proxies,
+ * standbys. Once it receive a response from any one of the configured proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingProxyProvider extends

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8942cb3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
index 4c16225..c1e9da1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RequestHedgingRMFailoverProxyProvider.java
@@ -49,7 +49,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
  * underlying proxies simultaneously. Each proxy inside the wrapper proxy will
  * retry the corresponding target. It assumes the in an HA setup, there will be
  * only one Active, and the active should respond faster than any configured
- * standbys. Once it receives a response from any one of the configred proxies,
+ * standbys. Once it receives a response from any one of the configured 
proxies,
  * outstanding requests to other proxies are immediately cancelled.
  */
 public class RequestHedgingRMFailoverProxyProvider


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HDFS-13136. Avoid taking FSN lock while doing group member lookup for FSD permission check. Contributed by Xiaoyu Yao.

[xyao]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 c2bbe22c5 -> ec1b445c6


HDFS-13136. Avoid taking FSN lock while doing group member lookup for FSD 
permission check. Contributed by Xiaoyu Yao.

(cherry picked from commit e978e1d9064fc794ea83217d0af2315d4167211e)


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

Branch: refs/heads/branch-3.0
Commit: ec1b445c62b84e028a6c7db96848d106cf3c1165
Parents: c2bbe22
Author: Xiaoyu Yao 
Authored: Thu Feb 15 00:02:05 2018 -0800
Committer: Xiaoyu Yao 
Committed: Thu Feb 22 20:18:02 2018 -0800

--
 .../server/namenode/EncryptionZoneManager.java  |   3 +-
 .../hadoop/hdfs/server/namenode/FSDirAclOp.java |  28 +--
 .../hdfs/server/namenode/FSDirAppendOp.java |   2 +-
 .../hdfs/server/namenode/FSDirAttrOp.java   |  54 ++---
 .../hdfs/server/namenode/FSDirConcatOp.java |   5 +-
 .../hdfs/server/namenode/FSDirDeleteOp.java |   8 +-
 .../server/namenode/FSDirEncryptionZoneOp.java  |  12 +-
 .../hdfs/server/namenode/FSDirMkdirOp.java  |   3 +-
 .../hdfs/server/namenode/FSDirRenameOp.java |  11 +-
 .../hdfs/server/namenode/FSDirSnapshotOp.java   |  33 +--
 .../server/namenode/FSDirStatAndListingOp.java  |  45 ++---
 .../hdfs/server/namenode/FSDirWriteFileOp.java  |   4 +-
 .../hdfs/server/namenode/FSDirXAttrOp.java  |  35 ++--
 .../hdfs/server/namenode/FSNamesystem.java  | 201 ---
 .../hdfs/server/namenode/NameNodeAdapter.java   |   8 +-
 .../hdfs/server/namenode/TestAuditLogger.java   |   3 +-
 .../namenode/TestAuditLoggerWithCommands.java   |   7 +-
 17 files changed, 261 insertions(+), 201 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec1b445c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
index 3fcf797..176ae1d 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
@@ -154,9 +154,10 @@ public class EncryptionZoneManager {
   public void pauseForTestingAfterNthCheckpoint(final String zone,
   final int count) throws IOException {
 INodesInPath iip;
+final FSPermissionChecker pc = dir.getPermissionChecker();
 dir.readLock();
 try {
-  iip = dir.resolvePath(dir.getPermissionChecker(), zone, DirOp.READ);
+  iip = dir.resolvePath(pc, zone, DirOp.READ);
 } finally {
   dir.readUnlock();
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec1b445c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
index cc51430..7b3471d 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
@@ -36,11 +36,10 @@ import java.util.List;
 
 class FSDirAclOp {
   static FileStatus modifyAclEntries(
-  FSDirectory fsd, final String srcArg, List aclSpec)
-  throws IOException {
+  FSDirectory fsd, FSPermissionChecker pc, final String srcArg,
+  List aclSpec) throws IOException {
 String src = srcArg;
 checkAclsConfigFlag(fsd);
-FSPermissionChecker pc = fsd.getPermissionChecker();
 INodesInPath iip;
 fsd.writeLock();
 try {
@@ -61,11 +60,10 @@ class FSDirAclOp {
   }
 
   static FileStatus removeAclEntries(
-  FSDirectory fsd, final String srcArg, List aclSpec)
-  throws IOException {
+  FSDirectory fsd, FSPermissionChecker pc, final String srcArg,
+  List aclSpec) throws IOException {
 String src = srcArg;
 checkAclsConfigFlag(fsd);
-FSPermissionChecker pc = fsd.getPermissionChecker();
 INodesInPath iip;
 fsd.writeLock();
 try {
@@ -85,11 +83,10 @@ class FSDirAclOp {
 return fsd.getAuditFileInfo(iip);
   }
 
-  static FileStatus removeDefaultAcl(FSDirectory fsd, 

hadoop git commit: YARN-6858. Attribute Manager to store and provide node attributes in RM. Contributed by Naganarasimha G R.

[sunilg]

Repository: hadoop
Updated Branches:
  refs/heads/YARN-3409 bd008e703 -> 0c3bf98c2


YARN-6858. Attribute Manager to store and provide node attributes in RM. 
Contributed by Naganarasimha G R.


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

Branch: refs/heads/YARN-3409
Commit: 0c3bf98c24387d94e27e1a054880e39c482f9c9d
Parents: bd008e7
Author: Sunil G 
Authored: Fri Feb 23 08:01:58 2018 +0530
Committer: Sunil G 
Committed: Fri Feb 23 08:01:58 2018 +0530

--
 .../records/impl/pb/NodeAttributePBImpl.java|  15 +-
 .../hadoop/yarn/nodelabels/AbstractLabel.java   |  71 +++
 .../AttributeExpressionOperation.java   |  26 +
 .../hadoop/yarn/nodelabels/AttributeValue.java  |  53 ++
 .../nodelabels/CommonNodeLabelsManager.java |  24 +-
 .../yarn/nodelabels/NodeAttributesManager.java  |  99 
 .../hadoop/yarn/nodelabels/NodeLabelUtil.java   |  97 
 .../hadoop/yarn/nodelabels/RMNodeAttribute.java | 104 
 .../hadoop/yarn/nodelabels/RMNodeLabel.java | 109 ++--
 .../yarn/nodelabels/StringAttributeValue.java   |  61 +++
 .../nodemanager/NodeStatusUpdaterImpl.java  |  16 +-
 .../resourcemanager/RMActiveServiceContext.java |  14 +
 .../yarn/server/resourcemanager/RMContext.java  |   8 +-
 .../server/resourcemanager/RMContextImpl.java   |  16 +-
 .../server/resourcemanager/ResourceManager.java |  48 +-
 .../nodelabels/NodeAttributesManagerImpl.java   | 527 +++
 .../nodelabels/NodeAttributesStoreEvent.java|  51 ++
 .../NodeAttributesStoreEventType.java   |  26 +
 18 files changed, 1241 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c3bf98c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/NodeAttributePBImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/NodeAttributePBImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/NodeAttributePBImpl.java
index 7810939..12a0ecc 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/NodeAttributePBImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/NodeAttributePBImpl.java
@@ -120,7 +120,13 @@ public class NodeAttributePBImpl extends NodeAttribute {
 
   @Override
   public int hashCode() {
-return getProto().hashCode();
+final int prime = 31;
+int result = 1;
+result = prime * result + ((getAttributePrefix() == null) ? 0
+: getAttributePrefix().hashCode());
+result = prime * result
++ ((getAttributeName() == null) ? 0 : getAttributeName().hashCode());
+return result;
   }
 
   @Override
@@ -133,13 +139,10 @@ public class NodeAttributePBImpl extends NodeAttribute {
 }
 if (obj instanceof NodeAttribute) {
   NodeAttribute other = (NodeAttribute) obj;
-  if (!compare(getAttributeName(), other.getAttributeName())) {
-return false;
-  }
-  if (!compare(getAttributeValue(), other.getAttributeValue())) {
+  if (!compare(getAttributePrefix(), other.getAttributePrefix())) {
 return false;
   }
-  if (!compare(getAttributeType(), other.getAttributeType())) {
+  if (!compare(getAttributeName(), other.getAttributeName())) {
 return false;
   }
   return true;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c3bf98c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/AbstractLabel.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/AbstractLabel.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/AbstractLabel.java
new file mode 100644
index 000..6a44574
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/AbstractLabel.java
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file 

hadoop git commit: YARN-7934. [GQ] Refactor preemption calculators to allow overriding for Federation Global Algos. (Contributed by curino)

[curino]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 95904f6b3 -> 514794e1a


YARN-7934. [GQ] Refactor preemption calculators to allow overriding for 
Federation Global Algos. (Contributed by curino)


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

Branch: refs/heads/trunk
Commit: 514794e1a5a39ca61de3981d53a05547ae17f5e4
Parents: 95904f6
Author: Carlo Curino 
Authored: Thu Feb 22 18:12:12 2018 -0800
Committer: Carlo Curino 
Committed: Thu Feb 22 18:12:12 2018 -0800

--
 .../AbstractPreemptableResourceCalculator.java  |  38 +--
 .../capacity/AbstractPreemptionEntity.java  |   4 +
 .../CapacitySchedulerPreemptionContext.java |   6 +-
 .../capacity/PreemptableResourceCalculator.java |  21 ++--
 .../monitor/capacity/TempQueuePerPartition.java | 106 +++
 .../webapp/dao/ResourceInfo.java|   5 +-
 6 files changed, 139 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/514794e1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/AbstractPreemptableResourceCalculator.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/AbstractPreemptableResourceCalculator.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/AbstractPreemptableResourceCalculator.java
index 5196831..2589970 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/AbstractPreemptableResourceCalculator.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/AbstractPreemptableResourceCalculator.java
@@ -18,6 +18,12 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.PriorityQueue;
+
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.api.records.ResourceInformation;
 import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.policy.PriorityUtilizationQueueOrderingPolicy;
@@ -26,12 +32,6 @@ import 
org.apache.hadoop.yarn.util.resource.ResourceCalculator;
 import org.apache.hadoop.yarn.util.resource.ResourceUtils;
 import org.apache.hadoop.yarn.util.resource.Resources;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.PriorityQueue;
-
 /**
  * Calculate how much resources need to be preempted for each queue,
  * will be used by {@link PreemptionCandidatesSelector}.
@@ -126,11 +126,18 @@ public class AbstractPreemptableResourceCalculator {
   TempQueuePerPartition q = i.next();
   Resource used = q.getUsed();
 
+  Resource initIdealAssigned;
   if (Resources.greaterThan(rc, totGuarant, used, q.getGuaranteed())) {
-q.idealAssigned = Resources.add(q.getGuaranteed(), q.untouchableExtra);
+initIdealAssigned =
+Resources.add(q.getGuaranteed(), q.untouchableExtra);
   } else {
-q.idealAssigned = Resources.clone(used);
+initIdealAssigned = Resources.clone(used);
   }
+
+  // perform initial assignment
+  initIdealAssignment(totGuarant, q, initIdealAssigned);
+
+
   Resources.subtractFrom(unassigned, q.idealAssigned);
   // If idealAssigned < (allocated + used + pending), q needs more
   // resources, so
@@ -188,6 +195,21 @@ public class AbstractPreemptableResourceCalculator {
 }
   }
 
+
+  /**
+   * This method is visible to allow sub-classes to override the initialization
+   * behavior.
+   *
+   * @param totGuarant total resources (useful for {@code ResourceCalculator}
+   *  operations)
+   * @param q the {@code TempQueuePerPartition} being initialized
+   * @param initIdealAssigned the proposed initialization value.
+   */
+  protected void initIdealAssignment(Resource totGuarant,
+  TempQueuePerPartition q, Resource initIdealAssigned) {
+q.idealAssigned = initIdealAssigned;
+  }
+
   /**
* Computes a normalizedGuaranteed capacity 

hadoop git commit: YARN-7942. Add check for JAAS configuration for Yarn Service. Contributed by Billie Rinaldi (Cherry-picked from commit 95904f6b3ccd1d167088086472eabdd85b2d148d)

[eyang]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 13922cc32 -> 7fac69ea4


YARN-7942. Add check for JAAS configuration for Yarn Service.
   Contributed by Billie Rinaldi
(Cherry-picked from commit 95904f6b3ccd1d167088086472eabdd85b2d148d)


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

Branch: refs/heads/branch-3.1
Commit: 7fac69ea48b4ec155ba7c103550ce090c2b5fb90
Parents: 13922cc
Author: Eric Yang 
Authored: Thu Feb 22 16:12:40 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:19:26 2018 -0500

--
 .../client/impl/zk/RegistrySecurity.java| 44 +++-
 1 file changed, 33 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fac69ea/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
index bb829d8..5c6c983 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
@@ -736,8 +736,10 @@ public class RegistrySecurity extends AbstractService {
* Apply the security environment to this curator instance. This
* may include setting up the ZK system properties for SASL
* @param builder curator builder
+   * @throws IOException if jaas configuration can't be generated or found
*/
-  public void applySecurityEnvironment(CuratorFrameworkFactory.Builder 
builder) {
+  public void applySecurityEnvironment(CuratorFrameworkFactory.Builder
+  builder) throws IOException {
 
 if (isSecureRegistry()) {
   switch (access) {
@@ -752,16 +754,36 @@ public class RegistrySecurity extends AbstractService {
   break;
 
 case sasl:
-  JaasConfiguration jconf =
-  new JaasConfiguration(jaasClientEntry, principal, keytab);
-  javax.security.auth.login.Configuration.setConfiguration(jconf);
-  setSystemPropertyIfUnset(ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY,
-  "true");
-  setSystemPropertyIfUnset(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY,
-  jaasClientEntry);
-  LOG.info(
-  "Enabling ZK sasl client: jaasClientEntry = " + jaasClientEntry
-  + ", principal = " + principal + ", keytab = " + keytab);
+  String existingJaasConf = System.getProperty(
+  "java.security.auth.login.config");
+  if (existingJaasConf == null || existingJaasConf.isEmpty()) {
+if (principal == null || keytab == null) {
+  throw new IOException("SASL is configured for registry, " +
+  "but neither keytab/principal nor java.security.auth.login" +
+  ".config system property are specified");
+}
+// in this case, keytab and principal are specified and no jaas
+// config is specified, so we will create one
+LOG.info(
+"Enabling ZK sasl client: jaasClientEntry = " + jaasClientEntry
++ ", principal = " + principal + ", keytab = " + keytab);
+JaasConfiguration jconf =
+new JaasConfiguration(jaasClientEntry, principal, keytab);
+javax.security.auth.login.Configuration.setConfiguration(jconf);
+
setSystemPropertyIfUnset(ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY,
+"true");
+
setSystemPropertyIfUnset(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY,
+jaasClientEntry);
+  } else {
+// in this case, jaas config is specified so we will not change it
+LOG.info("Using existing ZK sasl configuration: " +
+"jaasClientEntry = " + System.getProperty(
+ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY, "Client") +
+", sasl client = " + System.getProperty(
+ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY,
+ZooKeeperSaslClient.ENABLE_CLIENT_SASL_DEFAULT) +
+", jaas = " + existingJaasConf);
+  }
   break;
 
 default:

hadoop git commit: YARN-7942. Add check for JAAS configuration for Yarn Service. Contributed by Billie Rinaldi

[eyang]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 190969006 -> 95904f6b3


YARN-7942. Add check for JAAS configuration for Yarn Service.
   Contributed by Billie Rinaldi


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

Branch: refs/heads/trunk
Commit: 95904f6b3ccd1d167088086472eabdd85b2d148d
Parents: 1909690
Author: Eric Yang 
Authored: Thu Feb 22 16:12:40 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:12:40 2018 -0500

--
 .../client/impl/zk/RegistrySecurity.java| 44 +++-
 1 file changed, 33 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/95904f6b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
index bb829d8..5c6c983 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
@@ -736,8 +736,10 @@ public class RegistrySecurity extends AbstractService {
* Apply the security environment to this curator instance. This
* may include setting up the ZK system properties for SASL
* @param builder curator builder
+   * @throws IOException if jaas configuration can't be generated or found
*/
-  public void applySecurityEnvironment(CuratorFrameworkFactory.Builder 
builder) {
+  public void applySecurityEnvironment(CuratorFrameworkFactory.Builder
+  builder) throws IOException {
 
 if (isSecureRegistry()) {
   switch (access) {
@@ -752,16 +754,36 @@ public class RegistrySecurity extends AbstractService {
   break;
 
 case sasl:
-  JaasConfiguration jconf =
-  new JaasConfiguration(jaasClientEntry, principal, keytab);
-  javax.security.auth.login.Configuration.setConfiguration(jconf);
-  setSystemPropertyIfUnset(ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY,
-  "true");
-  setSystemPropertyIfUnset(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY,
-  jaasClientEntry);
-  LOG.info(
-  "Enabling ZK sasl client: jaasClientEntry = " + jaasClientEntry
-  + ", principal = " + principal + ", keytab = " + keytab);
+  String existingJaasConf = System.getProperty(
+  "java.security.auth.login.config");
+  if (existingJaasConf == null || existingJaasConf.isEmpty()) {
+if (principal == null || keytab == null) {
+  throw new IOException("SASL is configured for registry, " +
+  "but neither keytab/principal nor java.security.auth.login" +
+  ".config system property are specified");
+}
+// in this case, keytab and principal are specified and no jaas
+// config is specified, so we will create one
+LOG.info(
+"Enabling ZK sasl client: jaasClientEntry = " + jaasClientEntry
++ ", principal = " + principal + ", keytab = " + keytab);
+JaasConfiguration jconf =
+new JaasConfiguration(jaasClientEntry, principal, keytab);
+javax.security.auth.login.Configuration.setConfiguration(jconf);
+
setSystemPropertyIfUnset(ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY,
+"true");
+
setSystemPropertyIfUnset(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY,
+jaasClientEntry);
+  } else {
+// in this case, jaas config is specified so we will not change it
+LOG.info("Using existing ZK sasl configuration: " +
+"jaasClientEntry = " + System.getProperty(
+ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY, "Client") +
+", sasl client = " + System.getProperty(
+ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY,
+ZooKeeperSaslClient.ENABLE_CLIENT_SASL_DEFAULT) +
+", jaas = " + existingJaasConf);
+  }
   break;
 
 default:


-
To unsubscribe, e-mail: 

hadoop git commit: YARN-7836. Added error check for updating service components. (Contributed by Gour Saha) (Cherry-picked from commit 190969006d4a7f9ef86d67bba472f7dc5642668a)

[eyang]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 bfbd43f2f -> 13922cc32


YARN-7836.  Added error check for updating service components.
(Contributed by Gour Saha)
(Cherry-picked from commit 190969006d4a7f9ef86d67bba472f7dc5642668a)


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

Branch: refs/heads/branch-3.1
Commit: 13922cc32d7fabf819592af271ad67e38aecf98d
Parents: bfbd43f
Author: Eric Yang 
Authored: Thu Feb 22 16:08:30 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:11:22 2018 -0500

--
 .../hadoop/yarn/service/webapp/ApiServer.java   | 23 +--
 .../hadoop/yarn/service/TestApiServer.java  | 69 
 2 files changed, 75 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/13922cc3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index e58938e..1528596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -280,14 +280,25 @@ public class ApiServer {
   @PathParam(COMPONENT_NAME) String componentName, Component component) {
 
 try {
-  UserGroupInformation ugi = getProxyUser(request);
+  if (component == null) {
+throw new YarnException("No component data provided");
+  }
+  if (component.getName() != null
+  && !component.getName().equals(componentName)) {
+String msg = "Component name in the request object ("
++ component.getName() + ") does not match that in the URI path ("
++ componentName + ")";
+throw new YarnException(msg);
+  }
+  if (component.getNumberOfContainers() == null) {
+throw new YarnException("No container count provided");
+  }
   if (component.getNumberOfContainers() < 0) {
-String message =
-"Service = " + appName + ", Component = " + component.getName()
-+ ": Invalid number of containers specified " + component
-.getNumberOfContainers();
+String message = "Invalid number of containers specified "
++ component.getNumberOfContainers();
 throw new YarnException(message);
   }
+  UserGroupInformation ugi = getProxyUser(request);
   Map original = ugi
   .doAs(new PrivilegedExceptionAction>() {
 @Override
@@ -296,7 +307,7 @@ public class ApiServer {
   sc.init(YARN_CONFIG);
   sc.start();
   Map original = sc.flexByRestService(appName,
-  Collections.singletonMap(component.getName(),
+  Collections.singletonMap(componentName,
   component.getNumberOfContainers()));
   sc.close();
   return original;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/13922cc3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
index 52057db..4629d28 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
@@ -17,6 +17,16 @@
 
 package org.apache.hadoop.yarn.service;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;

hadoop git commit: YARN-7836. Added error check for updating service components. (Contributed by Gour Saha)

[eyang]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 84a1321f6 -> 190969006


YARN-7836.  Added error check for updating service components.
(Contributed by Gour Saha)


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

Branch: refs/heads/trunk
Commit: 190969006d4a7f9ef86d67bba472f7dc5642668a
Parents: 84a1321
Author: Eric Yang 
Authored: Thu Feb 22 16:08:30 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:08:30 2018 -0500

--
 .../hadoop/yarn/service/webapp/ApiServer.java   | 23 +--
 .../hadoop/yarn/service/TestApiServer.java  | 69 
 2 files changed, 75 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index e58938e..1528596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -280,14 +280,25 @@ public class ApiServer {
   @PathParam(COMPONENT_NAME) String componentName, Component component) {
 
 try {
-  UserGroupInformation ugi = getProxyUser(request);
+  if (component == null) {
+throw new YarnException("No component data provided");
+  }
+  if (component.getName() != null
+  && !component.getName().equals(componentName)) {
+String msg = "Component name in the request object ("
++ component.getName() + ") does not match that in the URI path ("
++ componentName + ")";
+throw new YarnException(msg);
+  }
+  if (component.getNumberOfContainers() == null) {
+throw new YarnException("No container count provided");
+  }
   if (component.getNumberOfContainers() < 0) {
-String message =
-"Service = " + appName + ", Component = " + component.getName()
-+ ": Invalid number of containers specified " + component
-.getNumberOfContainers();
+String message = "Invalid number of containers specified "
++ component.getNumberOfContainers();
 throw new YarnException(message);
   }
+  UserGroupInformation ugi = getProxyUser(request);
   Map original = ugi
   .doAs(new PrivilegedExceptionAction>() {
 @Override
@@ -296,7 +307,7 @@ public class ApiServer {
   sc.init(YARN_CONFIG);
   sc.start();
   Map original = sc.flexByRestService(appName,
-  Collections.singletonMap(component.getName(),
+  Collections.singletonMap(componentName,
   component.getNumberOfContainers()));
   sc.close();
   return original;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
index 52057db..4629d28 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
@@ -17,6 +17,16 @@
 
 package org.apache.hadoop.yarn.service;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import 

hadoop git commit: HDFS-13136. Avoid taking FSN lock while doing group member lookup for FSD permission check. Contributed by Xiaoyu Yao.

[xyao]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 3132709b4 -> 84a1321f6


HDFS-13136. Avoid taking FSN lock while doing group member lookup for FSD 
permission check. Contributed by Xiaoyu Yao.


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

Branch: refs/heads/trunk
Commit: 84a1321f6aa0af6895564a7c47f8f264656f0294
Parents: 3132709
Author: Xiaoyu Yao 
Authored: Thu Feb 15 00:02:05 2018 -0800
Committer: Xiaoyu Yao 
Committed: Thu Feb 22 11:32:32 2018 -0800

--
 .../server/namenode/EncryptionZoneManager.java  |   3 +-
 .../hadoop/hdfs/server/namenode/FSDirAclOp.java |  28 ++-
 .../hdfs/server/namenode/FSDirAttrOp.java   |  54 +++---
 .../hdfs/server/namenode/FSDirConcatOp.java |   5 +-
 .../hdfs/server/namenode/FSDirDeleteOp.java |   8 +-
 .../server/namenode/FSDirEncryptionZoneOp.java  |  12 +-
 .../hdfs/server/namenode/FSDirMkdirOp.java  |   3 +-
 .../hdfs/server/namenode/FSDirRenameOp.java |  11 +-
 .../hdfs/server/namenode/FSDirSnapshotOp.java   |  38 ++--
 .../server/namenode/FSDirStatAndListingOp.java  |  35 ++--
 .../hdfs/server/namenode/FSDirXAttrOp.java  |  35 ++--
 .../hdfs/server/namenode/FSNamesystem.java  | 190 ---
 .../hdfs/server/namenode/NameNodeAdapter.java   |   5 +-
 .../hdfs/server/namenode/TestAuditLogger.java   |   3 +-
 .../namenode/TestAuditLoggerWithCommands.java   |   4 +-
 15 files changed, 243 insertions(+), 191 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/84a1321f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
index 3fcf797..176ae1d 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java
@@ -154,9 +154,10 @@ public class EncryptionZoneManager {
   public void pauseForTestingAfterNthCheckpoint(final String zone,
   final int count) throws IOException {
 INodesInPath iip;
+final FSPermissionChecker pc = dir.getPermissionChecker();
 dir.readLock();
 try {
-  iip = dir.resolvePath(dir.getPermissionChecker(), zone, DirOp.READ);
+  iip = dir.resolvePath(pc, zone, DirOp.READ);
 } finally {
   dir.readUnlock();
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/84a1321f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
index cc51430..7b3471d 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java
@@ -36,11 +36,10 @@ import java.util.List;
 
 class FSDirAclOp {
   static FileStatus modifyAclEntries(
-  FSDirectory fsd, final String srcArg, List aclSpec)
-  throws IOException {
+  FSDirectory fsd, FSPermissionChecker pc, final String srcArg,
+  List aclSpec) throws IOException {
 String src = srcArg;
 checkAclsConfigFlag(fsd);
-FSPermissionChecker pc = fsd.getPermissionChecker();
 INodesInPath iip;
 fsd.writeLock();
 try {
@@ -61,11 +60,10 @@ class FSDirAclOp {
   }
 
   static FileStatus removeAclEntries(
-  FSDirectory fsd, final String srcArg, List aclSpec)
-  throws IOException {
+  FSDirectory fsd, FSPermissionChecker pc, final String srcArg,
+  List aclSpec) throws IOException {
 String src = srcArg;
 checkAclsConfigFlag(fsd);
-FSPermissionChecker pc = fsd.getPermissionChecker();
 INodesInPath iip;
 fsd.writeLock();
 try {
@@ -85,11 +83,10 @@ class FSDirAclOp {
 return fsd.getAuditFileInfo(iip);
   }
 
-  static FileStatus removeDefaultAcl(FSDirectory fsd, final String srcArg)
-  throws IOException {
+  static FileStatus removeDefaultAcl(FSDirectory fsd, FSPermissionChecker pc,
+  final String srcArg) throws IOException {
 String src = 

hadoop git commit: YARN-7945. Java Doc error in UnmanagedAMPoolManager for branch-2. Contributed by Botong Huang

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 b32cc32ee -> 76d4d5c75


YARN-7945. Java Doc error in UnmanagedAMPoolManager for branch-2. Contributed 
by Botong Huang

(cherry picked from commit 7a6aa7bf99d667e277ef24eba0ca1bde648aa01e)


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

Branch: refs/heads/branch-2.9
Commit: 76d4d5c75992233bbb909ad488e62ad80e3a4b0c
Parents: b32cc32
Author: Jason Lowe 
Authored: Thu Feb 22 10:45:16 2018 -0600
Committer: Jason Lowe 
Committed: Thu Feb 22 11:01:27 2018 -0600

--
 .../apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/76d4d5c7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
index 0c01217..c62de92 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
@@ -148,7 +148,7 @@ public class UnmanagedAMPoolManager extends AbstractService 
{
* @param appNameSuffix application name suffix for the UAM
* @param keepContainersAcrossApplicationAttempts keep container flag for UAM
*  recovery.
-   * @see ApplicationSubmissionContext
+   * @see org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext
*  #setKeepContainersAcrossApplicationAttempts(boolean)
* @return uamId for the UAM
* @throws YarnException if registerApplicationMaster fails
@@ -201,7 +201,7 @@ public class UnmanagedAMPoolManager extends AbstractService 
{
* @param appNameSuffix application name suffix for the UAM
* @param keepContainersAcrossApplicationAttempts keep container flag for UAM
*  recovery.
-   * @see ApplicationSubmissionContext
+   * @see org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext
*  #setKeepContainersAcrossApplicationAttempts(boolean)
* @return UAM token
* @throws YarnException if fails


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-7945. Java Doc error in UnmanagedAMPoolManager for branch-2. Contributed by Botong Huang

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7307a89ec -> 7a6aa7bf9


YARN-7945. Java Doc error in UnmanagedAMPoolManager for branch-2. Contributed 
by Botong Huang


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

Branch: refs/heads/branch-2
Commit: 7a6aa7bf99d667e277ef24eba0ca1bde648aa01e
Parents: 7307a89
Author: Jason Lowe 
Authored: Thu Feb 22 10:45:16 2018 -0600
Committer: Jason Lowe 
Committed: Thu Feb 22 10:45:16 2018 -0600

--
 .../apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a6aa7bf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
index 0c01217..c62de92 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/uam/UnmanagedAMPoolManager.java
@@ -148,7 +148,7 @@ public class UnmanagedAMPoolManager extends AbstractService 
{
* @param appNameSuffix application name suffix for the UAM
* @param keepContainersAcrossApplicationAttempts keep container flag for UAM
*  recovery.
-   * @see ApplicationSubmissionContext
+   * @see org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext
*  #setKeepContainersAcrossApplicationAttempts(boolean)
* @return uamId for the UAM
* @throws YarnException if registerApplicationMaster fails
@@ -201,7 +201,7 @@ public class UnmanagedAMPoolManager extends AbstractService 
{
* @param appNameSuffix application name suffix for the UAM
* @param keepContainersAcrossApplicationAttempts keep container flag for UAM
*  recovery.
-   * @see ApplicationSubmissionContext
+   * @see org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext
*  #setKeepContainersAcrossApplicationAttempts(boolean)
* @return UAM token
* @throws YarnException if fails


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[3/3] hadoop git commit: HADOOP-14903. Add json-smart explicitly to pom.xml. Contributed by Brahma Reddy Battula and Ray Chiang

[brahma]

HADOOP-14903. Add json-smart explicitly to pom.xml. Contributed by Brahma Reddy 
Battula and Ray Chiang

(cherry picked from commit 7307a89ec14d6e9812486f8d78ff4e8f4f597c31)


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

Branch: refs/heads/branch-2.8
Commit: 5ed037650916261a05831df4479374827cbd2ead
Parents: 4c4a2fb
Author: Brahma Reddy Battula 
Authored: Thu Feb 22 18:52:48 2018 +0530
Committer: Brahma Reddy Battula 
Committed: Thu Feb 22 18:54:29 2018 +0530

--
 hadoop-project/pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ed03765/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index c377870..c17f67d 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1009,6 +1009,15 @@
   
 
   
+  
+  
+net.minidev
+json-smart
+1.3.1
+  
 
 
   


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[2/3] hadoop git commit: HADOOP-14903. Add json-smart explicitly to pom.xml. Contributed by Brahma Reddy Battula and Ray Chiang

[brahma]

HADOOP-14903. Add json-smart explicitly to pom.xml. Contributed by Brahma Reddy 
Battula and Ray Chiang

(cherry picked from commit 7307a89ec14d6e9812486f8d78ff4e8f4f597c31)


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

Branch: refs/heads/branch-2.9
Commit: b32cc32ee2a7ed3dc26e42917ef60eaa2abc4a18
Parents: ed17197
Author: Brahma Reddy Battula 
Authored: Thu Feb 22 18:52:48 2018 +0530
Committer: Brahma Reddy Battula 
Committed: Thu Feb 22 18:53:29 2018 +0530

--
 hadoop-project/pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b32cc32e/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ba54c28..6441dc9 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1148,6 +1148,15 @@
   
 
   
+  
+  
+net.minidev
+json-smart
+1.3.1
+  
 
 
 org.skyscreamer


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[1/3] hadoop git commit: HADOOP-14903. Add json-smart explicitly to pom.xml. Contributed by Brahma Reddy Battula and Ray Chiang

[brahma]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 eeb731307 -> 7307a89ec
  refs/heads/branch-2.8 4c4a2fb42 -> 5ed037650
  refs/heads/branch-2.9 ed1719730 -> b32cc32ee


HADOOP-14903. Add json-smart explicitly to pom.xml. Contributed by Brahma Reddy 
Battula and Ray Chiang


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

Branch: refs/heads/branch-2
Commit: 7307a89ec14d6e9812486f8d78ff4e8f4f597c31
Parents: eeb7313
Author: Brahma Reddy Battula 
Authored: Thu Feb 22 18:52:48 2018 +0530
Committer: Brahma Reddy Battula 
Committed: Thu Feb 22 18:52:48 2018 +0530

--
 hadoop-project/pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7307a89e/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 9d597e4..6ba1ced 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1160,6 +1160,15 @@
   
 
   
+  
+  
+net.minidev
+json-smart
+1.3.1
+  
 
 
 org.skyscreamer


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[3/3] hadoop git commit: HADOOP-14799. Update nimbus-jose-jwt to 4.41.1. (rchiang)

[brahma]

HADOOP-14799. Update nimbus-jose-jwt to 4.41.1. (rchiang)

(cherry picked from commit 556812c179aa094c21acf610439a8d69fe6420ab)


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

Branch: refs/heads/branch-2.8
Commit: 4c4a2fb42eb23e4ece7a47e80b7098c3e82ff5bf
Parents: db1ec73
Author: Ray Chiang 
Authored: Tue Sep 12 10:19:34 2017 -0700
Committer: Brahma Reddy Battula 
Committed: Thu Feb 22 18:11:53 2018 +0530

--
 .../JWTRedirectAuthenticationHandler.java   |   4 +-
 .../TestJWTRedirectAuthenticationHandler.java   | 476 ++
 .../TestJWTRedirectAuthentictionHandler.java| 481 ---
 .../mapreduce/task/reduce/TestFetcher.java  |   4 -
 hadoop-project/pom.xml  |   2 +-
 5 files changed, 480 insertions(+), 487 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c4a2fb4/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
index 61f5b9e..884398c 100644
--- 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
+++ 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
@@ -28,6 +28,7 @@ import java.text.ParseException;
 
 import java.security.interfaces.RSAPublicKey;
 
+import com.google.common.annotations.VisibleForTesting;
 import 
org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.apache.hadoop.security.authentication.util.CertificateUtil;
 import org.slf4j.Logger;
@@ -216,7 +217,8 @@ public class JWTRedirectAuthenticationHandler extends
* @param request for getting the original request URL
* @return url to use as login url for redirect
*/
-  protected String constructLoginURL(HttpServletRequest request) {
+  @VisibleForTesting
+  String constructLoginURL(HttpServletRequest request) {
 String delimiter = "?";
 if (authenticationProviderUrl.contains("?")) {
   delimiter = "&";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c4a2fb4/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
 
b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
new file mode 100644
index 000..5a2db9b
--- /dev/null
+++ 
b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
@@ -0,0 +1,476 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. See accompanying LICENSE file.
+ */
+package org.apache.hadoop.security.authentication.server;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
+import 

[2/3] hadoop git commit: HADOOP-14799. Update nimbus-jose-jwt to 4.41.1. (rchiang)

[brahma]

HADOOP-14799. Update nimbus-jose-jwt to 4.41.1. (rchiang)

(cherry picked from commit 556812c179aa094c21acf610439a8d69fe6420ab)


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

Branch: refs/heads/branch-2.9
Commit: ed171973051d1140a9b45a9cf96c30242ce644fe
Parents: d9d8fa1
Author: Ray Chiang 
Authored: Tue Sep 12 10:19:34 2017 -0700
Committer: Brahma Reddy Battula 
Committed: Thu Feb 22 18:11:20 2018 +0530

--
 .../JWTRedirectAuthenticationHandler.java   |   4 +-
 .../TestJWTRedirectAuthenticationHandler.java   | 476 ++
 .../TestJWTRedirectAuthentictionHandler.java| 481 ---
 .../mapreduce/task/reduce/TestFetcher.java  |   4 -
 hadoop-project/pom.xml  |   2 +-
 5 files changed, 480 insertions(+), 487 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed171973/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
index 61f5b9e..884398c 100644
--- 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
+++ 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
@@ -28,6 +28,7 @@ import java.text.ParseException;
 
 import java.security.interfaces.RSAPublicKey;
 
+import com.google.common.annotations.VisibleForTesting;
 import 
org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.apache.hadoop.security.authentication.util.CertificateUtil;
 import org.slf4j.Logger;
@@ -216,7 +217,8 @@ public class JWTRedirectAuthenticationHandler extends
* @param request for getting the original request URL
* @return url to use as login url for redirect
*/
-  protected String constructLoginURL(HttpServletRequest request) {
+  @VisibleForTesting
+  String constructLoginURL(HttpServletRequest request) {
 String delimiter = "?";
 if (authenticationProviderUrl.contains("?")) {
   delimiter = "&";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed171973/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
 
b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
new file mode 100644
index 000..5a2db9b
--- /dev/null
+++ 
b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
@@ -0,0 +1,476 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. See accompanying LICENSE file.
+ */
+package org.apache.hadoop.security.authentication.server;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
+import 

[1/3] hadoop git commit: HADOOP-14799. Update nimbus-jose-jwt to 4.41.1. (rchiang)

[brahma]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f7e5e45b7 -> eeb731307
  refs/heads/branch-2.8 db1ec739e -> 4c4a2fb42
  refs/heads/branch-2.9 d9d8fa1d3 -> ed1719730


HADOOP-14799. Update nimbus-jose-jwt to 4.41.1. (rchiang)

(cherry picked from commit 556812c179aa094c21acf610439a8d69fe6420ab)


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

Branch: refs/heads/branch-2
Commit: eeb731307f303e0748ad02c53912a2ba1806da09
Parents: f7e5e45
Author: Ray Chiang 
Authored: Tue Sep 12 10:19:34 2017 -0700
Committer: Brahma Reddy Battula 
Committed: Thu Feb 22 18:08:52 2018 +0530

--
 .../JWTRedirectAuthenticationHandler.java   |   4 +-
 .../TestJWTRedirectAuthenticationHandler.java   | 476 ++
 .../TestJWTRedirectAuthentictionHandler.java| 481 ---
 .../mapreduce/task/reduce/TestFetcher.java  |   4 -
 hadoop-project/pom.xml  |   2 +-
 5 files changed, 480 insertions(+), 487 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/eeb73130/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
index 61f5b9e..884398c 100644
--- 
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
+++ 
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
@@ -28,6 +28,7 @@ import java.text.ParseException;
 
 import java.security.interfaces.RSAPublicKey;
 
+import com.google.common.annotations.VisibleForTesting;
 import 
org.apache.hadoop.security.authentication.client.AuthenticationException;
 import org.apache.hadoop.security.authentication.util.CertificateUtil;
 import org.slf4j.Logger;
@@ -216,7 +217,8 @@ public class JWTRedirectAuthenticationHandler extends
* @param request for getting the original request URL
* @return url to use as login url for redirect
*/
-  protected String constructLoginURL(HttpServletRequest request) {
+  @VisibleForTesting
+  String constructLoginURL(HttpServletRequest request) {
 String delimiter = "?";
 if (authenticationProviderUrl.contains("?")) {
   delimiter = "&";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/eeb73130/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
--
diff --git 
a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
 
b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
new file mode 100644
index 000..5a2db9b
--- /dev/null
+++ 
b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestJWTRedirectAuthenticationHandler.java
@@ -0,0 +1,476 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. See accompanying LICENSE file.
+ */
+package org.apache.hadoop.security.authentication.server;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;