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/11/16 11:38:22 UTC
[1/2] ambari git commit: AMBARI-13900. RU: Failed to install new
stack on SLES (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e44cca7d2 -> 6b91b7125
refs/heads/trunk 888c8b2af -> d71f17d4e
AMBARI-13900. RU: Failed to install new stack on SLES (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d71f17d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d71f17d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d71f17d4
Branch: refs/heads/trunk
Commit: d71f17d4eb3073a7cc1d398e98ba1bc75e44fa09
Parents: 888c8b2
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Nov 16 12:37:15 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Nov 16 12:37:15 2015 +0200
----------------------------------------------------------------------
.../custom_actions/scripts/install_packages.py | 16 ++++++++++++++++
.../python/custom_actions/TestInstallPackages.py | 8 ++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d71f17d4/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 1dfaa54..0170806 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
@@ -287,6 +287,8 @@ class InstallPackages(Script):
# Install packages
packages_were_checked = False
try:
+ Package(self.get_base_packages_to_install())
+
packages_installed_before = []
allInstalledPackages(packages_installed_before)
packages_installed_before = [package[0] for package in packages_installed_before]
@@ -376,6 +378,20 @@ class InstallPackages(Script):
Logger.error("Caught signal {0}, will handle it gracefully. Compute the actual version if possible before exiting.".format(signum))
self.check_partial_install()
+ def get_base_packages_to_install(self):
+ """
+ HACK: list packages which should be installed without disabling any repos. (This is planned to fix in Ambari-2.2)
+ """
+ base_packages_to_install = ['fuse']
+
+ if OSCheck.is_suse_family() or OSCheck.is_ubuntu_family():
+ base_packages_to_install.append('libfuse2')
+ else:
+ base_packages_to_install.append('fuse-libs')
+
+ return base_packages_to_install
+
+
def filter_package_list(self, package_list):
"""
Note: that we have skipUpgrade option in metainfo.xml to filter packages,
http://git-wip-us.apache.org/repos/asf/ambari/blob/d71f17d4/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 83b6bb5..6d8c2f0 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -109,6 +109,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'fuse-libs')
self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
@@ -167,6 +169,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'libfuse2')
self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
@@ -228,6 +232,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'fuse-libs')
self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
@@ -360,6 +366,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'libfuse2')
self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
[2/2] ambari git commit: AMBARI-13900. RU: Failed to install new
stack on SLES (aonishuk)
Posted by ao...@apache.org.
AMBARI-13900. RU: Failed to install new stack on SLES (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b91b712
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b91b712
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b91b712
Branch: refs/heads/branch-2.1
Commit: 6b91b7125394ee11002b99a4b84ca365db7a1693
Parents: e44cca7
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Nov 16 12:37:17 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Nov 16 12:37:17 2015 +0200
----------------------------------------------------------------------
.../custom_actions/scripts/install_packages.py | 16 ++++++++++++++++
.../python/custom_actions/TestInstallPackages.py | 8 ++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b91b712/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 8fc9ab7..615228d 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
@@ -296,6 +296,8 @@ class InstallPackages(Script):
# Install packages
packages_were_checked = False
try:
+ Package(self.get_base_packages_to_install())
+
packages_installed_before = []
allInstalledPackages(packages_installed_before)
packages_installed_before = [package[0] for package in packages_installed_before]
@@ -385,6 +387,20 @@ class InstallPackages(Script):
Logger.error("Caught signal {0}, will handle it gracefully. Compute the actual version if possible before exiting.".format(signum))
self.check_partial_install()
+ def get_base_packages_to_install(self):
+ """
+ HACK: list packages which should be installed without disabling any repos. (This is planned to fix in Ambari-2.2)
+ """
+ base_packages_to_install = ['fuse']
+
+ if OSCheck.is_suse_family() or OSCheck.is_ubuntu_family():
+ base_packages_to_install.append('libfuse2')
+ else:
+ base_packages_to_install.append('fuse-libs')
+
+ return base_packages_to_install
+
+
def filter_package_list(self, package_list):
"""
Note: that we have skipUpgrade option in metainfo.xml to filter packages,
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b91b712/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 7feef96..ca57294 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -104,6 +104,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'fuse-libs')
self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
@@ -162,6 +164,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'libfuse2')
self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
@@ -223,6 +227,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'fuse-libs')
self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*'])
@@ -355,6 +361,8 @@ class TestInstallPackages(RMFTestCase):
mirror_list=None,
append_to_file=True,
)
+ self.assertResourceCalled('Package', 'fuse')
+ self.assertResourceCalled('Package', 'libfuse2')
self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])
self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[])