[ambari] branch trunk updated: AMBARI-24086. Start of components fails if HDFS is not installed (aonishuk)

[aonishuk]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 92a3cc6  AMBARI-24086. Start of components fails if HDFS is not 
installed (aonishuk)
92a3cc6 is described below

commit 92a3cc61865365eb4ae1d35fc8adf0866258c282
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Wed Jun 13 09:06:34 2018 +0300

    AMBARI-24086. Start of components fails if HDFS is not installed (aonishuk)
---
 .../src/main/resources/stack-hooks/before-START/scripts/params.py       | 1 -
 .../resources/stack-hooks/before-START/scripts/shared_initialization.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py 
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
index 89fd942..e3fa476 100644
--- 
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
@@ -195,7 +195,6 @@ if has_namenode or dfs_type == 'HCFS':
   task_log4j_properties_location = os.path.join(hadoop_conf_dir, 
"task-log4j.properties")
 
 hadoop_pid_dir_prefix = 
config['configurations']['hadoop-env']['hadoop_pid_dir_prefix']
-hdfs_pid_dir = format("{hadoop_pid_dir_prefix}/{hdfs_user}")
 hdfs_log_dir_prefix = 
config['configurations']['hadoop-env']['hdfs_log_dir_prefix']
 hbase_tmp_dir = "/tmp/hbase-hbase"
 #db params
diff --git 
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/shared_initialization.py
index 5d68275..a0e6e09 100644
--- 
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/shared_initialization.py
@@ -51,7 +51,7 @@ def setup_hadoop():
               group='root',
               cd_access='a',
       )
-      Directory(params.hdfs_pid_dir,
+      Directory(format("{hadoop_pid_dir_prefix}/{hdfs_user}"),
               owner=params.hdfs_user,
               cd_access='a',
       )

-- 
To stop receiving notification emails like this one, please contact
aonis...@apache.org.