Repository: ambari Updated Branches: refs/heads/branch-1.7.0 0ac8df37c -> 9b7b32d27 refs/heads/trunk 6fc532bc4 -> b935b50b6
AMBARI-8073. HostCleanup.py issues with HDP-2.2 on SuSe and Ubuntu (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b935b50b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b935b50b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b935b50b Branch: refs/heads/trunk Commit: b935b50b62f63a210b25cfc6ddf3df2672f54602 Parents: 6fc532b Author: Andrew Onishuk <[email protected]> Authored: Fri Oct 31 20:16:48 2014 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Fri Oct 31 20:16:48 2014 +0200 ---------------------------------------------------------------------- ambari-agent/src/main/python/ambari_agent/HostInfo.py | 1 + .../src/test/python/resource_management/TestPackageResource.py | 6 +++--- .../python/resource_management/core/providers/package/apt.py | 2 +- .../resource_management/core/providers/package/yumrpm.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b935b50b/ambari-agent/src/main/python/ambari_agent/HostInfo.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py b/ambari-agent/src/main/python/ambari_agent/HostInfo.py index 9a02027..892da63 100644 --- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py +++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py @@ -80,6 +80,7 @@ class HostInfo: # Packages that are used to find repos (then repos are used to find other packages) PACKAGES = [ + "hadoop_2_2_*","hadoop-2-2-.*","zookeeper_2_2_*","zookeeper-2-2-.*", "hadoop", "zookeeper", "webhcat", "*-manager-server-db", "*-manager-daemons" ] http://git-wip-us.apache.org/repos/asf/ambari/blob/b935b50b/ambari-agent/src/test/python/resource_management/TestPackageResource.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/resource_management/TestPackageResource.py b/ambari-agent/src/test/python/resource_management/TestPackageResource.py index 7ec7494..8a680dd 100644 --- a/ambari-agent/src/test/python/resource_management/TestPackageResource.py +++ b/ambari-agent/src/test/python/resource_management/TestPackageResource.py @@ -35,7 +35,7 @@ class TestPackageResource(TestCase): with Environment('/') as env: Package("some_package", ) - call_mock.assert_has_calls([call("dpkg --get-selections | grep ^some-package | grep -v deinstall"), + call_mock.assert_has_calls([call("dpkg --get-selections | grep ^some-package$ | grep -v deinstall"), call("DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef'" " --allow-unauthenticated --assume-yes install some-package"), call("apt-get update -qq") @@ -52,7 +52,7 @@ class TestPackageResource(TestCase): with Environment('/') as env: Package("some_package", ) - call_mock.assert_has_calls([call("dpkg --get-selections | grep ^some-package | grep -v deinstall"), + call_mock.assert_has_calls([call("dpkg --get-selections | grep ^some-package$ | grep -v deinstall"), call("DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef'" " --allow-unauthenticated --assume-yes install some-package") ]) @@ -69,7 +69,7 @@ class TestPackageResource(TestCase): with Environment('/') as env: Package("some_package", ) - call_mock.assert_called_with('rpm -qa | grep ^some_package') + call_mock.assert_called_with('rpm -qa some_package') shell_mock.assert_called_with("/usr/bin/yum -d 0 -e 0 -y install some_package") @patch.object(shell, "call") http://git-wip-us.apache.org/repos/asf/ambari/blob/b935b50b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py index e71361b..9346b3e 100644 --- a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py +++ b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py @@ -26,7 +26,7 @@ from resource_management.core.logger import Logger INSTALL_CMD = "DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -q -o Dpkg::Options::='--force-confdef' --allow-unauthenticated --assume-yes install %s" REPO_UPDATE_CMD = "apt-get update -qq" REMOVE_CMD = "/usr/bin/apt-get -y -q remove %s" -CHECK_CMD = "dpkg --get-selections | grep ^%s | grep -v deinstall" +CHECK_CMD = "dpkg --get-selections | grep ^%s$ | grep -v deinstall" def replace_underscores(function_to_decorate): def wrapper(*args): http://git-wip-us.apache.org/repos/asf/ambari/blob/b935b50b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py index a53fadc..c878dab 100644 --- a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py +++ b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py @@ -26,7 +26,7 @@ from resource_management.core.logger import Logger INSTALL_CMD = "/usr/bin/yum -d 0 -e 0 -y install %s" REMOVE_CMD = "/usr/bin/yum -d 0 -e 0 -y erase %s" -CHECK_CMD = "rpm -qa | grep ^%s" +CHECK_CMD = "rpm -qa %s" class YumProvider(PackageProvider): def install_package(self, name):
