[hadoop] branch trunk updated: YARN-10997. Revisit allocation and reservation logging. Contributed by Andras Gyori

2021-11-12 Thread snemeth 
This is an automated email from the ASF dual-hosted git repository.

snemeth 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 7cb887e  YARN-10997. Revisit allocation and reservation logging. 
Contributed by Andras Gyori
7cb887e is described below

commit 7cb887e6c2bfc058bb7b7d7bde2554d261432bdb
Author: Szilard Nemeth 
AuthorDate: Fri Nov 12 15:42:14 2021 +0100

YARN-10997. Revisit allocation and reservation logging. Contributed by 
Andras Gyori
---
 .../scheduler/capacity/CapacityScheduler.java   |  2 --
 .../scheduler/common/fica/FiCaSchedulerApp.java | 13 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index b8091c7..09ae99e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -3294,13 +3294,11 @@ public class CapacityScheduler extends
   long commitSuccess = System.nanoTime() - commitStart;
   CapacitySchedulerMetrics.getMetrics()
   .addCommitSuccess(commitSuccess);
-  LOG.info("Allocation proposal accepted");
   isSuccess = true;
 } else{
   long commitFailed = System.nanoTime() - commitStart;
   CapacitySchedulerMetrics.getMetrics()
   .addCommitFailure(commitFailed);
-  LOG.info("Failed to accept allocation proposal");
 }
 
 LOG.debug("Allocation proposal accepted={}, proposal={}", isSuccess,
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index a1b8205..011a254 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -357,6 +357,7 @@ public class FiCaSchedulerApp extends 
SchedulerApplicationAttempt {
   // adding NP check as this proposal could not be allocated from reserved
   // container in async-scheduling mode
   if (allocation.getAllocateFromReservedContainer() == null) {
+LOG.debug("Trying to allocate from reserved container in async 
scheduling mode");
 return false;
   }
   RMContainer fromReservedContainer =
@@ -572,6 +573,8 @@ public class FiCaSchedulerApp extends 
SchedulerApplicationAttempt {
 if (updatePending &&
 
getOutstandingAsksCount(schedulerContainer.getSchedulerRequestKey())
 <= 0) {
+  LOG.debug("Rejecting appliance of allocation due to existing pending 
allocation " +
+  "request for " + schedulerContainer);
   return false;
 }
 
@@ -670,10 +673,12 @@ public class FiCaSchedulerApp extends 
SchedulerApplicationAttempt {
   schedulerContainer.getRmContainer().getContainer(),
   reReservation);
 
-  LOG.info("Reserved container=" + rmContainer.getContainerId()
-  + ", on node=" + schedulerContainer.getSchedulerNode()
-  + " with resource=" + rmContainer
-  .getAllocatedOrReservedResource());
+  if (LOG.isDebugEnabled()) {
+LOG.debug("Reserved container=" + rmContainer.getContainerId()
++ ", on node=" + schedulerContainer.getSchedulerNode()
++ " with resource=" + rmContainer
+.getAllocatedOrReservedResource());
+  }
 }
   }
 } finally {

-
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-10997. Revisit allocation and reservation logging. Contributed by Andras Gyori

2021-11-12 Thread snemeth 
This is an automated email from the ASF dual-hosted git repository.

snemeth 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 2da7364  YARN-10997. Revisit allocation and reservation logging. 
Contributed by Andras Gyori
2da7364 is described below

commit 2da7364c7e052bb1e1f2005b187efafa10b69c2f
Author: Szilard Nemeth 
AuthorDate: Fri Nov 12 15:42:14 2021 +0100

YARN-10997. Revisit allocation and reservation logging. Contributed by 
Andras Gyori
---
 .../scheduler/capacity/CapacityScheduler.java   |  2 --
 .../scheduler/common/fica/FiCaSchedulerApp.java | 13 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index b8091c7..09ae99e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -3294,13 +3294,11 @@ public class CapacityScheduler extends
   long commitSuccess = System.nanoTime() - commitStart;
   CapacitySchedulerMetrics.getMetrics()
   .addCommitSuccess(commitSuccess);
-  LOG.info("Allocation proposal accepted");
   isSuccess = true;
 } else{
   long commitFailed = System.nanoTime() - commitStart;
   CapacitySchedulerMetrics.getMetrics()
   .addCommitFailure(commitFailed);
-  LOG.info("Failed to accept allocation proposal");
 }
 
 LOG.debug("Allocation proposal accepted={}, proposal={}", isSuccess,
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index a1b8205..011a254 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -357,6 +357,7 @@ public class FiCaSchedulerApp extends 
SchedulerApplicationAttempt {
   // adding NP check as this proposal could not be allocated from reserved
   // container in async-scheduling mode
   if (allocation.getAllocateFromReservedContainer() == null) {
+LOG.debug("Trying to allocate from reserved container in async 
scheduling mode");
 return false;
   }
   RMContainer fromReservedContainer =
@@ -572,6 +573,8 @@ public class FiCaSchedulerApp extends 
SchedulerApplicationAttempt {
 if (updatePending &&
 
getOutstandingAsksCount(schedulerContainer.getSchedulerRequestKey())
 <= 0) {
+  LOG.debug("Rejecting appliance of allocation due to existing pending 
allocation " +
+  "request for " + schedulerContainer);
   return false;
 }
 
@@ -670,10 +673,12 @@ public class FiCaSchedulerApp extends 
SchedulerApplicationAttempt {
   schedulerContainer.getRmContainer().getContainer(),
   reReservation);
 
-  LOG.info("Reserved container=" + rmContainer.getContainerId()
-  + ", on node=" + schedulerContainer.getSchedulerNode()
-  + " with resource=" + rmContainer
-  .getAllocatedOrReservedResource());
+  if (LOG.isDebugEnabled()) {
+LOG.debug("Reserved container=" + rmContainer.getContainerId()
++ ", on node=" + schedulerContainer.getSchedulerNode()
++ " with resource=" + rmContainer
+.getAllocatedOrReservedResource());
+  }
 }
   }
 } finally {

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