[hadoop] branch trunk updated: HDFS-15863. RBF: Validation message to be corrected in FairnessPolicyController. Contributed by Renukaprasad C.

[hexiaoqiao]

This is an automated email from the ASF dual-hosted git repository.

hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new da4ceba  HDFS-15863. RBF: Validation message to be corrected in 
FairnessPolicyController. Contributed by Renukaprasad C.
da4ceba is described below

commit da4ceba4aa61e728bde7d303fc8637ab79ee4c69
Author: He Xiaoqiao 
AuthorDate: Wed Mar 31 13:00:13 2021 +0800

HDFS-15863. RBF: Validation message to be corrected in 
FairnessPolicyController. Contributed by Renukaprasad C.
---
 .../StaticRouterRpcFairnessPolicyController.java   | 35 ++
 .../TestRouterRpcFairnessPolicyController.java | 18 ++-
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/fairness/StaticRouterRpcFairnessPolicyController.java
 
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/fairness/StaticRouterRpcFairnessPolicyController.java
index 49a9075..b4e3dc3 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/fairness/StaticRouterRpcFairnessPolicyController.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/fairness/StaticRouterRpcFairnessPolicyController.java
@@ -42,6 +42,10 @@ public class StaticRouterRpcFairnessPolicyController extends
   private static final Logger LOG =
   LoggerFactory.getLogger(StaticRouterRpcFairnessPolicyController.class);
 
+  public static final String ERROR_MSG = "Configured handlers "
+  + DFS_ROUTER_HANDLER_COUNT_KEY + '='
+  + " %d is less than the minimum required handlers %d";
+
   public StaticRouterRpcFairnessPolicyController(Configuration conf) {
 init(conf);
   }
@@ -65,15 +69,13 @@ public class StaticRouterRpcFairnessPolicyController extends
 
 // Insert the concurrent nameservice into the set to process together
 allConfiguredNS.add(CONCURRENT_NS);
+validateHandlersCount(conf, handlerCount, allConfiguredNS);
 for (String nsId : allConfiguredNS) {
   int dedicatedHandlers =
   conf.getInt(DFS_ROUTER_FAIR_HANDLER_COUNT_KEY_PREFIX + nsId, 0);
   LOG.info("Dedicated handlers {} for ns {} ", dedicatedHandlers, nsId);
   if (dedicatedHandlers > 0) {
 handlerCount -= dedicatedHandlers;
-// Total handlers should not be less than sum of dedicated
-// handlers.
-validateCount(nsId, handlerCount, 0);
 insertNameServiceWithPermits(nsId, dedicatedHandlers);
 logAssignment(nsId, dedicatedHandlers);
   } else {
@@ -88,8 +90,6 @@ public class StaticRouterRpcFairnessPolicyController extends
   int handlersPerNS = handlerCount / unassignedNS.size();
   LOG.info("Handlers available per ns {}", handlersPerNS);
   for (String nsId : unassignedNS) {
-// Each NS should have at least one handler assigned.
-validateCount(nsId, handlersPerNS, 1);
 insertNameServiceWithPermits(nsId, handlersPerNS);
 logAssignment(nsId, handlersPerNS);
   }
@@ -112,15 +112,26 @@ public class StaticRouterRpcFairnessPolicyController 
extends
 count, nsId);
   }
 
-  private static void validateCount(String nsId, int handlers, int min) throws
-  IllegalArgumentException {
-if (handlers < min) {
-  String msg =
-  "Available handlers " + handlers +
-  " lower than min " + min +
-  " for nsId " + nsId;
+  private void validateHandlersCount(Configuration conf, int handlerCount,
+ Set allConfiguredNS) {
+int totalDedicatedHandlers = 0;
+for (String nsId : allConfiguredNS) {
+  int dedicatedHandlers =
+  conf.getInt(DFS_ROUTER_FAIR_HANDLER_COUNT_KEY_PREFIX + nsId, 0);
+  if (dedicatedHandlers > 0) {
+// Total handlers should not be less than sum of dedicated handlers.
+totalDedicatedHandlers += dedicatedHandlers;
+  } else {
+// Each NS should have at least one handler assigned.
+totalDedicatedHandlers++;
+  }
+}
+if (totalDedicatedHandlers > handlerCount) {
+  String msg = String.format(ERROR_MSG, handlerCount,
+  totalDedicatedHandlers);
   LOG.error(msg);
   throw new IllegalArgumentException(msg);
 }
   }
+
 }
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/fairness/TestRouterRpcFairnessPolicyController.java
 
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/fairness/TestRouterRpcFairnessPolicyController.java
index c0c3074..8e81664 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/fairness/TestRouterRpcFairnessPolicyController.java
+++ 

[hadoop] branch branch-3.1 updated: HDFS-15932. Improve the balancer error message when process exits abnormally. Contributed by Renukaprasad C.

[hexiaoqiao]

This is an automated email from the ASF dual-hosted git repository.

hexiaoqiao pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
 new 16d50f4  HDFS-15932. Improve the balancer error message when process 
exits abnormally. Contributed by Renukaprasad C.
16d50f4 is described below

commit 16d50f4bbf337e74be0e1a8e1eb3144d5b91c1a0
Author: He Xiaoqiao 
AuthorDate: Wed Mar 31 12:22:53 2021 +0800

HDFS-15932. Improve the balancer error message when process exits 
abnormally. Contributed by Renukaprasad C.
---
 hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh 
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index ab0d53c..a5c00d4 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -2183,7 +2183,7 @@ function hadoop_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on
@@ -2244,7 +2244,7 @@ function hadoop_secure_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on

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

[hadoop] branch branch-3.2 updated: HDFS-15932. Improve the balancer error message when process exits abnormally. Contributed by Renukaprasad C.

[hexiaoqiao]

This is an automated email from the ASF dual-hosted git repository.

hexiaoqiao pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
 new eb10bd8  HDFS-15932. Improve the balancer error message when process 
exits abnormally. Contributed by Renukaprasad C.
eb10bd8 is described below

commit eb10bd8ffd653314508fb7a16ca9e5d09f53aa21
Author: He Xiaoqiao 
AuthorDate: Wed Mar 31 12:22:53 2021 +0800

HDFS-15932. Improve the balancer error message when process exits 
abnormally. Contributed by Renukaprasad C.
---
 hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh 
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index 56248d3..31bc607 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -2189,7 +2189,7 @@ function hadoop_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on
@@ -2250,7 +2250,7 @@ function hadoop_secure_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on

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

[hadoop] branch branch-3.3 updated: HDFS-15932. Improve the balancer error message when process exits abnormally. Contributed by Renukaprasad C.

[hexiaoqiao]

This is an automated email from the ASF dual-hosted git repository.

hexiaoqiao pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
 new ae2d856  HDFS-15932. Improve the balancer error message when process 
exits abnormally. Contributed by Renukaprasad C.
ae2d856 is described below

commit ae2d8565159a59f3bf111acd0b2e48a43fb712d6
Author: He Xiaoqiao 
AuthorDate: Wed Mar 31 12:22:53 2021 +0800

HDFS-15932. Improve the balancer error message when process exits 
abnormally. Contributed by Renukaprasad C.
---
 hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh 
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index cff6012..197dea5 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -2205,7 +2205,7 @@ function hadoop_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on
@@ -2266,7 +2266,7 @@ function hadoop_secure_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on

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

[hadoop] branch trunk updated: HDFS-15932. Improve the balancer error message when process exits abnormally. Contributed by Renukaprasad C.

[hexiaoqiao]

This is an automated email from the ASF dual-hosted git repository.

hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 054e1c5  HDFS-15932. Improve the balancer error message when process 
exits abnormally. Contributed by Renukaprasad C.
054e1c5 is described below

commit 054e1c5e83a45a12038355fd52d64e75b907168d
Author: He Xiaoqiao 
AuthorDate: Wed Mar 31 12:22:53 2021 +0800

HDFS-15932. Improve the balancer error message when process exits 
abnormally. Contributed by Renukaprasad C.
---
 hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh 
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index 4be554a..c4c3157 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -2206,7 +2206,7 @@ function hadoop_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on
@@ -2267,7 +2267,7 @@ function hadoop_secure_daemon_handler
   hadoop_verify_logdir
   hadoop_status_daemon "${daemon_pidfile}"
   if [[ $? == 0  ]]; then
-hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first."
+hadoop_error "${daemonname} is running as process $(cat 
"${daemon_pidfile}").  Stop it first and ensure ${daemon_pidfile} file is empty 
before retry."
 exit 1
   else
 # stale pid file, so just remove it and continue on

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

[hadoop] 07/07: HDFS-15651. Client could not obtain block when DN CommandProcessingThread exit. Contributed by Aiphago.

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit ab451b8e428defee8836beeca57ec0fc741383f3
Author: He Xiaoqiao 
AuthorDate: Wed Nov 4 13:53:46 2020 +0800

HDFS-15651. Client could not obtain block when DN CommandProcessingThread 
exit. Contributed by Aiphago.

Reviewed-by: He Xiaoqiao 
Reviewed-by: Yiqun Lin 
(cherry picked from commit 3067a25fa12a012709f43aa35cc606db6fb137f9)

 Conflicts:

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
---
 .../hdfs/server/datanode/BPServiceActor.java   | 12 +++
 .../hdfs/server/datanode/TestBPOfferService.java   | 24 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
index 49156c2..0cc9fac 100755
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
@@ -1312,6 +1312,10 @@ class BPServiceActor implements Runnable {
 processQueue();
   } catch (Throwable t) {
 LOG.error("{} encountered fatal exception and exit.", getName(), t);
+runningState = RunningState.FAILED;
+  } finally {
+LOG.warn("Ending command processor service for: " + this);
+shouldServiceRun = false;
   }
 }
 
@@ -1327,6 +1331,7 @@ class BPServiceActor implements Runnable {
   dn.getMetrics().incrNumProcessedCommands();
 } catch (InterruptedException e) {
   LOG.error("{} encountered interrupt and exit.", getName());
+  Thread.currentThread().interrupt();
   // ignore unless thread was specifically interrupted.
   if (Thread.interrupted()) {
 break;
@@ -1398,4 +1403,11 @@ class BPServiceActor implements Runnable {
   dn.getMetrics().incrActorCmdQueueLength(1);
 }
   }
+
+  @VisibleForTesting
+  void stopCommandProcessingThread() {
+if (commandProcessingThread != null) {
+  commandProcessingThread.interrupt();
+}
+  }
 }
\ No newline at end of file
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
index 9b47884..a344011 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
@@ -1216,4 +1216,26 @@ public class TestBPOfferService {
   }
 }
   }
-}
\ No newline at end of file
+
+  @Test(timeout = 5000)
+  public void testCommandProcessingThreadExit() throws Exception {
+Configuration conf = new HdfsConfiguration();
+MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).
+numDataNodes(1).build();
+try {
+  List datanodes = cluster.getDataNodes();
+  DataNode dataNode = datanodes.get(0);
+  List allBpOs = dataNode.getAllBpOs();
+  BPOfferService bpos = allBpOs.get(0);
+  waitForInitialization(bpos);
+  BPServiceActor actor = bpos.getBPServiceActors().get(0);
+  // Stop and wait util actor exit.
+  actor.stopCommandProcessingThread();
+  GenericTestUtils.waitFor(() -> !actor.isAlive(), 100, 3000);
+} finally {
+  if (cluster != null) {
+cluster.shutdown();
+  }
+}
+  }
+}

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

[hadoop] 06/07: HDFS-15331. Remove invalid exclusions that minicluster dependency on HDFS (#1996). Contributed by Wanqiang Ji

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 872839416b9eac6602d60cdd755af46730a9a8af
Author: Wanqiang Ji 
AuthorDate: Wed May 6 04:36:38 2020 +0800

HDFS-15331. Remove invalid exclusions that minicluster dependency on HDFS 
(#1996). Contributed by Wanqiang Ji

(cherry picked from commit e877118454b97ae72d3b52dd256999ca073df91d)
---
 hadoop-minicluster/pom.xml | 6 --
 1 file changed, 6 deletions(-)

diff --git a/hadoop-minicluster/pom.xml b/hadoop-minicluster/pom.xml
index 7d64566..1ba646a 100644
--- a/hadoop-minicluster/pom.xml
+++ b/hadoop-minicluster/pom.xml
@@ -67,12 +67,6 @@
   org.apache.hadoop
   hadoop-hdfs
   compile
-  
-
-  io.kubernetes
-  client-java
-
-  
 
 
 

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

[hadoop] 03/07: HDFS-15506. [JDK 11] Fix javadoc errors in hadoop-hdfs module. Contributed by Xieming Li.

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit c4f7b8578b14ec026b10e18b139a669f5982497f
Author: Akira Ajisaka 
AuthorDate: Tue Aug 11 11:14:58 2020 +0900

HDFS-15506. [JDK 11] Fix javadoc errors in hadoop-hdfs module. Contributed 
by Xieming Li.

(cherry picked from commit 7938ebfb9dd12b874ced1798f0c3ad0c160cb465)
---
 .../src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java| 2 +-
 .../hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java  | 2 --
 .../hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java   | 2 +-
 .../hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java   | 3 ++-
 .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java   | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index 1cf7cb1..965ea8d 100755
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -682,7 +682,7 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   600;
   /**
* The maximum number of getBlocks RPCs data movement utilities can make to
-   * a NameNode per second. Values <= 0 disable throttling. This affects
+   * a NameNode per second. Values = 0 disable throttling. This affects
* anything that uses a NameNodeConnector, i.e., the Balancer, Mover,
* and StoragePolicySatisfier.
*/
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
index ad61257..efb2a8b 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
@@ -39,7 +39,6 @@ import static 
org.apache.hadoop.hdfs.DFSConfigKeys.DFS_SERVER_HTTPS_TRUSTSTORE_P
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.InetAddress;
@@ -1777,7 +1776,6 @@ public class DFSUtil {
*was found.
* @throws ParentNotDirectoryException
* @throws UnresolvedLinkException
-   * @throws FileNotFoundException
*/
   public static void checkProtectedDescendants(
   FSDirectory fsd, INodesInPath iip)
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
index b372e73..dfa7bf4 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
@@ -40,7 +40,7 @@ import java.util.Iterator;
 /**
  * Checks to see if datanodes have finished DECOMMISSION_INPROGRESS or
  * ENTERING_MAINTENANCE state.
- * 
+ * 
  * Since this is done while holding the namesystem lock,
  * the amount of work per monitor tick is limited.
  */
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
index 85e5ae4..234f7b9 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
@@ -173,7 +173,8 @@ public class DirectorySnapshottableFeature extends 
DirectoryWithSnapshotFeature
* Add a snapshot.
* @param snapshotRoot Root of the snapshot.
* @param name Name of the snapshot.
-   * @param mtime The snapshot creation time set by Time.now().
+   * @param leaseManager
+   * @param captureOpenFiles
* @throws SnapshotException Throw SnapshotException when there is a snapshot
*   with the same name already exists or snapshot quota exceeds
*/
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
index 5344d14..b57637d 100644
--- 

[hadoop] branch branch-3.3 updated (56ef164 -> ab451b8)

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


from 56ef164  HADOOP-17222. Create socket address leveraging URI cache 
(#2817)
 new 7f20fad  HDFS-14383. Compute datanode load based on StoragePolicy. 
Contributed by Ayush Saxena.
 new 769df1e  HDFS-15253 Default checkpoint transfer speed, 50mb per second 
(#2366)
 new c4f7b85  HDFS-15506. [JDK 11] Fix javadoc errors in hadoop-hdfs 
module. Contributed by Xieming Li.
 new a407f7d  HDFS-15507. [JDK 11] Fix javadoc errors in hadoop-hdfs-client 
module. Contributed by Xieming Li.
 new 53b024a  HDFS-15508. [JDK 11] Fix javadoc errors in hadoop-hdfs-rbf 
module
 new 8728394  HDFS-15331. Remove invalid exclusions that minicluster 
dependency on HDFS (#1996). Contributed by Wanqiang Ji
 new ab451b8  HDFS-15651. Client could not obtain block when DN 
CommandProcessingThread exit. Contributed by Aiphago.

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/hadoop/hdfs/ClientGSIContext.java   |  2 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java |  2 +-
 .../apache/hadoop/hdfs/protocol/HdfsConstants.java |  3 +-
 .../router/security/token/package-info.java|  3 +-
 .../java/org/apache/hadoop/hdfs/DFSConfigKeys.java |  9 +++-
 .../main/java/org/apache/hadoop/hdfs/DFSUtil.java  |  2 -
 .../BlockPlacementPolicyDefault.java   | 55 --
 .../DatanodeAdminDefaultMonitor.java   |  2 +-
 .../server/blockmanagement/DatanodeManager.java|  6 +++
 .../server/blockmanagement/FSClusterStats.java |  9 
 .../server/blockmanagement/StorageTypeStats.java   | 16 +++
 .../hdfs/server/datanode/BPServiceActor.java   | 12 +
 .../snapshot/DirectorySnapshottableFeature.java|  3 +-
 .../org/apache/hadoop/hdfs/tools/DFSAdmin.java |  1 -
 .../src/main/resources/hdfs-default.xml| 15 +-
 .../blockmanagement/TestBlockStatsMXBean.java  | 52 
 .../blockmanagement/TestReplicationPolicy.java | 29 
 .../hdfs/server/datanode/TestBPOfferService.java   | 24 +-
 hadoop-minicluster/pom.xml |  6 ---
 19 files changed, 228 insertions(+), 23 deletions(-)

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

[hadoop] 04/07: HDFS-15507. [JDK 11] Fix javadoc errors in hadoop-hdfs-client module. Contributed by Xieming Li.

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit a407f7de5afc5a07e9016788d85dc7e582833e34
Author: Akira Ajisaka 
AuthorDate: Tue Aug 11 13:49:56 2020 +0900

HDFS-15507. [JDK 11] Fix javadoc errors in hadoop-hdfs-client module. 
Contributed by Xieming Li.

(cherry picked from commit 32895f4f7ea51522e779e68a030bfc9515f40798)
---
 .../src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java | 2 +-
 .../src/main/java/org/apache/hadoop/hdfs/DFSClient.java| 2 +-
 .../src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java
index 9b324bd..4de9696 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientGSIContext.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.LongAccumulator;
 
 /**
  * Global State Id context for the client.
- * 
+ * 
  * This is the client side implementation responsible for receiving
  * state alignment info from server(s).
  */
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
index b210f91..9e532f2 100755
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
@@ -1245,7 +1245,7 @@ public class DFSClient implements java.io.Closeable, 
RemotePeerFactory,
 
   /**
* Same as {@link #create(String, FsPermission, EnumSet, boolean, short, 
long,
-   * addition of Progressable, int, ChecksumOpt, InetSocketAddress[], String)}
+   * Progressable, int, ChecksumOpt, InetSocketAddress[], String)}
* with the storagePolicy that is used to specify a specific storage policy
* instead of inheriting any policy from this new file's parent directory.
* This policy will be persisted in HDFS. A value of null means inheriting
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
index eb3dc4e..615acad 100755
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
 import org.apache.hadoop.util.StringUtils;
 
 @InterfaceAudience.Private
@@ -110,7 +111,7 @@ public final class HdfsConstants {
* period, no other client can write to the file. The writing client can
* periodically renew the lease. When the file is closed, the lease is
* revoked. The lease duration is bound by this soft limit and a
-   * {@link HdfsConstants#LEASE_HARDLIMIT_PERIOD hard limit}. Until the
+   * {@link HdfsClientConfigKeys#DFS_LEASE_HARDLIMIT_KEY }. Until the
* soft limit expires, the writer has sole write access to the file. If the
* soft limit expires and the client fails to close the file or renew the
* lease, another client can preempt the lease.

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

[hadoop] 05/07: HDFS-15508. [JDK 11] Fix javadoc errors in hadoop-hdfs-rbf module

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 53b024a2b7c1702887081de2a22eea28b62943c9
Author: Akira Ajisaka 
AuthorDate: Mon Aug 3 14:39:13 2020 +0900

HDFS-15508. [JDK 11] Fix javadoc errors in hadoop-hdfs-rbf module

(cherry picked from commit 9062814bab7d6087c584e03b0b16eaa60b31f60a)
---
 .../hdfs/server/federation/router/security/token/package-info.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/token/package-info.java
 
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/token/package-info.java
index a51e455..ae65c8f 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/token/package-info.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/token/package-info.java
@@ -18,7 +18,8 @@
 
 /**
  * Includes implementations of token secret managers.
- * Implementations should extend {@link AbstractDelegationTokenSecretManager}.
+ * Implementations should extend
+ * {@link 
org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager}.
  */
 @InterfaceAudience.Private
 @InterfaceStability.Evolving

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

[hadoop] 01/07: HDFS-14383. Compute datanode load based on StoragePolicy. Contributed by Ayush Saxena.

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 7f20fad41912217c03cdd7f2d54c01e40f49d051
Author: Ayush Saxena 
AuthorDate: Mon Oct 19 10:48:47 2020 +0530

HDFS-14383. Compute datanode load based on StoragePolicy. Contributed by 
Ayush Saxena.

(cherry picked from commit 2e8cafac3b071fe5b943542827fd8a496b137fa9)
---
 .../java/org/apache/hadoop/hdfs/DFSConfigKeys.java |  5 ++
 .../BlockPlacementPolicyDefault.java   | 55 --
 .../server/blockmanagement/DatanodeManager.java|  6 +++
 .../server/blockmanagement/FSClusterStats.java |  9 
 .../server/blockmanagement/StorageTypeStats.java   | 16 +++
 .../src/main/resources/hdfs-default.xml| 11 +
 .../blockmanagement/TestBlockStatsMXBean.java  | 52 
 .../blockmanagement/TestReplicationPolicy.java | 29 
 8 files changed, 180 insertions(+), 3 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index f7da4cb..75b7389 100755
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -239,6 +239,11 @@ public class DFSConfigKeys extends CommonConfigurationKeys 
{
   
HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOAD_KEY;
   public static final boolean DFS_NAMENODE_REDUNDANCY_CONSIDERLOAD_DEFAULT =
   true;
+  public static final String
+  DFS_NAMENODE_REDUNDANCY_CONSIDERLOADBYSTORAGETYPE_KEY =
+  "dfs.namenode.redundancy.considerLoadByStorageType";
+  public static final boolean
+  DFS_NAMENODE_REDUNDANCY_CONSIDERLOADBYSTORAGETYPE_DEFAULT = false;
   public static final String  DFS_NAMENODE_READ_CONSIDERLOAD_KEY =
   "dfs.namenode.read.considerLoad";
   public static final boolean DFS_NAMENODE_READ_CONSIDERLOAD_DEFAULT =
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
index a1a83b0..5761690 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
@@ -17,6 +17,8 @@
  */
 package org.apache.hadoop.hdfs.server.blockmanagement;
 
+import static 
org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOADBYSTORAGETYPE_DEFAULT;
+import static 
org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOADBYSTORAGETYPE_KEY;
 import static org.apache.hadoop.util.Time.monotonicNow;
 
 import java.util.*;
@@ -92,7 +94,8 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
 }
   }
 
-  protected boolean considerLoad; 
+  protected boolean considerLoad;
+  private boolean considerLoadByStorageType;
   protected double considerLoadFactor;
   private boolean preferLocalNode;
   protected NetworkTopology clusterMap;
@@ -116,6 +119,9 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
 this.considerLoad = conf.getBoolean(
 DFSConfigKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOAD_KEY,
 DFSConfigKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOAD_DEFAULT);
+this.considerLoadByStorageType = conf.getBoolean(
+DFS_NAMENODE_REDUNDANCY_CONSIDERLOADBYSTORAGETYPE_KEY,
+DFS_NAMENODE_REDUNDANCY_CONSIDERLOADBYSTORAGETYPE_DEFAULT);
 this.considerLoadFactor = conf.getDouble(
 DFSConfigKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOAD_FACTOR,
 DFSConfigKeys.DFS_NAMENODE_REDUNDANCY_CONSIDERLOAD_FACTOR_DEFAULT);
@@ -976,8 +982,9 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
* @return Return true if the datanode should be excluded, otherwise false
*/
   boolean excludeNodeByLoad(DatanodeDescriptor node){
-final double maxLoad = considerLoadFactor *
-stats.getInServiceXceiverAverage();
+double inServiceXceiverCount = getInServiceXceiverAverage(node);
+final double maxLoad = considerLoadFactor * inServiceXceiverCount;
+
 final int nodeLoad = node.getXceiverCount();
 if ((nodeLoad > maxLoad) && (maxLoad > 0)) {
   logNodeIsNotChosen(node, NodeNotChosenReason.NODE_TOO_BUSY,
@@ -988,6 +995,48 @@ public class BlockPlacementPolicyDefault extends 
BlockPlacementPolicy {
   }
 
   /**
+   * Gets the inServiceXceiver average count for the cluster, if
+   * considerLoadByStorageType is true, then load is calculated only for the
+   * 

[hadoop] 02/07: HDFS-15253 Default checkpoint transfer speed, 50mb per second (#2366)

[weichiu]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 769df1e964299a86421397f1fde348a567ceb366
Author: Karthik Palanisamy 
AuthorDate: Wed Oct 7 09:39:04 2020 -0700

HDFS-15253 Default checkpoint transfer speed, 50mb per second (#2366)

(cherry picked from commit df4006eb8139a08b92b5a94adfde544de978137c)
---
 .../src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java   | 2 +-
 hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index 75b7389..1cf7cb1 100755
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -983,7 +983,7 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
 
   public static final String DFS_IMAGE_TRANSFER_RATE_KEY =

"dfs.image.transfer.bandwidthPerSec";
-  public static final long DFS_IMAGE_TRANSFER_RATE_DEFAULT = 0;  //no 
throttling
+  public static final long DFS_IMAGE_TRANSFER_RATE_DEFAULT = 52428800;
 
   public static final String DFS_IMAGE_TRANSFER_BOOTSTRAP_STANDBY_RATE_KEY =
   "dfs.image.transfer-bootstrap-standby.bandwidthPerSec";
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index e63303f..ce9195c 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -1439,13 +1439,13 @@
 
 
   dfs.image.transfer.bandwidthPerSec
-  0
+  52428800
   
 Maximum bandwidth used for regular image transfers (instead of
 bootstrapping the standby namenode), in bytes per second.
 This can help keep normal namenode operations responsive during
 checkpointing.
-A default value of 0 indicates that throttling is disabled.
+A default value is 50mb per second.
 The maximum bandwidth used for bootstrapping standby namenode is
 configured with dfs.image.transfer-bootstrap-standby.bandwidthPerSec.
 Support multiple size unit suffix(case insensitive), as described

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

[hadoop] branch trunk updated: YARN-10544. AMParams.java having un-necessary access identifier static final. Contributed by ANANDA G B.

[brahma]

This is an automated email from the ASF dual-hosted git repository.

brahma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 03e42ef  YARN-10544. AMParams.java having un-necessary access 
identifier static final. Contributed by ANANDA G B.
03e42ef is described below

commit 03e42efa30bc084f6d9e45822c25ec87ead78e15
Author: Brahma Reddy Battula 
AuthorDate: Wed Mar 31 08:25:20 2021 +0530

YARN-10544. AMParams.java having un-necessary access identifier static 
final. Contributed by ANANDA G B.
---
 .../hadoop/mapreduce/v2/app/webapp/AMParams.java   | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AMParams.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AMParams.java
index 2ca7ff5..4bbd1da 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AMParams.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AMParams.java
@@ -22,13 +22,13 @@ package org.apache.hadoop.mapreduce.v2.app.webapp;
  * Params constants for the AM webapp and the history webapp.
  */
 public interface AMParams {
-  static final String RM_WEB = "rm.web";
-  static final String APP_ID = "app.id";
-  static final String JOB_ID = "job.id";
-  static final String TASK_ID = "task.id";
-  static final String TASK_TYPE = "task.type";
-  static final String TASK_STATE = "task.state";
-  static final String ATTEMPT_STATE = "attempt.state";
-  static final String COUNTER_GROUP = "counter.group";
-  static final String COUNTER_NAME = "counter.name";
+  String RM_WEB = "rm.web";
+  String APP_ID = "app.id";
+  String JOB_ID = "job.id";
+  String TASK_ID = "task.id";
+  String TASK_TYPE = "task.type";
+  String TASK_STATE = "task.state";
+  String ATTEMPT_STATE = "attempt.state";
+  String COUNTER_GROUP = "counter.group";
+  String COUNTER_NAME = "counter.name";
 }

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

[hadoop] branch trunk updated (8668abf -> 7dfff49)

[inigoiri]

This is an automated email from the ASF dual-hosted git repository.

inigoiri pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


from 8668abf  HDFS-15927. Catch polymorphic type by reference (#2824)
 add 7dfff49  HDFS-15929. Replace RAND_pseudo_bytes in util.cc (#2826)

No new revisions were added by this update.

Summary of changes:
 .../src/main/native/libhdfspp/lib/common/util.cc   | 14 +++---
 .../src/main/native/libhdfspp/lib/common/util.h|  3 +-
 .../src/main/native/libhdfspp/lib/fs/filehandle.cc | 11 -
 .../src/main/native/libhdfspp/lib/fs/filehandle.h  | 13 --
 .../src/main/native/libhdfspp/lib/fs/filesystem.h  |  3 +-
 .../native/libhdfspp/lib/fs/namenode_operations.h  |  4 +-
 .../libhdfspp/lib/rpc/rpc_connection_impl.cc   |  8 +++-
 .../main/native/libhdfspp/lib/rpc/rpc_engine.cc|  3 +-
 .../src/main/native/libhdfspp/lib/rpc/rpc_engine.h |  9 ++--
 .../native/libhdfspp/tests/bad_datanode_test.cc| 28 +--
 .../libhdfspp/tests/remote_block_reader_test.cc| 16 +--
 .../main/native/libhdfspp/tests/rpc_engine_test.cc | 54 +++---
 12 files changed, 119 insertions(+), 47 deletions(-)

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

[hadoop] branch trunk updated (50b1e1c -> 8668abf)

[inigoiri]

This is an automated email from the ASF dual-hosted git repository.

inigoiri pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


from 50b1e1c  HDFS-15928. Replace RAND_pseudo_bytes in rpc_engine.cc (#2825)
 add 8668abf  HDFS-15927. Catch polymorphic type by reference (#2824)

No new revisions were added by this update.

Summary of changes:
 .../src/main/native/libhdfspp/lib/common/hdfs_configuration.cc| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[hadoop] branch trunk updated (8ad77a2 -> 50b1e1c)

[inigoiri]

This is an automated email from the ASF dual-hosted git repository.

inigoiri pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


from 8ad77a2  YARN-10716. Fix typo in ContainerRuntime. Contributed by 
xishuhai.
 add 50b1e1c  HDFS-15928. Replace RAND_pseudo_bytes in rpc_engine.cc (#2825)

No new revisions were added by this update.

Summary of changes:
 .../src/main/native/libhdfspp/lib/rpc/request.cc  |  8 +++-
 .../src/main/native/libhdfspp/lib/rpc/rpc_engine.cc   | 15 +++
 .../src/main/native/libhdfspp/lib/rpc/rpc_engine.h|  8 
 3 files changed, 22 insertions(+), 9 deletions(-)

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

[hadoop] branch branch-3.3 updated: HADOOP-17222. Create socket address leveraging URI cache (#2817)

[sodonnell]

This is an automated email from the ASF dual-hosted git repository.

sodonnell pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
 new 56ef164  HADOOP-17222. Create socket address leveraging URI cache 
(#2817)
56ef164 is described below

commit 56ef16468adfa830422e64a0d8311fa476505d0c
Author: Stephen O'Donnell 
AuthorDate: Tue Mar 30 11:59:44 2021 +0100

HADOOP-17222. Create socket address leveraging URI cache (#2817)

Contributed by fanrui.

Signed-off-by: Mingliang Liu 
Signed-off-by: He Xiaoqiao 
---
 .../main/java/org/apache/hadoop/net/NetUtils.java  | 77 ++
 .../java/org/apache/hadoop/net/TestNetUtils.java   | 45 -
 .../apache/hadoop/security/TestSecurityUtil.java   | 10 +++
 .../org/apache/hadoop/hdfs/DFSInputStream.java |  4 +-
 .../hadoop/hdfs/client/HdfsClientConfigKeys.java   |  3 +
 .../hadoop/hdfs/client/impl/DfsClientConf.java | 52 ++-
 .../src/main/resources/hdfs-default.xml|  9 +++
 .../apache/hadoop/tools/TestHdfsConfigFields.java  |  1 +
 8 files changed, 168 insertions(+), 33 deletions(-)

diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index 3715e3c..5ded4b4 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -39,6 +39,7 @@ import java.net.ConnectException;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.UnresolvedAddressException;
 import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -46,6 +47,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import javax.net.SocketFactory;
 
 import org.apache.hadoop.security.AccessControlException;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -178,11 +181,33 @@ public class NetUtils {
*include a port number
* @param configName the name of the configuration from which
*   target was loaded. This is used in the
-   *   exception message in the case that parsing fails. 
+   *   exception message in the case that parsing fails.
*/
   public static InetSocketAddress createSocketAddr(String target,
int defaultPort,
String configName) {
+return createSocketAddr(target, defaultPort, configName, false);
+  }
+
+  /**
+   * Create an InetSocketAddress from the given target string and
+   * default port. If the string cannot be parsed correctly, the
+   * configName parameter is used as part of the
+   * exception message, allowing the user to better diagnose
+   * the misconfiguration.
+   *
+   * @param target a string of either "host" or "host:port"
+   * @param defaultPort the default port if target does not
+   *include a port number
+   * @param configName the name of the configuration from which
+   *   target was loaded. This is used in the
+   *   exception message in the case that parsing fails.
+   * @param useCacheIfPresent Whether use cache when create URI
+   */
+  public static InetSocketAddress createSocketAddr(String target,
+   int defaultPort,
+   String configName,
+   boolean useCacheIfPresent) {
 String helpText = "";
 if (configName != null) {
   helpText = " (configuration property '" + configName + "')";
@@ -192,15 +217,8 @@ public class NetUtils {
   helpText);
 }
 target = target.trim();
-boolean hasScheme = target.contains("://");
-URI uri = null;
-try {
-  uri = hasScheme ? URI.create(target) : 
URI.create("dummyscheme://"+target);
-} catch (IllegalArgumentException e) {
-  throw new IllegalArgumentException(
-  "Does not contain a valid host:port authority: " + target + helpText
-  );
-}
+boolean hasScheme = target.contains("://");
+URI uri = createURI(target, hasScheme, helpText, useCacheIfPresent);
 
 String host = uri.getHost();
 int port = uri.getPort();
@@ -208,10 +226,9 @@ public class NetUtils {
   port = defaultPort;
 }
 String path = uri.getPath();
- 

[hadoop] branch branch-2.10 updated: YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

[aajisaka]

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
 new d822bc3  YARN-10716. Fix typo in ContainerRuntime. Contributed by 
xishuhai.
d822bc3 is described below

commit d822bc3def254fea4120c371862b41ed7d0ccbcb
Author: Akira Ajisaka 
AuthorDate: Tue Mar 30 17:46:51 2021 +0900

YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

(cherry picked from commit 8ad77a26c9f674e734e7f4c917ee2d51c77e527d)
---
 .../server/nodemanager/containermanager/runtime/ContainerRuntime.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
index 7caa0ed..35eb4b2 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
@@ -28,7 +28,7 @@ import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Cont
  * An abstraction for various container runtime implementations. Examples
  * include Process Tree, Docker, Appc runtimes etc. These implementations
  * are meant for low-level OS container support - dependencies on
- * higher-level node mananger constructs should be avoided.
+ * higher-level node manager constructs should be avoided.
  */
 
 @InterfaceAudience.Private

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

[hadoop] branch branch-3.1 updated: YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

[aajisaka]

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
 new b26eac6  YARN-10716. Fix typo in ContainerRuntime. Contributed by 
xishuhai.
b26eac6 is described below

commit b26eac6e8a9bc65051f5e3114f490e87a8e7693e
Author: Akira Ajisaka 
AuthorDate: Tue Mar 30 17:46:51 2021 +0900

YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

(cherry picked from commit 8ad77a26c9f674e734e7f4c917ee2d51c77e527d)
---
 .../server/nodemanager/containermanager/runtime/ContainerRuntime.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
index 01995d9..a8da642 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
@@ -28,7 +28,7 @@ import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Cont
  * An abstraction for various container runtime implementations. Examples
  * include Process Tree, Docker, Appc runtimes etc. These implementations
  * are meant for low-level OS container support - dependencies on
- * higher-level node mananger constructs should be avoided.
+ * higher-level node manager constructs should be avoided.
  */
 
 @InterfaceAudience.Private

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

[hadoop] branch branch-3.2 updated: YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

[aajisaka]

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
 new d93f2c8  YARN-10716. Fix typo in ContainerRuntime. Contributed by 
xishuhai.
d93f2c8 is described below

commit d93f2c8cb801a141de6a2c9cf8f90035a8e830b2
Author: Akira Ajisaka 
AuthorDate: Tue Mar 30 17:46:51 2021 +0900

YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

(cherry picked from commit 8ad77a26c9f674e734e7f4c917ee2d51c77e527d)
---
 .../server/nodemanager/containermanager/runtime/ContainerRuntime.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
index 01995d9..a8da642 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
@@ -28,7 +28,7 @@ import 
org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Cont
  * An abstraction for various container runtime implementations. Examples
  * include Process Tree, Docker, Appc runtimes etc. These implementations
  * are meant for low-level OS container support - dependencies on
- * higher-level node mananger constructs should be avoided.
+ * higher-level node manager constructs should be avoided.
  */
 
 @InterfaceAudience.Private

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

[hadoop] branch branch-3.3 updated: YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

[aajisaka]

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
 new c96fbb9  YARN-10716. Fix typo in ContainerRuntime. Contributed by 
xishuhai.
c96fbb9 is described below

commit c96fbb91990586ba7b4d4dc6e449731c4fdf6216
Author: Akira Ajisaka 
AuthorDate: Tue Mar 30 17:46:51 2021 +0900

YARN-10716. Fix typo in ContainerRuntime. Contributed by xishuhai.

(cherry picked from commit 8ad77a26c9f674e734e7f4c917ee2d51c77e527d)
---
 .../server/nodemanager/containermanager/runtime/ContainerRuntime.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
index 92fd86d..b024ada 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntime.java
@@ -30,7 +30,7 @@ import 
org.apache.hadoop.yarn.server.nodemanager.executor.ContainerExecContext;
  * An abstraction for various container runtime implementations. Examples
  * include Process Tree, Docker, Appc runtimes etc. These implementations
  * are meant for low-level OS container support - dependencies on
- * higher-level node mananger constructs should be avoided.
+ * higher-level node manager constructs should be avoided.
  */
 
 @InterfaceAudience.Private

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

[hadoop] branch trunk updated (413a4c3 -> 8ad77a2)

[aajisaka]

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


from 413a4c3  YARN-10466.Fix NullPointerException in yarn-services 
Component.java. Contributed by  D M Murali Krishna Reddy
 add 8ad77a2  YARN-10716. Fix typo in ContainerRuntime. Contributed by 
xishuhai.

No new revisions were added by this update.

Summary of changes:
 .../server/nodemanager/containermanager/runtime/ContainerRuntime.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[hadoop] branch trunk updated: YARN-10466.Fix NullPointerException in yarn-services Component.java. Contributed by D M Murali Krishna Reddy

[brahma]

This is an automated email from the ASF dual-hosted git repository.

brahma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 413a4c3  YARN-10466.Fix NullPointerException in yarn-services 
Component.java. Contributed by  D M Murali Krishna Reddy
413a4c3 is described below

commit 413a4c3c05d317090c706385c51e4cabcfd92b0e
Author: Brahma Reddy Battula 
AuthorDate: Tue Mar 30 13:52:07 2021 +0530

YARN-10466.Fix NullPointerException in yarn-services Component.java. 
Contributed by  D M Murali Krishna Reddy
---
 .../java/org/apache/hadoop/yarn/service/component/Component.java | 5 +
 1 file changed, 5 insertions(+)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
index 0b0ba79..0e031f4 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
@@ -830,6 +830,11 @@ public class Component implements 
EventHandler {
 targetExpressions.toArray(new TargetExpression[0])).build();
 break;
   }
+  if (constraint == null) {
+LOG.info("[COMPONENT {}] Placement constraint: null ",
+componentSpec.getName());
+continue;
+  }
   // The default AND-ed final composite constraint
   if (finalConstraint != null) {
 finalConstraint = PlacementConstraints

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

[hadoop] branch branch-3.3 updated: YARN-10466.Fix NullPointerException in yarn-services Component.java. Contributed by D M Murali Krishna Reddy

[brahma]

This is an automated email from the ASF dual-hosted git repository.

brahma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
 new 5358313  YARN-10466.Fix NullPointerException in yarn-services 
Component.java. Contributed by  D M Murali Krishna Reddy
5358313 is described below

commit 5358313f97d25e6e950873630c811b1cbde73f12
Author: Brahma Reddy Battula 
AuthorDate: Tue Mar 30 13:52:07 2021 +0530

YARN-10466.Fix NullPointerException in yarn-services Component.java. 
Contributed by  D M Murali Krishna Reddy

(cherry picked from commit 413a4c3c05d317090c706385c51e4cabcfd92b0e)
---
 .../java/org/apache/hadoop/yarn/service/component/Component.java | 5 +
 1 file changed, 5 insertions(+)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
index 1f3ca22..0472977 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
@@ -833,6 +833,11 @@ public class Component implements 
EventHandler {
 targetExpressions.toArray(new TargetExpression[0])).build();
 break;
   }
+  if (constraint == null) {
+LOG.info("[COMPONENT {}] Placement constraint: null ",
+componentSpec.getName());
+continue;
+  }
   // The default AND-ed final composite constraint
   if (finalConstraint != null) {
 finalConstraint = PlacementConstraints

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

[hadoop] branch trunk updated: YARN-10439. addendum fix for shaded guva.

[brahma]

This is an automated email from the ASF dual-hosted git repository.

brahma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 6577bf1  YARN-10439. addendum fix for shaded guva.
6577bf1 is described below

commit 6577bf1891b11c9271d73491b311059677dfb376
Author: Brahma Reddy Battula 
AuthorDate: Tue Mar 30 13:48:40 2021 +0530

YARN-10439. addendum fix for shaded guva.
---
 .../src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
index 342d8d8..a06a0e6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.yarn.service;
 
-import com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.ipc.Server;

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

[hadoop] branch branch-3.3 updated: YARN-10439. addendum fix for shaded guva.

[brahma]

This is an automated email from the ASF dual-hosted git repository.

brahma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
 new bac1326  YARN-10439. addendum fix for shaded guva.
bac1326 is described below

commit bac1326e4e1252adbfc19cf50ed966453a3a13ec
Author: Brahma Reddy Battula 
AuthorDate: Tue Mar 30 13:48:40 2021 +0530

YARN-10439. addendum fix for shaded guva.

(cherry picked from commit 6577bf1891b11c9271d73491b311059677dfb376)
---
 .../src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
index 342d8d8..a06a0e6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.yarn.service;
 
-import com.google.common.annotations.VisibleForTesting;
+import 
org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.ipc.Server;

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