AMBARI-14523. RU: Mahout client restart failed on one host -Ubuntu 12/14 (aonishuk)

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

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()