You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/03/02 23:09:19 UTC
[1/2] ambari git commit: AMBARI-9877. RU: Install fails due to
metrics collector (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 639a714bf -> 9fde7f81a
refs/heads/trunk 434885c76 -> 94c55e865
AMBARI-9877. RU: Install fails due to metrics collector (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/94c55e86
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/94c55e86
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/94c55e86
Branch: refs/heads/trunk
Commit: 94c55e865058f4730480f53c044c909b5c9d2525
Parents: 434885c
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Mar 3 00:08:15 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Mar 3 00:08:15 2015 +0200
----------------------------------------------------------------------
.../src/main/resources/custom_actions/scripts/install_packages.py | 3 +++
.../src/test/python/custom_actions/TestInstallPackages.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/94c55e86/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 ed46ec3..5819390 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
@@ -207,6 +207,9 @@ class InstallPackages(Script):
# mysql* package logic is managed at HIVE scripts
if package['name'].startswith('mysql'):
continue
+ # Ambari metrics packages should not be upgraded during RU
+ if package['name'].startswith('ambari-metrics'):
+ continue
filtered_package_list.append(package)
return filtered_package_list
http://git-wip-us.apache.org/repos/asf/ambari/blob/94c55e86/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 717a44b..4975757 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -272,7 +272,7 @@ class TestInstallPackages(RMFTestCase):
config_dict['roleParams']['package_list'] = '[{\"name\":\"mysql-connector-java\"},{\"name\":\"hive_2_2_*\"},' \
'{\"name\":\"hive_2_2_*-hcatalog\"},{\"name\":\"hive_2_2_*-webhcat\"},' \
- '{\"name\":\"mysql\"},{\"name\":\"mysql-client\"}]'
+ '{\"name\":\"mysql\"},{\"name\":\"mysql-client\"}, {\"name\":\"ambari-metrics-collector\"}]'
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",
[2/2] ambari git commit: AMBARI-9877. RU: Install fails due to
metrics collector (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-9877. RU: Install fails due to metrics collector (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9fde7f81
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9fde7f81
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9fde7f81
Branch: refs/heads/branch-2.0.0
Commit: 9fde7f81aa6bca637da75aa38c3dd1f1761d6ef8
Parents: 639a714
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Mar 3 00:08:15 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Mar 3 00:09:01 2015 +0200
----------------------------------------------------------------------
.../src/main/resources/custom_actions/scripts/install_packages.py | 3 +++
.../src/test/python/custom_actions/TestInstallPackages.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fde7f81/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 ed46ec3..5819390 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
@@ -207,6 +207,9 @@ class InstallPackages(Script):
# mysql* package logic is managed at HIVE scripts
if package['name'].startswith('mysql'):
continue
+ # Ambari metrics packages should not be upgraded during RU
+ if package['name'].startswith('ambari-metrics'):
+ continue
filtered_package_list.append(package)
return filtered_package_list
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fde7f81/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 717a44b..4975757 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -272,7 +272,7 @@ class TestInstallPackages(RMFTestCase):
config_dict['roleParams']['package_list'] = '[{\"name\":\"mysql-connector-java\"},{\"name\":\"hive_2_2_*\"},' \
'{\"name\":\"hive_2_2_*-hcatalog\"},{\"name\":\"hive_2_2_*-webhcat\"},' \
- '{\"name\":\"mysql\"},{\"name\":\"mysql-client\"}]'
+ '{\"name\":\"mysql\"},{\"name\":\"mysql-client\"}, {\"name\":\"ambari-metrics-collector\"}]'
self.executeScript("scripts/install_packages.py",
classname="InstallPackages",