Repository: ambari Updated Branches: refs/heads/branch-2.1 7effdec2a -> 2799e9aab refs/heads/trunk bd2bf2543 -> 4b20e5c1a
AMBARI-14020. devdeploy failures on spark start (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b20e5c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b20e5c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b20e5c1 Branch: refs/heads/trunk Commit: 4b20e5c1ade0e70b6027c92737af476af77ada65 Parents: bd2bf25 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Nov 23 19:20:03 2015 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Nov 23 19:20:03 2015 +0200 ---------------------------------------------------------------------- .../SPARK/1.2.0.2.2/package/scripts/status_params.py | 2 +- .../src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4b20e5c1/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py index 2272c72..19c9a0e 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/status_params.py @@ -34,4 +34,4 @@ else: spark_pid_dir = config['configurations']['spark-env']['spark_pid_dir'] spark_history_server_pid_file = format("{spark_pid_dir}/spark-{spark_user}-org.apache.spark.deploy.history.HistoryServer-1.pid") -spark_thrift_server_pid_file = format("{spark_pid_dir}/spark-{spark_user}-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid") +spark_thrift_server_pid_file = format("{spark_pid_dir}/spark-{hive_user}-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid") http://git-wip-us.apache.org/repos/asf/ambari/blob/4b20e5c1/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py index 0ad5956..253c5f8 100644 --- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py +++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py @@ -55,7 +55,7 @@ class TestSparkThriftServer(RMFTestCase): self.assert_configure_default() self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/start-thriftserver.sh --properties-file /usr/hdp/current/spark-client/conf/spark-thrift-sparkconf.conf --driver-memory 1g', environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, - not_if = 'ls /var/run/spark/spark-spark-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid >/dev/null 2>&1 && ps -p `cat /var/run/spark/spark-spark-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid` >/dev/null 2>&1', + not_if = 'ls /var/run/spark/spark-hive-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid >/dev/null 2>&1 && ps -p `cat /var/run/spark/spark-hive-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid` >/dev/null 2>&1', user = 'hive', ) self.assertNoMoreResources() @@ -72,7 +72,7 @@ class TestSparkThriftServer(RMFTestCase): environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, user = 'hive', ) - self.assertResourceCalled('File', '/var/run/spark/spark-spark-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid', + self.assertResourceCalled('File', '/var/run/spark/spark-hive-org.apache.spark.sql.hive.thriftserver.HiveThriftServer2-1.pid', action = ['delete'], ) self.assertNoMoreResources()
