Selaa lähdekoodia

AMBARI-15233. Don't copy fast-hdfs-resource.jar if sys_prepped (aonishuk)

Andrew Onishuk 9 vuotta sitten
vanhempi
commit
2ca2e97346

+ 2 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py

@@ -32,6 +32,8 @@ from resource_management.libraries.resources.hdfs_resource import HdfsResource
 
 
 config = Script.get_config()
 config = Script.get_config()
 
 
+host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
+
 stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
 stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
 hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
 hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
 
 

+ 3 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py

@@ -62,7 +62,9 @@ def setup_hadoop():
       tc_owner = params.hdfs_user
       tc_owner = params.hdfs_user
       
       
     # if WebHDFS is not enabled we need this jar to create hadoop folders.
     # if WebHDFS is not enabled we need this jar to create hadoop folders.
-    if params.dfs_type == 'HCFS' or 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 params.dfs_type == 'HCFS' or not WebHDFSUtil.is_webhdfs_available(params.is_webhdfs_enabled, params.default_fs):
       # for source-code of jar goto contrib/fast-hdfs-resource
       # for source-code of jar goto contrib/fast-hdfs-resource
       File(format("{ambari_libs_dir}/fast-hdfs-resource.jar"),
       File(format("{ambari_libs_dir}/fast-hdfs-resource.jar"),
            mode=0644,
            mode=0644,