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 rk...@apache.org on 2015/09/11 20:46:48 UTC
[1/2] hadoop git commit: YARN-4145. Make RMHATestBase abstract so its
not run when running all tests under that namespace (adhoot via rkanter)
Repository: hadoop
Updated Branches:
refs/heads/trunk 15a557fcf -> ea4bb2749
YARN-4145. Make RMHATestBase abstract so its not run when running all tests under that namespace (adhoot via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea4bb274
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea4bb274
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea4bb274
Branch: refs/heads/trunk
Commit: ea4bb2749f966a5eaf712d1dbb2c845df0f5ca67
Parents: b84fb41
Author: Robert Kanter <rk...@apache.org>
Authored: Fri Sep 11 11:42:50 2015 -0700
Committer: Robert Kanter <rk...@apache.org>
Committed: Fri Sep 11 11:46:10 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea4bb274/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index bf753f1..3246946 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -427,6 +427,9 @@ Release 2.8.0 - UNRELEASED
YARN-4086. Allow Aggregated Log readers to handle HAR files (rkanter)
+ YARN-4145. Make RMHATestBase abstract so its not run when running all
+ tests under that namespace (adhoot via rkanter)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea4bb274/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java
index 6f3666f..40b59ba 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java
@@ -45,7 +45,7 @@ import org.junit.Assert;
import org.junit.Before;
-public class RMHATestBase extends ClientBaseWithFixes{
+public abstract class RMHATestBase extends ClientBaseWithFixes{
private static final int ZK_TIMEOUT_MS = 5000;
private static StateChangeRequestInfo requestInfo =
[2/2] hadoop git commit: YARN-4115. Reduce loglevel of
ContainerManagementProtocolProxy to Debug (adhoot via rkanter)
Posted by rk...@apache.org.
YARN-4115. Reduce loglevel of ContainerManagementProtocolProxy to Debug (adhoot via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b84fb41b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b84fb41b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b84fb41b
Branch: refs/heads/trunk
Commit: b84fb41bb6ca2d69153cf5bd61f88492538ee713
Parents: 15a557f
Author: Robert Kanter <rk...@apache.org>
Authored: Fri Sep 11 11:41:39 2015 -0700
Committer: Robert Kanter <rk...@apache.org>
Committed: Fri Sep 11 11:46:10 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../api/impl/ContainerManagementProtocolProxy.java | 14 ++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b84fb41b/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index cc833e2..bf753f1 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -818,6 +818,9 @@ Release 2.8.0 - UNRELEASED
YARN-4106. NodeLabels for NM in distributed mode is not updated even after
clusterNodelabel addition in RM. (Bibin A Chundatt via wangda)
+ YARN-4115. Reduce loglevel of ContainerManagementProtocolProxy to Debug
+ (adhoot via rkanter)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b84fb41b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
index 94ebf0d..b2bce22 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/ContainerManagementProtocolProxy.java
@@ -106,8 +106,10 @@ public class ContainerManagementProtocolProxy {
while (proxy != null
&& !proxy.token.getIdentifier().equals(
nmTokenCache.getToken(containerManagerBindAddr).getIdentifier())) {
- LOG.info("Refreshing proxy as NMToken got updated for node : "
- + containerManagerBindAddr);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Refreshing proxy as NMToken got updated for node : "
+ + containerManagerBindAddr);
+ }
// Token is updated. check if anyone has already tried closing it.
if (!proxy.scheduledForClose) {
// try closing the proxy. Here if someone is already using it
@@ -187,7 +189,9 @@ public class ContainerManagementProtocolProxy {
ContainerManagementProtocolProxyData proxy) {
proxy.activeCallers--;
if (proxy.scheduledForClose && proxy.activeCallers < 0) {
- LOG.info("Closing proxy : " + proxy.containerManagerBindAddr);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Closing proxy : " + proxy.containerManagerBindAddr);
+ }
cmProxy.remove(proxy.containerManagerBindAddr);
try {
rpc.stopProxy(proxy.getContainerManagementProtocol(), conf);
@@ -257,7 +261,9 @@ public class ContainerManagementProtocolProxy {
final InetSocketAddress cmAddr =
NetUtils.createSocketAddr(containerManagerBindAddr);
- LOG.info("Opening proxy : " + containerManagerBindAddr);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Opening proxy : " + containerManagerBindAddr);
+ }
// the user in createRemoteUser in this context has to be ContainerID
UserGroupInformation user =
UserGroupInformation.createRemoteUser(containerId