[22/50] [abbrv] hadoop git commit: YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha)
YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/166be0ee Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/166be0ee Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/166be0ee Branch: refs/heads/HDFS-9806 Commit: 166be0ee95d5ef976f074342656b289b41a11ccd Parents: f7faac8 Author: Karthik KambatlaAuthored: Tue May 9 14:44:16 2017 -0700 Committer: Karthik Kambatla Committed: Tue May 9 14:44:16 2017 -0700 -- .../hadoop/yarn/client/TestRMFailover.java | 5 +- ...ActiveStandbyElectorBasedElectorService.java | 5 +- .../server/resourcemanager/AdminService.java| 3 +- ...MCriticalThreadUncaughtExceptionHandler.java | 19 -- .../server/resourcemanager/RMFatalEvent.java| 67 ++-- .../resourcemanager/RMFatalEventType.java | 1 + .../server/resourcemanager/ResourceManager.java | 44 +++-- .../resourcemanager/recovery/RMStateStore.java | 12 ++-- .../recovery/TestMemoryRMStateStore.java| 2 + 9 files changed, 127 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/166be0ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java index d568d6a..5025c7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java @@ -54,6 +54,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.HATestUtil; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.RMCriticalThreadUncaughtExceptionHandler; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEvent; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEventType; import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer; import org.apache.hadoop.yarn.webapp.YarnWebParams; import org.junit.After; @@ -200,7 +202,8 @@ public class TestRMFailover extends ClientBaseWithFixes { // so it transitions to standby. ResourceManager rm = cluster.getResourceManager( cluster.getActiveRMIndex()); -rm.handleTransitionToStandByInNewThread(); +rm.getRMContext().getDispatcher().getEventHandler().handle( +new RMFatalEvent(RMFatalEventType.STATE_STORE_FENCED, "test")); verifyRMTransitionToStandby(rm); verifyConnections(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/166be0ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.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/ActiveStandbyElectorBasedElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java index 751eedd..b59bc25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java @@ -108,8 +108,9 @@ public class ActiveStandbyElectorBasedElectorService extends AbstractService elector.ensureParentZNode(); if (!isParentZnodeSafe(clusterId)) { - notifyFatalError(electionZNode + " znode has invalid data! "+ - "Might need formatting!"); + notifyFatalError(String.format("invalid data in znode, %s, " + + "which may require the state store to be reformatted", + electionZNode)); } super.serviceInit(conf);
[25/50] [abbrv] hadoop git commit: YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha)
YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/166be0ee Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/166be0ee Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/166be0ee Branch: refs/heads/HDFS-10467 Commit: 166be0ee95d5ef976f074342656b289b41a11ccd Parents: f7faac8 Author: Karthik KambatlaAuthored: Tue May 9 14:44:16 2017 -0700 Committer: Karthik Kambatla Committed: Tue May 9 14:44:16 2017 -0700 -- .../hadoop/yarn/client/TestRMFailover.java | 5 +- ...ActiveStandbyElectorBasedElectorService.java | 5 +- .../server/resourcemanager/AdminService.java| 3 +- ...MCriticalThreadUncaughtExceptionHandler.java | 19 -- .../server/resourcemanager/RMFatalEvent.java| 67 ++-- .../resourcemanager/RMFatalEventType.java | 1 + .../server/resourcemanager/ResourceManager.java | 44 +++-- .../resourcemanager/recovery/RMStateStore.java | 12 ++-- .../recovery/TestMemoryRMStateStore.java| 2 + 9 files changed, 127 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/166be0ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java index d568d6a..5025c7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java @@ -54,6 +54,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.HATestUtil; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.RMCriticalThreadUncaughtExceptionHandler; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEvent; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEventType; import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer; import org.apache.hadoop.yarn.webapp.YarnWebParams; import org.junit.After; @@ -200,7 +202,8 @@ public class TestRMFailover extends ClientBaseWithFixes { // so it transitions to standby. ResourceManager rm = cluster.getResourceManager( cluster.getActiveRMIndex()); -rm.handleTransitionToStandByInNewThread(); +rm.getRMContext().getDispatcher().getEventHandler().handle( +new RMFatalEvent(RMFatalEventType.STATE_STORE_FENCED, "test")); verifyRMTransitionToStandby(rm); verifyConnections(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/166be0ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.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/ActiveStandbyElectorBasedElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java index 751eedd..b59bc25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java @@ -108,8 +108,9 @@ public class ActiveStandbyElectorBasedElectorService extends AbstractService elector.ensureParentZNode(); if (!isParentZnodeSafe(clusterId)) { - notifyFatalError(electionZNode + " znode has invalid data! "+ - "Might need formatting!"); + notifyFatalError(String.format("invalid data in znode, %s, " + + "which may require the state store to be reformatted", + electionZNode)); } super.serviceInit(conf);
hadoop git commit: YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha)
Repository: hadoop Updated Branches: refs/heads/branch-2 f9ba4ef7d -> 3403ed314 YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha) (cherry picked from commit 166be0ee95d5ef976f074342656b289b41a11ccd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3403ed31 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3403ed31 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3403ed31 Branch: refs/heads/branch-2 Commit: 3403ed3148611009d73848dc4716fc7b8ac82760 Parents: f9ba4ef Author: Karthik KambatlaAuthored: Tue May 9 14:44:16 2017 -0700 Committer: Karthik Kambatla Committed: Tue May 9 14:44:39 2017 -0700 -- .../hadoop/yarn/client/TestRMFailover.java | 5 +- ...ActiveStandbyElectorBasedElectorService.java | 5 +- .../server/resourcemanager/AdminService.java| 3 +- ...MCriticalThreadUncaughtExceptionHandler.java | 19 -- .../server/resourcemanager/RMFatalEvent.java| 67 ++-- .../resourcemanager/RMFatalEventType.java | 1 + .../server/resourcemanager/ResourceManager.java | 44 +++-- .../resourcemanager/recovery/RMStateStore.java | 12 ++-- .../recovery/TestMemoryRMStateStore.java| 2 + 9 files changed, 127 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3403ed31/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java index 37ef017..75c285d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java @@ -54,6 +54,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.HATestUtil; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.RMCriticalThreadUncaughtExceptionHandler; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEvent; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEventType; import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer; import org.apache.hadoop.yarn.webapp.YarnWebParams; import org.junit.After; @@ -200,7 +202,8 @@ public class TestRMFailover extends ClientBaseWithFixes { // so it transitions to standby. ResourceManager rm = cluster.getResourceManager( cluster.getActiveRMIndex()); -rm.handleTransitionToStandByInNewThread(); +rm.getRMContext().getDispatcher().getEventHandler().handle( +new RMFatalEvent(RMFatalEventType.STATE_STORE_FENCED, "test")); verifyRMTransitionToStandby(rm); verifyConnections(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/3403ed31/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.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/ActiveStandbyElectorBasedElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java index 751eedd..b59bc25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java @@ -108,8 +108,9 @@ public class ActiveStandbyElectorBasedElectorService extends AbstractService elector.ensureParentZNode(); if (!isParentZnodeSafe(clusterId)) { - notifyFatalError(electionZNode + " znode has invalid data! "+ - "Might need formatting!"); + notifyFatalError(String.format("invalid data in znode, %s, " + + "which may require the state store to be reformatted", + electionZNode)); } super.serviceInit(conf);
hadoop git commit: YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha)
Repository: hadoop Updated Branches: refs/heads/trunk f7faac8e9 -> 166be0ee9 YARN-3742. YARN RM will shut down if ZKClient creation times out. (Daniel Templeton via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/166be0ee Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/166be0ee Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/166be0ee Branch: refs/heads/trunk Commit: 166be0ee95d5ef976f074342656b289b41a11ccd Parents: f7faac8 Author: Karthik KambatlaAuthored: Tue May 9 14:44:16 2017 -0700 Committer: Karthik Kambatla Committed: Tue May 9 14:44:16 2017 -0700 -- .../hadoop/yarn/client/TestRMFailover.java | 5 +- ...ActiveStandbyElectorBasedElectorService.java | 5 +- .../server/resourcemanager/AdminService.java| 3 +- ...MCriticalThreadUncaughtExceptionHandler.java | 19 -- .../server/resourcemanager/RMFatalEvent.java| 67 ++-- .../resourcemanager/RMFatalEventType.java | 1 + .../server/resourcemanager/ResourceManager.java | 44 +++-- .../resourcemanager/recovery/RMStateStore.java | 12 ++-- .../recovery/TestMemoryRMStateStore.java| 2 + 9 files changed, 127 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/166be0ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java index d568d6a..5025c7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java @@ -54,6 +54,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.HATestUtil; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.RMCriticalThreadUncaughtExceptionHandler; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEvent; +import org.apache.hadoop.yarn.server.resourcemanager.RMFatalEventType; import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer; import org.apache.hadoop.yarn.webapp.YarnWebParams; import org.junit.After; @@ -200,7 +202,8 @@ public class TestRMFailover extends ClientBaseWithFixes { // so it transitions to standby. ResourceManager rm = cluster.getResourceManager( cluster.getActiveRMIndex()); -rm.handleTransitionToStandByInNewThread(); +rm.getRMContext().getDispatcher().getEventHandler().handle( +new RMFatalEvent(RMFatalEventType.STATE_STORE_FENCED, "test")); verifyRMTransitionToStandby(rm); verifyConnections(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/166be0ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.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/ActiveStandbyElectorBasedElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java index 751eedd..b59bc25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ActiveStandbyElectorBasedElectorService.java @@ -108,8 +108,9 @@ public class ActiveStandbyElectorBasedElectorService extends AbstractService elector.ensureParentZNode(); if (!isParentZnodeSafe(clusterId)) { - notifyFatalError(electionZNode + " znode has invalid data! "+ - "Might need formatting!"); + notifyFatalError(String.format("invalid data in znode, %s, " + + "which may require the state store to be reformatted", + electionZNode)); } super.serviceInit(conf);