AMBARI-14400. Spark server restart failed (java.lang.NumberFormatException) causing express upgrade to fail. (aonishuk)

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']
     })

ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml

@@ -18,6 +18,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>