You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/03/01 11:25:44 UTC
ambari git commit: AMBARI-15233. Don't copy fast-hdfs-resource.jar if
sys_prepped (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 5e327065a -> 640fec717
AMBARI-15233. Don't copy fast-hdfs-resource.jar if sys_prepped (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/640fec71
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/640fec71
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/640fec71
Branch: refs/heads/branch-2.2
Commit: 640fec7175a13ecdaacb81b89b88f3b5666c0402
Parents: 5e32706
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Mar 1 12:24:36 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Mar 1 12:25:26 2016 +0200
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/package/scripts/ams_service.py | 2 +-
.../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 2 ++
.../2.0.6/hooks/before-START/scripts/shared_initialization.py | 4 +++-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/640fec71/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
index c9188c2..977b55a 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
@@ -111,4 +111,4 @@ def ams_service(name, action):
pass
pass
- pass
+ Logger.info(format("Component {name} finished action={action}."))
http://git-wip-us.apache.org/repos/asf/ambari/blob/640fec71/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index e60a471..dc71408 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -31,6 +31,8 @@ from resource_management.libraries.script.script import Script
config = Script.get_config()
+host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
+
stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
http://git-wip-us.apache.org/repos/asf/ambari/blob/640fec71/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index 3ee2178..ac9071e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -61,7 +61,9 @@ def setup_hadoop():
tc_owner = params.hdfs_user
# if WebHDFS is not enabled we need this jar to create hadoop folders.
- if not WebHDFSUtil.is_webhdfs_available(params.is_webhdfs_enabled, params.default_fs):
+ if params.host_sys_prepped:
+ print "Skipping copying of fast-hdfs-resource.jar as host is sys prepped"
+ elif not WebHDFSUtil.is_webhdfs_available(params.is_webhdfs_enabled, params.default_fs):
# for source-code of jar goto contrib/fast-hdfs-resource
File(format("{ambari_libs_dir}/fast-hdfs-resource.jar"),
mode=0644,