ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-15572: Remove hdp hardcodings from ZEPPELIN (jluniya)
Date Thu, 24 Mar 2016 22:45:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 05c220415 -> 4a64727fb


AMBARI-15572: Remove hdp hardcodings from ZEPPELIN (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a64727f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a64727f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a64727f

Branch: refs/heads/trunk
Commit: 4a64727fb55e2462fece58511d63d732970de07d
Parents: 05c2204
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Thu Mar 24 15:45:30 2016 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Thu Mar 24 15:45:30 2016 -0700

----------------------------------------------------------------------
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml     |  2 +-
 .../ZEPPELIN/0.6.0.2.5/package/scripts/params.py          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a64727f/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index d99dc2b..ee0c48f 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -65,7 +65,7 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
 export JAVA_HOME={{java64_home}}
 
 # Additional jvm options. for example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g
-Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dhdp.version={{hdp_version}} -Dspark.executor.memory={{executor_mem}}
-Dspark.executor.instances={{executor_instances}} -Dspark.yarn.queue={{spark_queue}}"
+export ZEPPELIN_JAVA_OPTS="-Dhdp.version={{full_stack_version}} -Dspark.executor.memory={{executor_mem}}
-Dspark.executor.instances={{executor_instances}} -Dspark.yarn.queue={{spark_queue}}"
 
 
 # Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a64727f/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
index 615f63e..bf546d0 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py
@@ -41,13 +41,14 @@ def get_port_from_url(address):
 
 # server configurations
 config = Script.get_config()
+stack_root = Script.get_stack_root()
 
 # e.g. /var/lib/ambari-agent/cache/stacks/HDP/2.2/services/zeppelin-stack/package
 service_packagedir = os.path.realpath(__file__).split('/scripts')[0]
 
 zeppelin_dirname = 'zeppelin-server/lib'
 
-install_dir = '/usr/hdp/current'
+install_dir = os.path.join(stack_root, "current")
 executor_mem = config['configurations']['zeppelin-env']['zeppelin.executor.mem']
 executor_instances = config['configurations']['zeppelin-env'][
   'zeppelin.executor.instances']
@@ -56,7 +57,7 @@ spark_jar_dir = config['configurations']['zeppelin-env']['zeppelin.spark.jar.dir
 spark_jar = format("{spark_jar_dir}/zeppelin-spark-0.5.5-SNAPSHOT.jar")
 setup_view = True
 temp_file = config['configurations']['zeppelin-env']['zeppelin.temp.file']
-spark_home = "/usr/hdp/current/spark-client/"
+spark_home = os.path.join(stack_root, "current", "spark-client")
 
 try:
   fline = open(spark_home + "/RELEASE").readline().rstrip()
@@ -120,11 +121,10 @@ else:
 stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
 
 # e.g. 2.3.0.0
-hdp_stack_version = format_stack_version(stack_version_unformatted)
+stack_version_formatted = format_stack_version(stack_version_unformatted)
 
 # e.g. 2.3.0.0-2130
-full_version = default("/commandParams/version", None)
-hdp_version = full_version
+full_stack_version = default("/commandParams/version", None)
 
 spark_client_version = get_stack_version('spark-client')
 


Mime
View raw message