Merge pull request #48 from ValeryBaturin/branch-adh-1.4

ADH-154 and ADH-155
arenadata · Jul 20, 2017 · e5e4a65 · e5e4a65
2 parents 75e4f98 + f4f7be0
commit e5e4a65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/ambari-server/src/main/resources/stacks/ADH/1.4/services/HUE/package/scripts/setup_hue.py b/ambari-server/src/main/resources/stacks/ADH/1.4/services/HUE/package/scripts/setup_hue.py
@@ -9,17 +9,10 @@ def setup_hue():
   import status_params
   Logger.info("Configure Hue Service")
   # create the pid and log dir
-  Execute("mkdir -p --mode=0755 " + params.hue_log_dir + " " + params.hue_pid_dir) # NEW
-  Execute("chown " + params.hue_user + ":" + params.hue_group + " " + params.hue_log_dir + " " + params.hue_pid_dir) # NEW
-  Execute("ln -s /var/log/hue/ /usr/lib/hue/logs")
-  # CHANGE
-  # Directory([params.hue_log_dir, params.hue_pid_dir],
-  #      mode=0755,
-  #      cd_access='a',
-  #      owner=params.hue_user,
-  #      group=params.hue_group,
-  #      parents=True # CHANGE
-  #)
+  Execute("mkdir -p --mode=0755 " + params.hue_log_dir + " " + params.hue_pid_dir)
+  Execute("chown " + params.hue_user + ":" + params.hue_group + " " + params.hue_log_dir + " " + params.hue_pid_dir)
+  if not os.path.islink('/usr/lib/hue/logs/hue'):
+    Execute("ln -s /var/log/hue/ /usr/lib/hue/logs")
   File([params.hue_log_file, params.hue_server_pid_file],
     mode=0644,
     owner=params.hue_user,
@@ -28,7 +21,7 @@ def setup_hue():
   )
 
   Logger.info("Creating symlinks /usr/hdp/current/hadoop-client/lib/hue-plugins-3.11.0-SNAPSHOT.jar")
-  Link("{0}/desktop/libs/hadoop/java-lib/*".format(params.hue_dir),to = "/usr/lib") # CHANGE
+  Link("{0}/desktop/libs/hadoop/java-lib/*".format(params.hue_dir),to = "/usr/lib")
   Execute('find {0} -iname "*.sh" | xargs chmod +x'.format(params.service_packagedir))
   # Create a home directory for solr user on HDFS
   params.HdfsResource(params.hue_hdfs_home_dir,

diff --git a/ambari-server/src/main/resources/stacks/ADH/1.4/services/SPARK/configuration/spark-env.xml b/ambari-server/src/main/resources/stacks/ADH/1.4/services/SPARK/configuration/spark-env.xml
@@ -104,6 +104,8 @@ else
   export TEZ_CONF_DIR=
 fi
 
+export SPARK_MASTER_WEBUI_PORT=8082
+
 </value>
   </property>