Author: kasha
Date: Wed Jul 2 20:33:26 2014
New Revision: 1607473
URL: http://svn.apache.org/r1607473
Log:
YARN-2241. ZKRMStateStore: On startup, show nicer messages if znodes already
exist. (Robert Kanter via kasha)
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1607473&r1=1607472&r2=1607473&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Wed Jul 2 20:33:26 2014
@@ -215,6 +215,9 @@ Release 2.5.0 - UNRELEASED
TestContainersMonitor#testContainerKillOnMemoryOverflow.
(Anubhav Dhoot via kasha)
+ YARN-2241. ZKRMStateStore: On startup, show nicer messages if znodes
already
+ exist. (Robert Kanter via kasha)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java?rev=1607473&r1=1607472&r2=1607473&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
Wed Jul 2 20:33:26 2014
@@ -279,20 +279,21 @@ public class ZKRMStateStore extends RMSt
private void createRootDir(final String rootPath) throws Exception {
// For root dirs, we shouldn't use the doMulti helper methods
- try {
- new ZKAction<String>() {
- @Override
- public String run() throws KeeperException, InterruptedException {
+ new ZKAction<String>() {
+ @Override
+ public String run() throws KeeperException, InterruptedException {
+ try {
return zkClient.create(rootPath, null, zkAcl, CreateMode.PERSISTENT);
+ } catch (KeeperException ke) {
+ if (ke.code() == Code.NODEEXISTS) {
+ LOG.debug(rootPath + "znode already exists!");
+ return null;
+ } else {
+ throw ke;
+ }
}
- }.runWithRetries();
- } catch (KeeperException ke) {
- if (ke.code() == Code.NODEEXISTS) {
- LOG.debug(rootPath + "znode already exists!");
- } else {
- throw ke;
}
- }
+ }.runWithRetries();
}
private void logRootNodeAcls(String prefix) throws Exception {
