Repository: ambari Updated Branches: refs/heads/trunk 0061301ef -> ea8ed9f68
AMBARI-14400. Spark server restart failed (java.lang.NumberFormatException) causing express upgrade to fail. (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea8ed9f6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea8ed9f6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea8ed9f6 Branch: refs/heads/trunk Commit: ea8ed9f687a718bfdceb880a6c09db50bfade15f Parents: 0061301 Author: Andrew Onishuk <[email protected]> Authored: Wed Dec 16 20:10:26 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Wed Dec 16 20:10:26 2015 +0200 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.0.2.2/package/scripts/params.py | 3 +-- .../services/SPARK/configuration/spark-hive-site-override.xml | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ea8ed9f6/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py index 84ad34d..5e2c10c 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py @@ -103,7 +103,7 @@ spark_jobhistoryserver_hosts = default("/clusterHostInfo/spark_jobhistoryserver_ if len(spark_jobhistoryserver_hosts) > 0: spark_history_server_host = spark_jobhistoryserver_hosts[0] -else: +else:SPARK/1.2.0.2.2/package/scripts/params.py spark_history_server_host = "localhost" # spark-defaults params @@ -160,7 +160,6 @@ if has_spark_thriftserver and 'spark-thrift-sparkconf' in config['configurations # update default metastore client properties (async wait for metastore component) it is useful in case of # blueprint provisioning when hive-metastore and spark-thriftserver is not on the same host. spark_hive_properties.update({ - 'hive.metastore.client.connect.retry.delay' : config['configurations']['hive-site']['hive.metastore.client.connect.retry.delay'], 'hive.metastore.connect.retries' : config['configurations']['hive-site']['hive.metastore.connect.retries'], 'hive.metastore.client.socket.timeout' : config['configurations']['hive-site']['hive.metastore.client.socket.timeout'] }) http://git-wip-us.apache.org/repos/asf/ambari/blob/ea8ed9f6/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml index 54df516..d65c8b1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml @@ -19,6 +19,13 @@ limitations under the License. <configuration supports_final="true"> <property> + <name>hive.metastore.client.connect.retry.delay</name> + <value>5</value> + <description> + Expects a time value - number of seconds for the client to wait between consecutive connection attempts + </description> + </property> + <property> <name>hive.server2.thrift.port</name> <value>10015</value> <description>
