You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/02 15:25:52 UTC
[40/50] git commit: SLIDER-598. HBase application package for Windows
SLIDER-598. HBase application package for Windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/48d6bd2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/48d6bd2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/48d6bd2d
Branch: refs/heads/feature/SLIDER-531-registry-enhancements
Commit: 48d6bd2d62716b77210506bd07bd9754b26658ce
Parents: 9c2080b
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Oct 31 19:04:40 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Oct 31 19:04:40 2014 -0700
----------------------------------------------------------------------
app-packages/hbase-win/README.txt | 2 +-
app-packages/hbase-win/appConfig-default.json | 4 ++--
app-packages/hbase-win/package/scripts/hbase.py | 5 -----
app-packages/hbase-win/package/scripts/hbase_service.py | 1 -
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/appConfig-secured-default.json | 2 +-
slider-agent/src/main/python/agent/ActionQueue.py | 3 ++-
.../libraries/functions/check_process_status.py | 7 ++++++-
8 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/app-packages/hbase-win/README.txt
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/README.txt b/app-packages/hbase-win/README.txt
index 4e0e30a..a413e76 100644
--- a/app-packages/hbase-win/README.txt
+++ b/app-packages/hbase-win/README.txt
@@ -27,7 +27,7 @@ with appropriate parameters.
Command:
mvn clean package -Phbase-app-package-win -Dpkg.version=<version>
- -Dpkg.name=<file name of app tarball> -Dpkg.src=<folder location where the pkg is available>
+ -Dpkg.name=<file name of app zip file> -Dpkg.src=<folder location where the pkg is available>
Example:
mvn clean package -Phbase-app-package -Dpkg.version=0.98.5-hadoop2
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/app-packages/hbase-win/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json
index a802fed..069e2b7 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -14,12 +14,12 @@
"site.global.user_group": "hadoop",
"site.global.monitor_protocol": "http",
"site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;",
- "site.global.java_library_path": "c:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\bin",
+ "site.global.java_library_path": "c:\\hdp\\hadoop\\bin",
"site.hbase-env.hbase_master_heapsize": "1024m",
"site.hbase-env.hbase_regionserver_heapsize": "1024m",
"site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}",
- "site.hbase-site.hbase.superuser": "yarn",
+ "site.hbase-site.hbase.superuser": "hadoop",
"site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp",
"site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local",
"site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/app-packages/hbase-win/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/package/scripts/hbase.py b/app-packages/hbase-win/package/scripts/hbase.py
index 5ae64eb..0962149 100644
--- a/app-packages/hbase-win/package/scripts/hbase.py
+++ b/app-packages/hbase-win/package/scripts/hbase.py
@@ -28,20 +28,15 @@ def hbase(name=None # 'master' or 'regionserver'
import params
Directory( params.conf_dir,
- owner = params.hbase_user,
- group = params.user_group,
recursive = True,
content = params.input_conf_files_dir
)
Directory (params.tmp_dir,
- owner = params.hbase_user,
recursive = True
)
Directory (os.path.join(params.local_dir, "jars"),
- owner = params.hbase_user,
- group = params.user_group,
recursive = True
)
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/app-packages/hbase-win/package/scripts/hbase_service.py
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/package/scripts/hbase_service.py b/app-packages/hbase-win/package/scripts/hbase_service.py
index c02526c..4a1f103 100644
--- a/app-packages/hbase-win/package/scripts/hbase_service.py
+++ b/app-packages/hbase-win/package/scripts/hbase_service.py
@@ -41,7 +41,6 @@ def hbase_service(
process_cmd = format("{java64_home}\\bin\\java {rest_of_the_command} {main_class} {action}")
Execute(process_cmd,
- user=params.hbase_user,
logoutput=False,
wait_for_finish=False,
pid_file=pid_file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/app-packages/hbase/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json
index 44e7c82..a36a693 100644
--- a/app-packages/hbase/appConfig-default.json
+++ b/app-packages/hbase/appConfig-default.json
@@ -40,7 +40,7 @@
},
"components": {
"slider-appmaster": {
- "jvm.heapsize": "256M"
+ "jvm.heapsize": "1024M"
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/app-packages/hbase/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-secured-default.json b/app-packages/hbase/appConfig-secured-default.json
index ebe4137..19bc04a 100644
--- a/app-packages/hbase/appConfig-secured-default.json
+++ b/app-packages/hbase/appConfig-secured-default.json
@@ -54,7 +54,7 @@
},
"components": {
"slider-appmaster": {
- "jvm.heapsize": "256M",
+ "jvm.heapsize": "1024M",
"slider.hdfs.keytab.dir": ".slider/keytabs/hbase",
"slider.am.login.keytab.name": "${USER_NAME}.headless.keytab",
"slider.keytab.principal.name": "${USER_NAME}"
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/slider-agent/src/main/python/agent/ActionQueue.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/agent/ActionQueue.py b/slider-agent/src/main/python/agent/ActionQueue.py
index b19f65f..4cb5de7 100644
--- a/slider-agent/src/main/python/agent/ActionQueue.py
+++ b/slider-agent/src/main/python/agent/ActionQueue.py
@@ -151,9 +151,10 @@ class ActionQueue(threading.Thread):
store_config = 'true' == command['commandParams'][ActionQueue.STORE_APPLIED_CONFIG]
store_command = False
if 'roleParams' in command and ActionQueue.AUTO_RESTART in command['roleParams']:
- logger.info("Component has indicated auto-restart. Saving details from START command.")
store_command = 'true' == command['roleParams'][ActionQueue.AUTO_RESTART]
+ if store_command:
+ logger.info("Component has indicated auto-restart. Saving details from START command.")
# running command
commandresult = self.customServiceOrchestrator.runCommand(command,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48d6bd2d/slider-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/resource_management/libraries/functions/check_process_status.py b/slider-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
index e17b5f7..ff359de 100644
--- a/slider-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
+++ b/slider-agent/src/main/python/resource_management/libraries/functions/check_process_status.py
@@ -41,12 +41,17 @@ def check_process_status(pid_file):
@param pid_file: path to service pid file
"""
if not pid_file or not os.path.isfile(pid_file):
+ if not pid_file:
+ Logger.warn("pid_file is not valid")
+ else:
+ Logger.info("pid file does not exist {0}".format(pid_file,))
raise ComponentIsNotRunning()
+
with open(pid_file, "r") as f:
try:
pid = int(f.read())
except:
- Logger.debug("Pid file {0} does not exist".format(pid_file))
+ Logger.debug("Pid file {0} does not exist".format(pid_file,))
raise ComponentIsNotRunning()
if IS_WINDOWS: