You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/12/30 11:27:33 UTC
ambari git commit: AMBARI-14523. RU: Mahout client restart failed on
one host -Ubuntu 12/14 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 0050787b8 -> 23a921bf0
AMBARI-14523. RU: Mahout client restart failed on one host -Ubuntu 12/14 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23a921bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23a921bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23a921bf
Branch: refs/heads/trunk
Commit: 23a921bf03c86aeb3af88892a38469ed4a06aa07
Parents: 0050787
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Dec 30 12:27:33 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Dec 30 12:27:33 2015 +0200
----------------------------------------------------------------------
.../custom_actions/scripts/install_packages.py | 8 +--
.../custom_actions/TestInstallPackages.py | 56 ++++++++++----------
2 files changed, 33 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/23a921bf/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index b1b4496..b28a5e0 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -334,7 +334,9 @@ class InstallPackages(Script):
# Install packages
packages_were_checked = False
try:
- Package('hdp-select', action="upgrade")
+ Package("hdp-select",
+ action="upgrade",
+ )
packages_installed_before = []
allInstalledPackages(packages_installed_before)
@@ -343,8 +345,8 @@ class InstallPackages(Script):
filtered_package_list = self.filter_package_list(package_list)
for package in filtered_package_list:
name = self.format_package_name(package['name'])
- Package(name
- # action="upgrade" # should we use "upgrade" action here, to upgrade not versioned packages?
+ Package(name,
+ action="upgrade" # this enables upgrading non-versioned packages, despite the fact they exist. Needed by 'mahout' which is non-version but have to be updated
)
except Exception, err:
ret_code = 1
http://git-wip-us.apache.org/repos/asf/ambari/blob/23a921bf/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index 679ae2a..4f9967f 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -111,13 +111,13 @@ class TestInstallPackages(RMFTestCase):
append_to_file=True,
)
self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"])
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885')
- self.assertResourceCalled('Package', 'snappy')
- self.assertResourceCalled('Package', 'snappy-devel')
- self.assertResourceCalled('Package', 'lzo')
- self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885')
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs')
- self.assertResourceCalled('Package', 'ambari-log4j')
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"])
+ self.assertResourceCalled('Package', 'lzo', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"])
+ self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"])
self.assertNoMoreResources()
@patch("ambari_commons.os_check.OSCheck.is_suse_family")
@@ -171,13 +171,13 @@ class TestInstallPackages(RMFTestCase):
append_to_file=True,
)
self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"])
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885')
- self.assertResourceCalled('Package', 'snappy')
- self.assertResourceCalled('Package', 'snappy-devel')
- self.assertResourceCalled('Package', 'lzo')
- self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885')
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs')
- self.assertResourceCalled('Package', 'ambari-log4j')
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"])
+ self.assertResourceCalled('Package', 'lzo', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"])
+ self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"])
self.assertNoMoreResources()
@@ -234,13 +234,13 @@ class TestInstallPackages(RMFTestCase):
append_to_file=True,
)
self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"])
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885')
- self.assertResourceCalled('Package', 'snappy')
- self.assertResourceCalled('Package', 'snappy-devel')
- self.assertResourceCalled('Package', 'lzo')
- self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885')
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs')
- self.assertResourceCalled('Package', 'ambari-log4j')
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"])
+ self.assertResourceCalled('Package', 'lzo', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"])
+ self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"])
self.assertNoMoreResources()
@@ -368,13 +368,13 @@ class TestInstallPackages(RMFTestCase):
append_to_file=True,
)
self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"])
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885')
- self.assertResourceCalled('Package', 'snappy')
- self.assertResourceCalled('Package', 'snappy-devel')
- self.assertResourceCalled('Package', 'lzo')
- self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885')
- self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs')
- self.assertResourceCalled('Package', 'ambari-log4j')
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy', action=["upgrade"])
+ self.assertResourceCalled('Package', 'snappy-devel', action=["upgrade"])
+ self.assertResourceCalled('Package', 'lzo', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885', action=["upgrade"])
+ self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs', action=["upgrade"])
+ self.assertResourceCalled('Package', 'ambari-log4j', action=["upgrade"])
self.assertNoMoreResources()