This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new e1becd53bc AMBARI-25956: [ Rolling upgrade] Hive Server Going down
after upgrade (#3713)
e1becd53bc is described below
commit e1becd53bc6db70bdd86c0a58e820c58d3c6a29e
Author: Murali Krishna <muralikrishna.dm...@gmail.com>
AuthorDate: Mon Aug 7 03:57:59 2023 +0530
AMBARI-25956: [ Rolling upgrade] Hive Server Going down after upgrade
(#3713)
---
.../package/scripts/hive_server_upgrade.py | 5 ++++-
.../python/stacks/2.0.6/HIVE/test_hive_server.py | 24 ++++++++++++++++------
2 files changed, 22 insertions(+), 7 deletions(-)
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 1cb95ff963..272eb93d3c 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
@@ -26,6 +26,7 @@ from resource_management.core import shell
from resource_management.libraries.functions import format
from resource_management.libraries.functions import stack_select
from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions import upgrade_summary
from resource_management.libraries.functions.stack_features import
check_stack_feature
from resource_management.libraries.functions.version import
format_stack_version
@@ -105,9 +106,11 @@ def _get_current_hiveserver_version():
try:
# When downgrading the source version should be the version we are
downgrading from
- source_version = params.version_for_stack_feature_checks
if params.downgrade_from_version is not None:
source_version = params.downgrade_from_version
+ else:
+ source_version = upgrade_summary.get_source_version("HIVE",
+ default_version = params.version_for_stack_feature_checks)
hive_execute_path = _get_hive_execute_path(source_version)
version_hive_bin = params.hive_bin
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 5f06fdca31..d3b5a9ac09 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
@@ -834,16 +834,22 @@ class TestHiveServer(RMFTestCase):
@patch("resource_management.libraries.script.Script.post_start")
@patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs")
+
@patch("resource_management.libraries.functions.upgrade_summary.get_source_version",
new = MagicMock(return_value="1.2.1.2.2.1.0.2065"))
@patch("os.path.exists", new = MagicMock(return_value=True))
@patch("platform.linux_distribution", new = MagicMock(return_value="Linux"))
def test_stop_during_upgrade(self, copy_to_hdfs_mock, post_start_mock):
- hiveServerVersionOutput = """WARNING: Use "yarn jar" to launch YARN
applications.
+ hiveServerVersionOutput_before_upgrade = """WARNING: Use "yarn jar" to
launch YARN applications.
+Hive 1.2.1.2.2.1.0-2065
+Subversion
git://ip-10-0-0-90.ec2.internal/grid/0/jenkins/workspace/HDP-dal-centos6/bigtop/build/hive/rpm/BUILD/hive-1.2.1.2.2.1.0
-r a77a00ae765a73b2957337e96ed5a12122102065
+Compiled by jenkins on Sat Jun 20 11:50:41 EDT 2015
+From source with checksum 150f554beae04f76f814f12122102065"""
+ hiveServerVersionOutput_after_upgrade = """WARNING: Use "yarn jar" to
launch YARN applications.
Hive 1.2.1.2.3.0.0-2434
Subversion
git://ip-10-0-0-90.ec2.internal/grid/0/jenkins/workspace/HDP-dal-centos6/bigtop/build/hive/rpm/BUILD/hive-1.2.1.2.3.0.0
-r a77a00ae765a73b2957337e96ed5a0dbb2e60dfb
Compiled by jenkins on Sat Jun 20 11:50:41 EDT 2015
From source with checksum 150f554beae04f76f814f59549dead8b"""
- call_side_effects = [(0, hiveServerVersionOutput), (0,
hiveServerVersionOutput)] * 4
+ call_side_effects = [(0, hiveServerVersionOutput_before_upgrade), (0,
hiveServerVersionOutput_after_upgrade)]
copy_to_hdfs_mock.return_value = True
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hive_server.py",
@@ -854,7 +860,7 @@ From source with checksum
150f554beae04f76f814f59549dead8b"""
)
# ensure deregister is called
- self.assertResourceCalledIgnoreEarlier('Execute', 'hive --config
/usr/hdp/current/hive-server2/conf/conf.server --service hiveserver2
--deregister 1.2.1.2.3.0.0-2434',
+ self.assertResourceCalledIgnoreEarlier('Execute', 'hive --config
/usr/hdp/current/hive-server2/conf/conf.server --service hiveserver2
--deregister 1.2.1.2.2.1.0-2065',
path=['/bin:/usr/hdp/current/hive-server2/bin:mock_hadoop_dir'],
tries=1, user='hive')
@@ -870,13 +876,19 @@ From source with checksum
150f554beae04f76f814f59549dead8b"""
@patch("resource_management.libraries.script.Script.post_start")
@patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs")
+
@patch("resource_management.libraries.functions.upgrade_summary.get_source_version",
new = MagicMock(return_value="1.2.1.2.2.1.0.2065"))
def test_stop_during_upgrade_with_default_conf_server(self,
copy_to_hdfs_mock, post_start_mock):
- hiveServerVersionOutput = """WARNING: Use "yarn jar" to launch YARN
applications.
+ hiveServerVersionOutput_before_upgrade = """WARNING: Use "yarn jar" to
launch YARN applications.
+Hive 1.2.1.2.2.1.0-2065
+Subversion
git://ip-10-0-0-90.ec2.internal/grid/0/jenkins/workspace/HDP-dal-centos6/bigtop/build/hive/rpm/BUILD/hive-1.2.1.2.2.1.0
-r a77a00ae765a73b2957337e96ed5a12122102065
+Compiled by jenkins on Sat Jun 20 11:50:41 EDT 2015
+From source with checksum 150f554beae04f76f814f12122102065"""
+ hiveServerVersionOutput_after_upgrade = """WARNING: Use "yarn jar" to
launch YARN applications.
Hive 1.2.1.2.3.0.0-2434
Subversion
git://ip-10-0-0-90.ec2.internal/grid/0/jenkins/workspace/HDP-dal-centos6/bigtop/build/hive/rpm/BUILD/hive-1.2.1.2.3.0.0
-r a77a00ae765a73b2957337e96ed5a0dbb2e60dfb
Compiled by jenkins on Sat Jun 20 11:50:41 EDT 2015
From source with checksum 150f554beae04f76f814f59549dead8b"""
- call_side_effects = [(0, hiveServerVersionOutput), (0,
hiveServerVersionOutput)] * 4
+ call_side_effects = [(0, hiveServerVersionOutput_before_upgrade), (0,
hiveServerVersionOutput_after_upgrade)]
copy_to_hdfs_mock.return_value = True
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hive_server.py",
@@ -887,7 +899,7 @@ From source with checksum
150f554beae04f76f814f59549dead8b"""
)
# ensure that deregister is called
- self.assertResourceCalledIgnoreEarlier( 'Execute', 'hive --config
/usr/hdp/current/hive-server2/conf/conf.server --service hiveserver2
--deregister 1.2.1.2.3.0.0-2434',
+ self.assertResourceCalledIgnoreEarlier( 'Execute', 'hive --config
/usr/hdp/current/hive-server2/conf/conf.server --service hiveserver2
--deregister 1.2.1.2.2.1.0-2065',
path=['/bin:/usr/hdp/current/hive-server2/bin:mock_hadoop_dir'],
tries=1, user='hive')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
