ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: AMBARI-10742 - RU: HiveServer2 Cannot Deregister During Upgrade Due To Config Path Missing (jonathanhurley)
Date Mon, 27 Apr 2015 19:38:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 14395f9b4 -> ea080a259


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


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

Branch: refs/heads/trunk
Commit: ea080a25966e5b18cd31a9c52bfd669d0dbae6b2
Parents: 14395f9
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Fri Apr 24 19:20:59 2015 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Mon Apr 27 15:38:16 2015 -0400

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py         | 2 +-
 .../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea080a25/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
index 4db3df6..0b29d6f 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
+++ b/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 )
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea080a25/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index cb67bd1..fc9ba66 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/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')
 


Mime
View raw message