You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/07/11 06:18:02 UTC
[22/50] [abbrv] git commit: SLIDER-134. Provide a default ZK node for
apps
SLIDER-134. Provide a default ZK node for apps
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9be2bdd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9be2bdd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9be2bdd7
Branch: refs/heads/master
Commit: 9be2bdd79b33b0561ed5ba87769b9a6471eb7473
Parents: f50ea0e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Jul 8 00:06:25 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Jul 8 00:06:25 2014 -0700
----------------------------------------------------------------------
app-packages/hbase/appConfig.json | 4 +--
.../org/apache/slider/client/SliderClient.java | 17 +++++++-----
slider-core/src/test/python/agent.py | 17 ++++++------
slider-core/src/test/python/agent/main.py | 27 ++++++++++----------
slider-core/src/test/python/echo.py | 21 +++++++--------
5 files changed, 47 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be2bdd7/app-packages/hbase/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig.json b/app-packages/hbase/appConfig.json
index 3a810f7..07187ec 100644
--- a/app-packages/hbase/appConfig.json
+++ b/app-packages/hbase/appConfig.json
@@ -10,7 +10,7 @@
"java_home": "/usr/jdk64/jdk1.7.0_45",
"package_list": "files/hbase-${hbase.version}-bin.tar.gz",
"site.global.app_user": "yarn",
- "site.global.app_log_dir": "app/log",
+ "site.global.app_log_dir": "${AGENT_LOG_ROOT}/app/log",
"site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.app_install_dir": "${AGENT_WORK_ROOT}/app/install",
@@ -44,7 +44,7 @@
"site.hbase-site.hbase.security.authentication": "simple",
"site.hbase-site.hbase.defaults.for.version.skip": "true",
"site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}",
- "site.hbase-site.zookeeper.znode.parent": "/hbase-unsecure",
+ "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}",
"site.hbase-site.hbase.hstore.blockingStoreFiles": "10",
"site.hbase-site.hbase.hregion.majorcompaction": "86400000",
"site.hbase-site.hbase.security.authorization": "false",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be2bdd7/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 286ebac..e762c1e 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -280,6 +280,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
protected boolean deleteZookeeperNode(String clusterName) throws YarnException, IOException {
String user = getUsername();
String zkPath = ZKIntegration.mkClusterPath(user, clusterName);
+ Exception e = null;
try {
Configuration config = getConfig();
if (!SliderUtils.isHadoopClusterSecure(config)) {
@@ -294,12 +295,16 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
} else {
log.warn("Default zookeeper node is not available for secure cluster");
}
- } catch (InterruptedException e) {
- log.warn("Unable to recursively delete zk node {}", zkPath, e);
- } catch (KeeperException e) {
- log.warn("Unable to recursively delete zk node {}", zkPath, e);
- } catch (BadConfigException e) {
- log.warn("Unable to recursively delete zk node {}", zkPath, e);
+ } catch (InterruptedException ignored) {
+ e = ignored;
+ } catch (KeeperException ignored) {
+ e = ignored;
+ } catch (BadConfigException ignored) {
+ e = ignored;
+ }
+ if (e != null) {
+ log.warn("Unable to recursively delete zk node {}", zkPath);
+ log.debug("Reason: ", e);
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be2bdd7/slider-core/src/test/python/agent.py
----------------------------------------------------------------------
diff --git a/slider-core/src/test/python/agent.py b/slider-core/src/test/python/agent.py
index 4be2cd9..4177074 100644
--- a/slider-core/src/test/python/agent.py
+++ b/slider-core/src/test/python/agent.py
@@ -21,21 +21,22 @@ import logging
import sys
import datetime
import time
-import argparse
+from optparse import OptionParser
import os
# A representative Agent code for the embedded agent
def main():
print "Executing echo"
- print 'Argument List: {}'.format(str(sys.argv))
+ print 'Argument List: {0}'.format(str(sys.argv))
- parser = argparse.ArgumentParser()
- parser.add_argument('--log', dest='log_folder', help='log destination')
- parser.add_argument('--config', dest='conf_folder', help='conf folder')
- args = parser.parse_args()
- if args.log_folder:
+ parser = OptionParser()
+ parser.add_option("--log", dest="log_folder", help="log destination")
+ parser.add_option("--config", dest="conf_folder", help="conf folder")
+ (options, args) = parser.parse_args()
+
+ if options.log_folder:
log_file_name = "echo" + str(datetime.datetime.now()) + ".log"
- log_file_path = os.path.join(args.log_folder, log_file_name)
+ log_file_path = os.path.join(options.log_folder, log_file_name)
logging.basicConfig(filename=log_file_path, level=logging.DEBUG)
print log_file_path
logging.debug('Starting echo script ...')
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be2bdd7/slider-core/src/test/python/agent/main.py
----------------------------------------------------------------------
diff --git a/slider-core/src/test/python/agent/main.py b/slider-core/src/test/python/agent/main.py
index fd8b262..573b9a7 100755
--- a/slider-core/src/test/python/agent/main.py
+++ b/slider-core/src/test/python/agent/main.py
@@ -21,25 +21,26 @@ import logging
import sys
import datetime
import time
-import argparse
+from optparse import OptionParser
import os
def main():
print "Executing echo"
- print 'Argument List: {}'.format(str(sys.argv))
-
- parser = argparse.ArgumentParser()
- parser.add_argument('--log', dest='log_folder', help='log destination')
- parser.add_argument('--config', dest='conf_folder', help='conf folder')
- parser.add_argument('--command', dest='command', help='command to execute')
- parser.add_argument('--label', dest='label', help='label')
- parser.add_argument('--host', dest='host', help='port')
- parser.add_argument('--port', dest='port', help='host')
- args = parser.parse_args()
- if args.log_folder:
+ print 'Argument List: {0}'.format(str(sys.argv))
+
+ parser = OptionParser()
+ parser.add_option("--log", dest="log_folder", help="log destination")
+ parser.add_option("--config", dest="conf_folder", help="conf folder")
+ parser.add_option('--command', dest='command', help='command to execute')
+ parser.add_option('--label', dest='label', help='label')
+ parser.add_option('--host', dest='host', help='port')
+ parser.add_option('--port', dest='port', help='host')
+ (options, args) = parser.parse_args()
+
+ if options.log_folder:
log_file_name = "echo" + str(datetime.datetime.now()) + ".log"
- log_file_path = os.path.join(args.log_folder, log_file_name)
+ log_file_path = os.path.join(options.log_folder, log_file_name)
logging.basicConfig(filename=log_file_path, level=logging.DEBUG)
print log_file_path
logging.debug('Starting echo script ...')
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9be2bdd7/slider-core/src/test/python/echo.py
----------------------------------------------------------------------
diff --git a/slider-core/src/test/python/echo.py b/slider-core/src/test/python/echo.py
index 2bcab20..ea5e8ce 100644
--- a/slider-core/src/test/python/echo.py
+++ b/slider-core/src/test/python/echo.py
@@ -21,22 +21,23 @@ import logging
import sys
import datetime
import time
-import argparse
+from optparse import OptionParser
import os
def main():
print "Executing echo"
- print 'Argument List: {}'.format(str(sys.argv))
-
- parser = argparse.ArgumentParser()
- parser.add_argument('--log', dest='log_folder', help='log destination')
- parser.add_argument('--config', dest='conf_folder', help='conf folder')
- parser.add_argument('--command', dest='command', help='command to execute')
- args = parser.parse_args()
- if args.log_folder:
+ print 'Argument List: {0}'.format(str(sys.argv))
+
+ parser = OptionParser()
+ parser.add_option("--log", dest="log_folder", help="log destination")
+ parser.add_option("--config", dest="conf_folder", help="conf folder")
+ parser.add_option('--command', dest='command', help='command to execute')
+ (options, args) = parser.parse_args()
+
+ if options.log_folder:
log_file_name = "echo" + str(datetime.datetime.now()) + ".log"
- log_file_path = os.path.join(args.log_folder, log_file_name)
+ log_file_path = os.path.join(options.log_folder, log_file_name)
logging.basicConfig(filename=log_file_path, level=logging.DEBUG)
print log_file_path
logging.debug('Starting echo script ...')