You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/07/12 18:49:11 UTC
[1/4] ambari git commit: AMBARI-21446. Force-remove package does not
work on CentOS 6 and SuSE 11
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 a6ac40bc0 -> da44c5c1a
AMBARI-21446. Force-remove package does not work on CentOS 6 and SuSE 11
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b000119b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b000119b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b000119b
Branch: refs/heads/branch-2.5
Commit: b000119b6216a5bac0657c8534f759589a581dda
Parents: cb86bf0
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed Jul 12 11:13:46 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Wed Jul 12 20:15:00 2017 +0200
----------------------------------------------------------------------
.../src/test/python/resource_management/TestPackageResource.py | 4 ++--
.../python/resource_management/core/providers/package/yumrpm.py | 2 +-
.../python/resource_management/core/providers/package/zypper.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b000119b/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 bc1bfeb..51a35eb 100644
--- a/ambari-agent/src/test/python/resource_management/TestPackageResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestPackageResource.py
@@ -228,7 +228,7 @@ class TestPackageResource(TestCase):
logoutput = False,
ignore_dependencies = True
)
- shell_mock.assert_called_with(['/usr/bin/rpm', '-e', '--nodeps', 'some_package'], logoutput=False, sudo=True)
+ shell_mock.assert_called_with(['rpm', '-e', '--nodeps', 'some_package'], logoutput=False, sudo=True)
@patch.object(shell, "call", new = MagicMock(return_value=(0, None)))
@patch.object(shell, "checked_call")
@@ -256,7 +256,7 @@ class TestPackageResource(TestCase):
logoutput = False,
ignore_dependencies = True
)
- shell_mock.assert_called_with(['/usr/bin/rpm', '-e', '--nodeps', 'some_package'], logoutput=False, sudo=True)
+ shell_mock.assert_called_with(['rpm', '-e', '--nodeps', 'some_package'], logoutput=False, sudo=True)
@patch.object(shell, "call", new = MagicMock(return_value=(0, None)))
@patch.object(shell, "checked_call")
http://git-wip-us.apache.org/repos/asf/ambari/blob/b000119b/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 064b504..a2f0533 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
@@ -36,7 +36,7 @@ REMOVE_CMD = {
False: ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', 'erase'],
}
-REMOVE_WITHOUT_DEPENDENCIES_CMD = ['/usr/bin/rpm', '-e', '--nodeps']
+REMOVE_WITHOUT_DEPENDENCIES_CMD = ['rpm', '-e', '--nodeps']
REPO_UPDATE_CMD = ['/usr/bin/yum', 'clean','metadata']
http://git-wip-us.apache.org/repos/asf/ambari/blob/b000119b/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py b/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
index c1aab60..f3abdb5 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
@@ -35,7 +35,7 @@ REMOVE_CMD = {
False: ['/usr/bin/zypper', '--quiet', 'remove', '--no-confirm'],
}
-REMOVE_WITHOUT_DEPENDENCIES_CMD = ['/usr/bin/rpm', '-e', '--nodeps']
+REMOVE_WITHOUT_DEPENDENCIES_CMD = ['rpm', '-e', '--nodeps']
REPO_UPDATE_CMD = ['/usr/bin/zypper', 'clean']
[4/4] ambari git commit: Merge branch 'branch-feature-AMBARI-21348'
into branch-2.5
Posted by jo...@apache.org.
Merge branch 'branch-feature-AMBARI-21348' into branch-2.5
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da44c5c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da44c5c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da44c5c1
Branch: refs/heads/branch-2.5
Commit: da44c5c1a5476b78887cd7729d0efc5afbf0dae9
Parents: a6ac40b 267cd8b
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Jul 12 14:47:40 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Jul 12 14:47:40 2017 -0400
----------------------------------------------------------------------
.../ambari/server/controller/internal/UpgradeResourceProvider.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[2/4] ambari git commit: AMBARI-21449. Stack upgrade with pre-req
checks enabled fails due to NPE
Posted by jo...@apache.org.
AMBARI-21449. Stack upgrade with pre-req checks enabled fails due to NPE
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8529282
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8529282
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8529282
Branch: refs/heads/branch-2.5
Commit: d8529282845d1980c4fd39ad83055cb96eddf79e
Parents: b000119
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed Jul 12 15:00:12 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Wed Jul 12 20:19:19 2017 +0200
----------------------------------------------------------------------
.../ambari/server/controller/internal/UpgradeResourceProvider.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8529282/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 1130026..d09551a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -2097,6 +2097,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
Direction direction = upgradeContext.getDirection();
Map<String, Object> requestMap = upgradeContext.getUpgradeRequest();
UpgradeType upgradeType = upgradeContext.getType();
+ String stackId = upgradeContext.getTargetStackId().getStackId();
String version = (String) requestMap.get(UPGRADE_REPO_VERSION);
boolean skipPrereqChecks = Boolean.parseBoolean((String) requestMap.get(UPGRADE_SKIP_PREREQUISITE_CHECKS));
@@ -2125,6 +2126,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID).equals(cluster.getClusterName()).and().property(
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_REPOSITORY_VERSION_PROPERTY_ID).equals(version).and().property(
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_UPGRADE_TYPE_PROPERTY_ID).equals(upgradeType).and().property(
+ PreUpgradeCheckResourceProvider.UPGRADE_CHECK_TARGET_STACK_ID).equals(stackId).and().property(
PreUpgradeCheckResourceProvider.UPGRADE_CHECK_UPGRADE_PACK_PROPERTY_ID).equals(preferredUpgradePack).toPredicate();
Request preUpgradeCheckRequest = PropertyHelper.getReadRequest();
[3/4] ambari git commit: Merge branch 'branch-2.5' into
branch-feature-AMBARI-21348
Posted by jo...@apache.org.
Merge branch 'branch-2.5' into branch-feature-AMBARI-21348
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/267cd8b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/267cd8b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/267cd8b0
Branch: refs/heads/branch-2.5
Commit: 267cd8b0cee17dc84be2b075b7168cd2518f02b6
Parents: d852928 a6ac40b
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Jul 12 14:46:40 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Jul 12 14:46:40 2017 -0400
----------------------------------------------------------------------
.../libraries/functions/stack_features.py | 28 ++--
.../actionmanager/ExecutionCommandWrapper.java | 3 +-
.../ambari/server/agent/ExecutionCommand.java | 14 +-
.../controller/ActionExecutionContext.java | 30 +++--
.../controller/AmbariActionExecutionHelper.java | 8 +-
.../ClusterStackVersionResourceProvider.java | 2 +-
.../internal/UpgradeResourceProvider.java | 107 +++++++++-------
.../upgrades/FinalizeUpgradeAction.java | 18 +--
.../upgrades/UpgradeUserKerberosDescriptor.java | 41 ++----
.../ambari/server/state/UpgradeContext.java | 31 +++--
.../ambari/server/topology/AmbariContext.java | 30 ++++-
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 12 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 3 +
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 3 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 2 +
.../SPARK/1.2.1/package/scripts/params.py | 11 +-
.../SPARK/1.2.1/package/scripts/setup_spark.py | 6 +-
.../1.2.1/package/scripts/spark_service.py | 6 +-
.../BigInsights/4.2.5/role_command_order.json | 12 +-
.../BigInsights/4.2.5/services/stack_advisor.py | 53 --------
.../BigInsights/4.2/role_command_order.json | 3 +-
.../4.2/services/SYSTEMML/metainfo.xml | 77 -----------
.../SYSTEMML/package/scripts/__init__.py | 19 ---
.../services/SYSTEMML/package/scripts/params.py | 40 ------
.../SYSTEMML/package/scripts/service_check.py | 43 -------
.../SYSTEMML/package/scripts/systemml_client.py | 49 -------
.../services/TITAN/configuration/titan-env.xml | 48 -------
.../TITAN/configuration/titan-hbase-solr.xml | 67 ----------
.../TITAN/configuration/titan-log4j.xml | 66 ----------
.../4.2/services/TITAN/kerberos.json | 17 ---
.../BigInsights/4.2/services/TITAN/metainfo.xml | 88 -------------
.../TITAN/package/files/titanSmoke.groovy | 20 ---
.../services/TITAN/package/scripts/params.py | 128 -------------------
.../TITAN/package/scripts/service_check.py | 64 ----------
.../4.2/services/TITAN/package/scripts/titan.py | 70 ----------
.../TITAN/package/scripts/titan_client.py | 58 ---------
.../resources/stacks/HDP/2.6/repos/repoinfo.xml | 6 +-
.../services/HIVE/configuration/hive-site.xml | 35 +++++
.../ComponentVersionCheckActionTest.java | 1 -
.../upgrades/UpgradeActionTest.java | 2 -
.../UpgradeUserKerberosDescriptorTest.java | 19 +--
.../src/test/python/TestStackFeature.py | 44 +++++--
.../python/custom_actions/test_ru_set_all.py | 6 +-
.../stacks/2.0.6/HIVE/test_hive_server.py | 2 +
.../test/python/stacks/2.0.6/configs/nn_eu.json | 2 +-
.../stacks/2.0.6/configs/nn_eu_standby.json | 2 +-
.../2.1/configs/hive-metastore-upgrade.json | 2 +-
.../python/stacks/2.2/configs/knox_upgrade.json | 2 +-
ambari-web/app/controllers/main/service.js | 13 +-
ambari-web/app/utils/ajax/ajax.js | 22 ++++
.../test/controllers/main/service_test.js | 4 +-
51 files changed, 321 insertions(+), 1118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/267cd8b0/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------