You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2018/03/26 18:26:48 UTC
[1/3] hadoop git commit: YARN-8062. yarn rmadmin -getGroups returns
group from which the user has been removed. (Sunil G via wangda)
Repository: hadoop
Updated Branches:
refs/heads/trunk 22194f3d2 -> 24bc5e0e4
YARN-8062. yarn rmadmin -getGroups returns group from which the user has been removed. (Sunil G via wangda)
Change-Id: I80ed63846502bf7751b890b6c6c6a7c0679e2b4a
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d381570
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d381570
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d381570
Branch: refs/heads/trunk
Commit: 5d381570f83022b411a8740d58486a7f68ab2af6
Parents: 22194f3
Author: Wangda Tan <wa...@apache.org>
Authored: Mon Mar 26 11:16:06 2018 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Mon Mar 26 11:16:06 2018 -0700
----------------------------------------------------------------------
.../server/resourcemanager/ResourceManager.java | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d381570/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.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/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 5140c9f..38da7f5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -260,9 +260,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
// load core-site.xml
loadConfigurationXml(YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
- // Do refreshUserToGroupsMappings with loaded core-site.xml
- Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf)
- .refresh();
+ // Refresh user to group mappings during init.
+ refreshUserToGroupMappingsWithConf();
// Do refreshSuperUserGroupsConfiguration with loaded core-site.xml
// Or use RM specific configurations to overwrite the common ones first
@@ -347,6 +346,21 @@ public class ResourceManager extends CompositeService implements Recoverable {
super.serviceInit(this.conf);
}
+ private void refreshUserToGroupMappingsWithConf()
+ throws YarnException, IOException {
+ Configuration newConf = new Configuration(false);
+ InputStream confFileInputStream =
+ configurationProvider
+ .getConfigurationInputStream(newConf, YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
+ if (confFileInputStream != null) {
+ newConf.addResource(confFileInputStream);
+ }
+
+ // Do refreshUserToGroupsMappings with loaded core-site.xml
+ Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(newConf)
+ .refresh();
+ }
+
private void loadConfigurationXml(String configurationFile)
throws YarnException, IOException {
InputStream configurationInputStream =
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/3] hadoop git commit: YARN-8068. Application Priority field causes
NPE in app timeline publish when Hadoop 2.7 based clients to 2.8+ (Sunil G
via wangda)
Posted by wa...@apache.org.
YARN-8068. Application Priority field causes NPE in app timeline publish when Hadoop 2.7 based clients to 2.8+ (Sunil G via wangda)
Change-Id: I7910bd1064a1b4dbbe2084080c060822ea6f3b48
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9eef19b2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9eef19b2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9eef19b2
Branch: refs/heads/trunk
Commit: 9eef19b2ad78b8464da252d0e23c08675898b9d8
Parents: 5d38157
Author: Wangda Tan <wa...@apache.org>
Authored: Mon Mar 26 11:19:15 2018 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Mon Mar 26 11:19:15 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9eef19b2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.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/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
index 61936bb..4234e58 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
@@ -455,6 +455,11 @@ public class RMAppImpl implements RMApp, Recoverable {
if (submissionContext.getPriority() != null) {
this.applicationPriority = Priority
.newInstance(submissionContext.getPriority().getPriority());
+ } else {
+ // If incoming app does not have priority configured in submission
+ // context, system could be assume that its a 0 priority app and could be
+ // considered as normal.
+ this.applicationPriority = Priority.newInstance(0);
}
int globalMaxAppAttempts = conf.getInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/3] hadoop git commit: YARN-8072. RM log is getting flooded with
MemoryPlacementConstraintManager info logs. (Zian Chen via wangda)
Posted by wa...@apache.org.
YARN-8072. RM log is getting flooded with MemoryPlacementConstraintManager info logs. (Zian Chen via wangda)
Change-Id: I2567f4669ad868e13c4301fe44c4bde85bb92c37
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/24bc5e0e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/24bc5e0e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/24bc5e0e
Branch: refs/heads/trunk
Commit: 24bc5e0e4d919fddae983fc13d4ba4e4e5cb9533
Parents: 9eef19b
Author: Wangda Tan <wa...@apache.org>
Authored: Mon Mar 26 11:20:16 2018 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Mon Mar 26 11:20:16 2018 -0700
----------------------------------------------------------------------
.../constraint/MemoryPlacementConstraintManager.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/24bc5e0e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.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/scheduler/constraint/MemoryPlacementConstraintManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java
index 5cb8b99..bf04672 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/MemoryPlacementConstraintManager.java
@@ -184,8 +184,10 @@ public class MemoryPlacementConstraintManager
try {
readLock.lock();
if (appConstraints.get(appId) == null) {
- LOG.info("Application {} is not registered in the Placement "
- + "Constraint Manager.", appId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Application {} is not registered in the Placement "
+ + "Constraint Manager.", appId);
+ }
return null;
}
@@ -213,8 +215,10 @@ public class MemoryPlacementConstraintManager
try {
readLock.lock();
if (appConstraints.get(appId) == null) {
- LOG.info("Application {} is not registered in the Placement "
- + "Constraint Manager.", appId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Application {} is not registered in the Placement "
+ + "Constraint Manager.", appId);
+ }
return null;
}
// TODO: Merge this constraint with the global one for this tag, if one
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org