AMBARI-10742 - RU: HiveServer2 Cannot Deregister During Upgrade Due To Config Path Missing (jonathanhurley)

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py

@@ -50,7 +50,7 @@ def pre_upgrade_deregister():
     raise Fail('Unable to determine the current HiveServer2 version to deregister.')
 
   # deregister
-  command = 'hive --service hiveserver2 --deregister ' + current_hiveserver_version
+  command = format('hive --config {hive_server_conf_dir} --service hiveserver2 --deregister ' + current_hiveserver_version)
   Execute(command, user=params.hive_user, path=params.execute_path, tries=1 )
 
 

ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py

@@ -559,7 +559,7 @@ class TestHiveServer(RMFTestCase):
      call_mocks = [(0,"hive-server2 - 2.2.0.0-2041"), (0,"hive-server2 - 2.2.0.0-2041")]
     )
 
-    self.assertResourceCalled('Execute', 'hive --service hiveserver2 --deregister 2.2.0.0-2041',
+    self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server --service hiveserver2 --deregister 2.2.0.0-2041',
       path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'],
       tries=1, user='hive')