ambari git commit: AMBARI-14217: RU: Spark install failed after upgrade (Dmitro Lisnichenko via jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 9c55694e1 -> 4c9026b34
AMBARI-14217: RU: Spark install failed after upgrade (Dmitro Lisnichenko via
jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c9026b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c9026b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c9026b3
Branch: refs/heads/branch-2.2
Commit: 4c9026b341e3fc93e5fdde439b7ad4354ce0c854
Parents: 9c55694
Author: Jayush Luniya
Authored: Mon Dec 7 21:41:14 2015 -0800
Committer: Jayush Luniya
Committed: Mon Dec 7 21:42:14 2015 -0800
--
.../TestRepositoryResource.py | 50 +++-
.../libraries/providers/repository.py | 37 +++
2 files changed, 76 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c9026b3/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
index 8f2b55a..96c2ef7 100644
--- a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
@@ -129,7 +129,55 @@ class TestRepositoryResource(TestCase):
self.assertEqual(expected_template_arguments,
template_item.context._dict)
self.assertEqual(RHEL_SUSE_DEFAULT_TEMPLATE, template)
-
+
+
+@patch.object(OSCheck, "is_suse_family")
+@patch.object(OSCheck, "is_ubuntu_family")
+@patch.object(OSCheck, "is_redhat_family")
+@patch.object(System, "os_family", new='suse')
+@patch("resource_management.libraries.providers.repository.File")
+@patch("resource_management.libraries.providers.repository.checked_call")
+@patch("resource_management.core.sudo.read_file")
+@patch("os.path.isfile", new=MagicMock(return_value=True))
+def test_recreate_repo_suse(self, read_file_mock, checked_call_mock,
file_mock,
+ is_redhat_family, is_ubuntu_family,
is_suse_family):
+is_redhat_family.return_value = False
+is_ubuntu_family.return_value = False
+is_suse_family.return_value = True
+read_file_mock.return_value = "Dummy repo file contents"
+checked_call_mock.return_value = 0, "Flushing zypper cache"
+with Environment('/') as env:
+ with patch.object(repository, "__file__",
new='/ambari/test/repo/dummy/path/file'):
+# Check that zypper cache is flushed
+Repository('hadoop',
+ base_url='http://download.base_url.org/rpm/',
+
mirror_list='https://mirrors.base_url.org/?repo=Repository&arch=$basearch',
+ repo_template = RHEL_SUSE_DEFAULT_TEMPLATE,
+ repo_file_name='Repository')
+
+self.assertTrue(checked_call_mock.called)
+
+expected_repo_file_content =
"[hadoop]\nname=hadoop\nmirrorlist=https://mirrors.base_url.org/?repo=Repository&arch=$basearch\n\npath=/\nenabled=1\ngpgcheck=0";
+template = file_mock.call_args[1]['content']
+self.assertEqual(expected_repo_file_content, template)
+
+# Check that if content is equal, zypper cache is not flushed
+checked_call_mock.reset_mock()
+read_file_mock.return_value = expected_repo_file_content
+
+Repository('hadoop',
+ base_url='http://download.base_url.org/rpm/',
+
mirror_list='https://mirrors.base_url.org/?repo=Repository&arch=$basearch',
+ repo_template = RHEL_SUSE_DEFAULT_TEMPLATE,
+ repo_file_name='Repository')
+
+self.assertFalse(checked_call_mock.called)
+
+expected_repo_file_content =
"[hadoop]\nname=hadoop\nmirrorlist=https://mirrors.base_url.org/?repo=Repository&arch=$basearch\n\npath=/\nenabled=1\ngpgcheck=0";
+template = file_mock.call_args[1]['content']
+self.assertEqual(expected_repo_file_content, template)
+
+
@patch.object(OSCheck, "is_suse_family")
@patch.object(OSCheck, "is_ubuntu_family")
@patch.object(OSCheck, "is_redhat_family")
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c9026b3/ambari-common/src/main/python/resource_management/libraries/providers/repository.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/providers/repository.py
b/ambari-common/src/main/python/resource_management/libraries/providers/reposito
ambari git commit: AMBARI-14217: RU: Spark install failed after upgrade (Dmitro Lisnichenko via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 858d3fc11 -> 751cb1439
AMBARI-14217: RU: Spark install failed after upgrade (Dmitro Lisnichenko via
jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/751cb143
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/751cb143
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/751cb143
Branch: refs/heads/trunk
Commit: 751cb14399a6527f342284b5130515d24ea3711d
Parents: 858d3fc
Author: Jayush Luniya
Authored: Mon Dec 7 21:41:14 2015 -0800
Committer: Jayush Luniya
Committed: Mon Dec 7 21:41:14 2015 -0800
--
.../TestRepositoryResource.py | 50 +++-
.../libraries/providers/repository.py | 37 +++
2 files changed, 76 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/751cb143/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
index b3e2291..a69b57b 100644
--- a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
@@ -136,7 +136,55 @@ class TestRepositoryResource(TestCase):
self.assertEqual(expected_template_arguments,
template_item.context._dict)
self.assertEqual(RHEL_SUSE_DEFAULT_TEMPLATE, template)
-
+
+
+@patch.object(OSCheck, "is_suse_family")
+@patch.object(OSCheck, "is_ubuntu_family")
+@patch.object(OSCheck, "is_redhat_family")
+@patch.object(System, "os_family", new='suse')
+@patch("resource_management.libraries.providers.repository.File")
+@patch("resource_management.libraries.providers.repository.checked_call")
+@patch("resource_management.core.sudo.read_file")
+@patch("os.path.isfile", new=MagicMock(return_value=True))
+def test_recreate_repo_suse(self, read_file_mock, checked_call_mock,
file_mock,
+ is_redhat_family, is_ubuntu_family,
is_suse_family):
+is_redhat_family.return_value = False
+is_ubuntu_family.return_value = False
+is_suse_family.return_value = True
+read_file_mock.return_value = "Dummy repo file contents"
+checked_call_mock.return_value = 0, "Flushing zypper cache"
+with Environment('/') as env:
+ with patch.object(repository, "__file__",
new='/ambari/test/repo/dummy/path/file'):
+# Check that zypper cache is flushed
+Repository('hadoop',
+ base_url='http://download.base_url.org/rpm/',
+
mirror_list='https://mirrors.base_url.org/?repo=Repository&arch=$basearch',
+ repo_template = RHEL_SUSE_DEFAULT_TEMPLATE,
+ repo_file_name='Repository')
+
+self.assertTrue(checked_call_mock.called)
+
+expected_repo_file_content =
"[hadoop]\nname=hadoop\nmirrorlist=https://mirrors.base_url.org/?repo=Repository&arch=$basearch\n\npath=/\nenabled=1\ngpgcheck=0";
+template = file_mock.call_args[1]['content']
+self.assertEqual(expected_repo_file_content, template)
+
+# Check that if content is equal, zypper cache is not flushed
+checked_call_mock.reset_mock()
+read_file_mock.return_value = expected_repo_file_content
+
+Repository('hadoop',
+ base_url='http://download.base_url.org/rpm/',
+
mirror_list='https://mirrors.base_url.org/?repo=Repository&arch=$basearch',
+ repo_template = RHEL_SUSE_DEFAULT_TEMPLATE,
+ repo_file_name='Repository')
+
+self.assertFalse(checked_call_mock.called)
+
+expected_repo_file_content =
"[hadoop]\nname=hadoop\nmirrorlist=https://mirrors.base_url.org/?repo=Repository&arch=$basearch\n\npath=/\nenabled=1\ngpgcheck=0";
+template = file_mock.call_args[1]['content']
+self.assertEqual(expected_repo_file_content, template)
+
+
@patch.object(OSCheck, "is_suse_family")
@patch.object(OSCheck, "is_ubuntu_family")
@patch.object(OSCheck, "is_redhat_family")
http://git-wip-us.apache.org/repos/asf/ambari/blob/751cb143/ambari-common/src/main/python/resource_management/libraries/providers/repository.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/providers/repository.py
b/ambari-common/src/main/python/resource_management/libraries/providers/repository.py
inde
ambari git commit: AMBARI-14237: UT failure: UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer (jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 cbd2e8964 -> 9c55694e1
AMBARI-14237: UT failure:
UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer
(jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c55694e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c55694e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c55694e
Branch: refs/heads/branch-2.2
Commit: 9c55694e130d7208b57f3b458722a3c9cd22772e
Parents: cbd2e89
Author: Jayush Luniya
Authored: Mon Dec 7 21:22:00 2015 -0800
Committer: Jayush Luniya
Committed: Mon Dec 7 21:22:00 2015 -0800
--
.../UpgradeResourceProviderHDP22Test.java | 30 +++-
1 file changed, 10 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c55694e/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
index 2ef1aa0..b0e3467 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
@@ -87,14 +87,6 @@ import com.google.inject.util.Modules;
*/
public class UpgradeResourceProviderHDP22Test {
- /**
- * Server-side Actions still require a host in the cluster, so just use the
- * local hostname when adding any host to the cluster. This prevents all
sorts
- * of problems when creating stages and tasks since the hosts in the cluster
- * will now match the localhost.
- */
- private String s_serverHostName = StageUtils.getHostName();
-
private UpgradeDAO upgradeDao = null;
private RepositoryVersionDAO repoVersionDao = null;
private Injector injector;
@@ -135,16 +127,15 @@ public class UpgradeResourceProviderHDP22Test {
expect(configHelper.getEffectiveConfigAttributes(EasyMock.anyObject(Cluster.class),
EasyMock.anyObject(Map.class))).andReturn(
new HashMap>>()).anyTimes();
-
expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class),
-EasyMock.eq(s_serverHostName))).andReturn(new HashMap>() {
+
expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class),
EasyMock.eq("h1"))).andReturn(new HashMap>() {
{
put("hive-site", new HashMap() {
{
-put("tag", configTagVersion2);
+put("tag", configTagVersion1);
}
});
}
-}).anyTimes();
+}).times(3);
expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class),
EasyMock.eq("h1"))).andReturn(new HashMap>() {
{
@@ -154,7 +145,7 @@ public class UpgradeResourceProviderHDP22Test {
}
});
}
-}).anyTimes();
+}).times(2);
expect(configHelper.getEffectiveConfigProperties(EasyMock.anyObject(Cluster.class),
EasyMock.anyObject(Map.class))).andReturn(
new HashMap>() {
@@ -168,7 +159,7 @@ public class UpgradeResourceProviderHDP22Test {
{
put("hive-site", configTagVersion2Properties);
}
-}).anyTimes();
+}).times(2);
expect(configHelper.getMergedConfig(EasyMock.anyObject(Map.class),
EasyMock.anyObject(Map.class))).andReturn(new HashMap()).anyTimes();
@@ -222,8 +213,8 @@ public class UpgradeResourceProviderHDP22Test {
cluster.createClusterVersion(stackId, stackId.getStackVersion(), "admin",
RepositoryVersionState.UPGRADING);
cluster.transitionClusterVersion(stackId, stackId.getStackVersion(),
RepositoryVersionState.CURRENT);
-clusters.addHost(s_serverHostName);
-Host host = clusters.getHost(s_serverHostName);
+clusters.addHost("h1");
+Host host = clusters.getHost("h1");
Map hostAttributes = new HashMap();
hostAttributes.put("os_family", "redhat");
hostAttributes.put("os_release_version", "6.3");
@@ -231,7 +222,7 @@ public class UpgradeResourceProviderHDP22Test {
host.setState(HostState.HEALTHY);
host.persist();
-clusters.mapHostToCluster(s_serverHostName, "c1");
+clusters.mapHostToCluster("h1", "c1");
// add a single HIVE server
Service service = cluster.addService("HIVE");
@@ -239,11 +230,11 @@ public class UpgradeResourceProviderHDP22Test {
service.persist();
ServiceComponent component = service.addServiceComponent("HIVE_SERVER");
-ServiceComponentHost sch =
component.addS
ambari git commit: AMBARI-14208. Update hawq_dfs_url with nameservice when hawq is installed on a ha cluster( Bhuvnesh Chaudhary via odiachenko).
Repository: ambari
Updated Branches:
refs/heads/trunk 53fb588f2 -> 858d3fc11
AMBARI-14208. Update hawq_dfs_url with nameservice when hawq is installed on a
ha cluster( Bhuvnesh Chaudhary via odiachenko).
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/858d3fc1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/858d3fc1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/858d3fc1
Branch: refs/heads/trunk
Commit: 858d3fc11b0f0c5cd93617a409b8613bd78f3803
Parents: 53fb588
Author: Oleksandr Diachenko
Authored: Mon Dec 7 18:04:03 2015 -0800
Committer: Oleksandr Diachenko
Committed: Mon Dec 7 18:04:03 2015 -0800
--
.../app/controllers/wizard/step7_controller.js | 17 ++---
ambari-web/test/controllers/wizard/step7_test.js | 6 ++
2 files changed, 20 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/858d3fc1/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index c9d3da7..c64a039 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -915,12 +915,23 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
{
serviceName: 'ACCUMULO',
configToUpdate: 'instance.volumes'
+ },
+ {
+serviceName: 'HAWQ',
+configToUpdate: 'hawq_dfs_url',
+regexPattern: /(^.*:[0-9]+)(?=\/)/,
+replacementValue: nameServiceId.get('value')
}
]).forEach(function (c) {
if (selectedServiceNames.contains(c.serviceName) && nameServiceId) {
-var cfg = serviceConfigs.findProperty('serviceName',
c.serviceName).configs.findProperty('name', c.configToUpdate),
- newValue = cfg.get('value').replace(/\/\/.*:[0-9]+/i, '//' +
nameServiceId.get('value'));
-
+var cfg = serviceConfigs.findProperty('serviceName',
c.serviceName).configs.findProperty('name', c.configToUpdate);
+var regexPattern = /\/\/.*:[0-9]+/i;
+var replacementValue = '//' + nameServiceId.get('value');
+if (typeof(c.regexPattern) !== "undefined" &&
typeof(c.replacementValue) !== "undefined") {
+ regexPattern = c.regexPattern;
+ replacementValue = c.replacementValue;
+}
+var newValue = cfg.get('value').replace(regexPattern,
replacementValue);
cfg.setProperties({
value: newValue,
recommendedValue: newValue
http://git-wip-us.apache.org/repos/asf/ambari/blob/858d3fc1/ambari-web/test/controllers/wizard/step7_test.js
--
diff --git a/ambari-web/test/controllers/wizard/step7_test.js
b/ambari-web/test/controllers/wizard/step7_test.js
index bba552a..e904a48 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1608,6 +1608,12 @@ describe('App.InstallerStep7Controller', function () {
configToUpdate: 'instance.volumes',
oldValue: 'hdfs://localhost:8020/apps/accumulo/data',
expectedNewValue: 'hdfs://' + dfsNameservices + '/apps/accumulo/data'
+ },
+ {
+serviceName: 'HAWQ',
+configToUpdate: 'hawq_dfs_url',
+oldValue: 'localhost:8020/hawq_data',
+expectedNewValue: dfsNameservices + '/hawq_data'
}
]).forEach(function (test) {
it(test.serviceName + ' ' + test.configToUpdate, function () {
ambari git commit: AMBARI-14257 : Storm metrics do not work after upgrading Ambari to 2.1.2. (Aravindan Vijayan via swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 80ffae6b1 -> 53fb588f2
AMBARI-14257 : Storm metrics do not work after upgrading Ambari to 2.1.2.
(Aravindan Vijayan via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53fb588f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53fb588f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53fb588f
Branch: refs/heads/trunk
Commit: 53fb588f27fcda6791ac440dc170cb01b89cf498
Parents: 80ffae6
Author: Siddharth Wagle
Authored: Mon Dec 7 16:49:04 2015 -0800
Committer: Siddharth Wagle
Committed: Mon Dec 7 16:49:04 2015 -0800
--
.../src/main/python/resource_management/core/providers/system.py | 2 +-
.../common-services/STORM/0.9.1.2.1/package/scripts/storm.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/53fb588f/ambari-common/src/main/python/resource_management/core/providers/system.py
--
diff --git
a/ambari-common/src/main/python/resource_management/core/providers/system.py
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index a3b01f0..4e6a122 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -204,7 +204,7 @@ class LinkProvider(Provider):
def action_delete(self):
path = self.resource.path
-if sudo.path_exists(path):
+if sudo.path_lexists(path):
Logger.info("Deleting %s" % self.resource)
sudo.unlink(path)
http://git-wip-us.apache.org/repos/asf/ambari/blob/53fb588f/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
index 51998fa..4e97c65 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
@@ -95,7 +95,7 @@ def storm(name=None):
)
# Remove symlink. It can be there, if you doing upgrade from HDP < 2.2 to
HDP >= 2.2
-Link("/usr/lib/storm/lib/ambari-metrics-storm-sink.jar",
+Link(format("{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
action="delete")
Execute(format("{sudo} ln -s {metric_collector_sink_jar}
{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
ambari git commit: AMBARI-14257 : Storm metrics do not work after upgrading Ambari to 2.1.2. (Aravindan Vijayan via swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 4d0260231 -> cbd2e8964
AMBARI-14257 : Storm metrics do not work after upgrading Ambari to 2.1.2.
(Aravindan Vijayan via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cbd2e896
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cbd2e896
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cbd2e896
Branch: refs/heads/branch-2.2
Commit: cbd2e896475c2d28bd7dd5613451eb8ff5f3354b
Parents: 4d02602
Author: Siddharth Wagle
Authored: Mon Dec 7 16:48:44 2015 -0800
Committer: Siddharth Wagle
Committed: Mon Dec 7 16:48:44 2015 -0800
--
.../src/main/python/resource_management/core/providers/system.py | 2 +-
.../common-services/STORM/0.9.1.2.1/package/scripts/storm.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbd2e896/ambari-common/src/main/python/resource_management/core/providers/system.py
--
diff --git
a/ambari-common/src/main/python/resource_management/core/providers/system.py
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index a3b01f0..4e6a122 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -204,7 +204,7 @@ class LinkProvider(Provider):
def action_delete(self):
path = self.resource.path
-if sudo.path_exists(path):
+if sudo.path_lexists(path):
Logger.info("Deleting %s" % self.resource)
sudo.unlink(path)
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbd2e896/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
index 51998fa..4e97c65 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
@@ -95,7 +95,7 @@ def storm(name=None):
)
# Remove symlink. It can be there, if you doing upgrade from HDP < 2.2 to
HDP >= 2.2
-Link("/usr/lib/storm/lib/ambari-metrics-storm-sink.jar",
+Link(format("{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
action="delete")
Execute(format("{sudo} ln -s {metric_collector_sink_jar}
{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
ambari git commit: AMBARI-14241: RU on non-HDFS filesystems, native commands like hdfs dfsadmin fail (jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 893955a59 -> 4d0260231
AMBARI-14241: RU on non-HDFS filesystems, native commands like hdfs dfsadmin
fail (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d026023
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d026023
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d026023
Branch: refs/heads/branch-2.2
Commit: 4d02602314f61235220323cbd392b508523b14c2
Parents: 893955a
Author: Jayush Luniya
Authored: Mon Dec 7 15:17:20 2015 -0800
Committer: Jayush Luniya
Committed: Mon Dec 7 15:21:11 2015 -0800
--
.../package/scripts/datanode_upgrade.py | 17 +++--
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 8 +-
.../package/scripts/journalnode_upgrade.py | 4 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 13 ++--
.../package/scripts/namenode_upgrade.py | 28 +++
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 18 -
.../package/scripts/nodemanager_upgrade.py | 4 +-
.../python/stacks/2.0.6/HDFS/test_datanode.py | 32 +++-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 79 ++--
9 files changed, 164 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4d026023/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
index 6138f8c..8f36001 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
@@ -24,6 +24,7 @@ from resource_management.core.resources.system import Execute
from resource_management.core import shell
from resource_management.libraries.functions import format
from resource_management.libraries.functions.decorator import retry
+from utils import get_dfsadmin_base_command
def pre_rolling_upgrade_shutdown(hdfs_binary):
@@ -41,7 +42,8 @@ def pre_rolling_upgrade_shutdown(hdfs_binary):
if params.security_enabled:
Execute(params.dn_kinit_cmd, user = params.hdfs_user)
- command = format('{hdfs_binary} dfsadmin -shutdownDatanode
{dfs_dn_ipc_address} upgrade')
+ dfsadmin_base_command = get_dfsadmin_base_command(hdfs_binary)
+ command = format('{dfsadmin_base_command} -shutdownDatanode
{dfs_dn_ipc_address} upgrade')
code, output = shell.call(command, user=params.hdfs_user)
if code == 0:
@@ -93,7 +95,8 @@ def _check_datanode_shutdown(hdfs_binary):
# override stock retry timeouts since after 30 seconds, the datanode is
# marked as dead and can affect HBase during RU
- command = format('{hdfs_binary} dfsadmin -D ipc.client.connect.max.retries=5
-D ipc.client.connect.retry.interval=1000 -getDatanodeInfo
{dfs_dn_ipc_address}')
+ dfsadmin_base_command = get_dfsadmin_base_command(hdfs_binary)
+ command = format('{dfsadmin_base_command} -D
ipc.client.connect.max.retries=5 -D ipc.client.connect.retry.interval=1000
-getDatanodeInfo {dfs_dn_ipc_address}')
try:
Execute(command, user=params.hdfs_user, tries=1)
@@ -109,22 +112,26 @@ def _check_datanode_shutdown(hdfs_binary):
def _check_datanode_startup(hdfs_binary):
"""
Checks that a DataNode is reported as being alive via the
- "hdfs dfsadmin -report -live" command. Once the DataNode is found to be
+ "hdfs dfsadmin -fs {namenode_address} -report -live" command. Once the
DataNode is found to be
alive this method will return, otherwise it will raise a Fail(...) and retry
automatically.
:param hdfs_binary: name/path of the HDFS binary to use
:return:
"""
import params
+ import socket
try:
-command = format('{hdfs_binary} dfsadmin -report -live')
+dfsadmin_base_command = get_dfsadmin_base_command(hdfs_binary)
+command = dfsadmin_base_command + ' -report -live'
return_code, hdfs_output = shell.call(command, user=params.hdfs_user)
except:
raise Fail('Unable to determine if the DataNode has started after
upgrade.')
if return_code == 0:
-if params.hostname.lower() in hdfs_output.lower():
+hostname = params.hostname.lower()
+hostname_ip = socket.gethostbyname(params.hostname.lower())
+if hostname in hdfs_output.lower() or hostname_ip in hdfs_output.lower():
Logger.info("DataNode {0} reports that it has rejoined the
cluster.".format(params.hostname))
return
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/4d026023/ambari-server/src/
ambari git commit: AMBARI-14241: RU on non-HDFS filesystems, native commands like hdfs dfsadmin fail (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk f65486346 -> 80ffae6b1
AMBARI-14241: RU on non-HDFS filesystems, native commands like hdfs dfsadmin
fail (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80ffae6b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80ffae6b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80ffae6b
Branch: refs/heads/trunk
Commit: 80ffae6b1183f957a2277c5a10b58809631da089
Parents: f654863
Author: Jayush Luniya
Authored: Mon Dec 7 15:17:20 2015 -0800
Committer: Jayush Luniya
Committed: Mon Dec 7 15:17:20 2015 -0800
--
.../package/scripts/datanode_upgrade.py | 17 +++--
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 8 +-
.../package/scripts/journalnode_upgrade.py | 4 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 13 ++--
.../package/scripts/namenode_upgrade.py | 28 +++
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 18 -
.../package/scripts/nodemanager_upgrade.py | 4 +-
.../python/stacks/2.0.6/HDFS/test_datanode.py | 32 +++-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 79 ++--
9 files changed, 164 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/80ffae6b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
index 6138f8c..8f36001 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/datanode_upgrade.py
@@ -24,6 +24,7 @@ from resource_management.core.resources.system import Execute
from resource_management.core import shell
from resource_management.libraries.functions import format
from resource_management.libraries.functions.decorator import retry
+from utils import get_dfsadmin_base_command
def pre_rolling_upgrade_shutdown(hdfs_binary):
@@ -41,7 +42,8 @@ def pre_rolling_upgrade_shutdown(hdfs_binary):
if params.security_enabled:
Execute(params.dn_kinit_cmd, user = params.hdfs_user)
- command = format('{hdfs_binary} dfsadmin -shutdownDatanode
{dfs_dn_ipc_address} upgrade')
+ dfsadmin_base_command = get_dfsadmin_base_command(hdfs_binary)
+ command = format('{dfsadmin_base_command} -shutdownDatanode
{dfs_dn_ipc_address} upgrade')
code, output = shell.call(command, user=params.hdfs_user)
if code == 0:
@@ -93,7 +95,8 @@ def _check_datanode_shutdown(hdfs_binary):
# override stock retry timeouts since after 30 seconds, the datanode is
# marked as dead and can affect HBase during RU
- command = format('{hdfs_binary} dfsadmin -D ipc.client.connect.max.retries=5
-D ipc.client.connect.retry.interval=1000 -getDatanodeInfo
{dfs_dn_ipc_address}')
+ dfsadmin_base_command = get_dfsadmin_base_command(hdfs_binary)
+ command = format('{dfsadmin_base_command} -D
ipc.client.connect.max.retries=5 -D ipc.client.connect.retry.interval=1000
-getDatanodeInfo {dfs_dn_ipc_address}')
try:
Execute(command, user=params.hdfs_user, tries=1)
@@ -109,22 +112,26 @@ def _check_datanode_shutdown(hdfs_binary):
def _check_datanode_startup(hdfs_binary):
"""
Checks that a DataNode is reported as being alive via the
- "hdfs dfsadmin -report -live" command. Once the DataNode is found to be
+ "hdfs dfsadmin -fs {namenode_address} -report -live" command. Once the
DataNode is found to be
alive this method will return, otherwise it will raise a Fail(...) and retry
automatically.
:param hdfs_binary: name/path of the HDFS binary to use
:return:
"""
import params
+ import socket
try:
-command = format('{hdfs_binary} dfsadmin -report -live')
+dfsadmin_base_command = get_dfsadmin_base_command(hdfs_binary)
+command = dfsadmin_base_command + ' -report -live'
return_code, hdfs_output = shell.call(command, user=params.hdfs_user)
except:
raise Fail('Unable to determine if the DataNode has started after
upgrade.')
if return_code == 0:
-if params.hostname.lower() in hdfs_output.lower():
+hostname = params.hostname.lower()
+hostname_ip = socket.gethostbyname(params.hostname.lower())
+if hostname in hdfs_output.lower() or hostname_ip in hdfs_output.lower():
Logger.info("DataNode {0} reports that it has rejoined the
cluster.".format(params.hostname))
return
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/80ffae6b/ambari-server/src/main/resou
ambari git commit: AMBARI-14249. Failing unit tests / Entity removal using the entity manager instead of named queries. (Laszlo Puskas via swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 00134fe76 -> 893955a59
AMBARI-14249. Failing unit tests / Entity removal using the entity manager
instead of named queries. (Laszlo Puskas via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/893955a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/893955a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/893955a5
Branch: refs/heads/branch-2.2
Commit: 893955a598018e48e5745d02faa32b0fe440874c
Parents: 00134fe
Author: Siddharth Wagle
Authored: Mon Dec 7 13:56:20 2015 -0800
Committer: Siddharth Wagle
Committed: Mon Dec 7 13:56:20 2015 -0800
--
.../ambari/server/orm/dao/AlertDispatchDAO.java | 11 +++
.../org/apache/ambari/server/orm/dao/AlertsDAO.java | 16 +---
.../server/orm/entities/AlertHistoryEntity.java | 2 ++
.../server/orm/entities/AlertNoticeEntity.java | 1 +
.../server/orm/dao/AlertDefinitionDAOTest.java | 3 ++-
.../ambari/server/orm/dao/AlertDispatchDAOTest.java | 11 ++-
.../apache/ambari/server/orm/dao/AlertsDAOTest.java | 12
.../ambari/server/orm/dao/RequestDAOTest.java | 3 +++
8 files changed, 46 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/893955a5/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
index 1f1aa45..d73c70e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
@@ -684,12 +684,15 @@ public class AlertDispatchDAO {
@Transactional
public void removeNoticeByDefinitionId(long definitionId) {
EntityManager entityManager = entityManagerProvider.get();
-TypedQuery currentQuery =
entityManager.createNamedQuery(
-"AlertNoticeEntity.removeByDefinitionId", AlertNoticeEntity.class);
+TypedQuery currentQuery =
entityManager.createNamedQuery(
+"AlertNoticeEntity.findByDefinitionId", AlertNoticeEntity.class);
currentQuery.setParameter("definitionId", definitionId);
-currentQuery.executeUpdate();
-entityManager.clear();
+
+for (AlertNoticeEntity alertNoticeEntity : currentQuery.getResultList()) {
+ entityManager.remove(alertNoticeEntity);
+}
+
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/893955a5/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
index 145f841..1c7d0c1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
@@ -736,18 +736,20 @@ public class AlertsDAO {
public void removeByDefinitionId(long definitionId) {
EntityManager entityManager = m_entityManagerProvider.get();
TypedQuery currentQuery =
entityManager.createNamedQuery(
-"AlertCurrentEntity.removeByDefinitionId", AlertCurrentEntity.class);
-
+"AlertCurrentEntity.findByDefinitionId", AlertCurrentEntity.class);
currentQuery.setParameter("definitionId", definitionId);
-currentQuery.executeUpdate();
-TypedQuery historyQuery =
entityManager.createNamedQuery(
-"AlertHistoryEntity.removeByDefinitionId", AlertHistoryEntity.class);
+for (AlertCurrentEntity alertCurrentEntity : currentQuery.getResultList())
{
+ entityManager.remove(alertCurrentEntity);
+}
+TypedQuery historyQuery =
entityManager.createNamedQuery(
+"AlertHistoryEntity.findByDefinitionId", AlertHistoryEntity.class);
historyQuery.setParameter("definitionId", definitionId);
-historyQuery.executeUpdate();
-entityManager.clear();
+for (AlertHistoryEntity alertHistoryEntity : historyQuery.getResultList())
{
+ entityManager.remove(alertHistoryEntity);
+}
// if caching is enabled, invalidate the cache to force the latest values
// back from the DB
http://git-wip-us.apache.org/repos/asf/ambari/blob/893955a5/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
b/amb
ambari git commit: AMBARI-14249. Failing unit tests / Entity removal using the entity manager instead of named queries. (Laszlo Puskas via swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 67edc4079 -> f65486346
AMBARI-14249. Failing unit tests / Entity removal using the entity manager
instead of named queries. (Laszlo Puskas via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f6548634
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6548634
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6548634
Branch: refs/heads/trunk
Commit: f65486346807c7b5389fb4d6bd97f366f9f5d408
Parents: 67edc40
Author: Siddharth Wagle
Authored: Mon Dec 7 13:54:05 2015 -0800
Committer: Siddharth Wagle
Committed: Mon Dec 7 13:54:05 2015 -0800
--
.../ambari/server/orm/dao/AlertDispatchDAO.java | 11 +++
.../org/apache/ambari/server/orm/dao/AlertsDAO.java | 16 +---
.../server/orm/entities/AlertHistoryEntity.java | 2 ++
.../server/orm/entities/AlertNoticeEntity.java | 1 +
.../server/orm/dao/AlertDefinitionDAOTest.java | 3 ++-
.../ambari/server/orm/dao/AlertDispatchDAOTest.java | 11 ++-
.../apache/ambari/server/orm/dao/AlertsDAOTest.java | 12
.../ambari/server/orm/dao/RequestDAOTest.java | 3 +++
8 files changed, 46 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f6548634/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
index 1f1aa45..d73c70e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java
@@ -684,12 +684,15 @@ public class AlertDispatchDAO {
@Transactional
public void removeNoticeByDefinitionId(long definitionId) {
EntityManager entityManager = entityManagerProvider.get();
-TypedQuery currentQuery =
entityManager.createNamedQuery(
-"AlertNoticeEntity.removeByDefinitionId", AlertNoticeEntity.class);
+TypedQuery currentQuery =
entityManager.createNamedQuery(
+"AlertNoticeEntity.findByDefinitionId", AlertNoticeEntity.class);
currentQuery.setParameter("definitionId", definitionId);
-currentQuery.executeUpdate();
-entityManager.clear();
+
+for (AlertNoticeEntity alertNoticeEntity : currentQuery.getResultList()) {
+ entityManager.remove(alertNoticeEntity);
+}
+
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/f6548634/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
index 145f841..1c7d0c1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
@@ -736,18 +736,20 @@ public class AlertsDAO {
public void removeByDefinitionId(long definitionId) {
EntityManager entityManager = m_entityManagerProvider.get();
TypedQuery currentQuery =
entityManager.createNamedQuery(
-"AlertCurrentEntity.removeByDefinitionId", AlertCurrentEntity.class);
-
+"AlertCurrentEntity.findByDefinitionId", AlertCurrentEntity.class);
currentQuery.setParameter("definitionId", definitionId);
-currentQuery.executeUpdate();
-TypedQuery historyQuery =
entityManager.createNamedQuery(
-"AlertHistoryEntity.removeByDefinitionId", AlertHistoryEntity.class);
+for (AlertCurrentEntity alertCurrentEntity : currentQuery.getResultList())
{
+ entityManager.remove(alertCurrentEntity);
+}
+TypedQuery historyQuery =
entityManager.createNamedQuery(
+"AlertHistoryEntity.findByDefinitionId", AlertHistoryEntity.class);
historyQuery.setParameter("definitionId", definitionId);
-historyQuery.executeUpdate();
-entityManager.clear();
+for (AlertHistoryEntity alertHistoryEntity : historyQuery.getResultList())
{
+ entityManager.remove(alertHistoryEntity);
+}
// if caching is enabled, invalidate the cache to force the latest values
// back from the DB
http://git-wip-us.apache.org/repos/asf/ambari/blob/f6548634/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
b/ambari-server
[1/2] ambari git commit: AMBARI-14245. AMBARI-14245 : SYNC SOURCE property needs to be maintained for Manual Upgrade using upgradeHelper (2.2.x to 2.3.x) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 2d8d76329 -> 00134fe76
refs/heads/trunk 63ec0ea4b -> 67edc4079
AMBARI-14245. AMBARI-14245 : SYNC SOURCE property needs to be maintained for
Manual Upgrade using upgradeHelper (2.2.x to 2.3.x) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67edc407
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67edc407
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67edc407
Branch: refs/heads/trunk
Commit: 67edc4079e26304a914520bae1337702c3957ede
Parents: 63ec0ea
Author: Andrew Onishuk
Authored: Mon Dec 7 22:04:51 2015 +0200
Committer: Andrew Onishuk
Committed: Mon Dec 7 22:04:51 2015 +0200
--
ambari-server/src/main/python/upgradeHelper.py | 36 ++-
.../0.4.0/configuration/usersync-properties.xml | 3 +
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 4 +-
.../catalog/UpgradeCatalog_2.2_to_2.3.json | 107 ---
4 files changed, 131 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/67edc407/ambari-server/src/main/python/upgradeHelper.py
--
diff --git a/ambari-server/src/main/python/upgradeHelper.py
b/ambari-server/src/main/python/upgradeHelper.py
index 1a6da53..31aa721 100644
--- a/ambari-server/src/main/python/upgradeHelper.py
+++ b/ambari-server/src/main/python/upgradeHelper.py
@@ -211,6 +211,8 @@ class Options(Const):
ZK_OPTIONS = "zoo.cfg"
KAFKA_BROKER_CONF = "kafka-broker"
RANGER_ADMIN = "admin-properties"
+ RANGER_USERSYNC = "usersync-properties"
+ RANGER_ENV = "ranger-env"
KAFKA_PORT = "port"
RANGER_EXTERNAL_URL = "policymgr_external_url"
ZK_CLIENTPORT = "clientPort"
@@ -1514,6 +1516,28 @@ def get_hdfs_batch_filespool_dir(config_name, component):
return path
+def get_usersync_sync_source():
+ ug_sync_source =
'org.apache.ranger.unixusersync.process.UnixUserGroupBuilder'
+ sync_source = 'unix'
+ if Options.server_config_factory is not None and Options.RANGER_USERSYNC in
Options.server_config_factory.items():
+props = Options.server_config_factory.get_config(Options.RANGER_USERSYNC)
+if "SYNC_SOURCE" in props.properties:
+ sync_source = props.properties['SYNC_SOURCE']
+
+if sync_source == 'ldap':
+ ug_sync_source =
'org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder'
+ return ug_sync_source
+
+def get_audit_check(audit_type):
+ audit_check_flag = "false"
+ if Options.server_config_factory is not None and Options.RANGER_ENV in
Options.server_config_factory.items():
+props = Options.server_config_factory.get_config(Options.RANGER_ENV)
+audit_property = "xasecure.audit.destination.{0}".format(audit_type)
+if audit_property in props.properties:
+ audit_check_flag = props.properties[audit_property]
+
+ return audit_check_flag
+
def get_jt_host(catalog):
"""
:type catalog: UpgradeCatalog
@@ -1554,11 +1578,13 @@ def get_ranger_service_details():
data['RANGER_JDBC_DIALECT'] =
'org.eclipse.persistence.platform.database.MySQLPlatform'
data['RANGER_JDBC_URL'] =
'jdbc:mysql://{0}/{1}'.format(properties_latest['db_host'],
properties_latest['db_name'])
data['RANGER_AUDIT_JDBC_URL'] =
'jdbc:mysql://{0}/{1}'.format(properties_latest['db_host'],
properties_latest['audit_db_name'])
+data['RANGER_ROOT_JDBC_URL'] =
'jdbc:mysql://{0}'.format(properties_latest['db_host'])
elif properties_latest['DB_FLAVOR'].lower() == 'oracle':
data['RANGER_JDBC_DRIVER'] = 'oracle.jdbc.OracleDriver'
data['RANGER_JDBC_DIALECT'] =
'org.eclipse.persistence.platform.database.OraclePlatform'
data['RANGER_JDBC_URL'] =
'jdbc:oracle:thin:@//{0}'.format(properties_latest['db_host'])
data['RANGER_AUDIT_JDBC_URL'] =
'jdbc:oracle:thin:@//{0}'.format(properties_latest['db_host'])
+data['RANGER_ROOT_JDBC_URL'] =
'jdbc:oracle:thin:@//{0}'.format(properties_latest['db_host'])
return data
@@ -1762,8 +1788,6 @@ def _substitute_handler(upgrade_catalog, tokens, value):
value = value.replace(token, get_audit_jdbc_url())
elif token == "{STORM_AUDIT_JDBC_URL}":
value = value.replace(token, get_audit_jdbc_url())
-elif token == "{AUDIT_DB_PASSWD}":
- value = value.replace(token, get_audit_db_passwd())
elif token == "{AUDIT_TO_DB_HDFS}":
value = value.replace(token,
get_audit_to_db_enabled("ranger-hdfs-plugin-properties"))
elif token == "{AUDIT_TO_DB_HBASE}":
@@ -1794,6 +1818,14 @@ def _substitute_handler(upgrade_catalog, tokens, value):
value = value.replace(token,
get_hdfs_batch_filespool_dir("ranger-knox-plugin-properties", "knox"))
elif token == "{AUDIT_HDFS_FILESPOOL_DIR_STORM}":
value = value.replace(token,
get_hdfs
[2/2] ambari git commit: AMBARI-14245. AMBARI-14245 : SYNC SOURCE property needs to be maintained for Manual Upgrade using upgradeHelper (2.2.x to 2.3.x) (aonishuk)
AMBARI-14245. AMBARI-14245 : SYNC SOURCE property needs to be maintained for
Manual Upgrade using upgradeHelper (2.2.x to 2.3.x) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00134fe7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00134fe7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00134fe7
Branch: refs/heads/branch-2.2
Commit: 00134fe762906e804c68034f8bdcd9e522725892
Parents: 2d8d763
Author: Andrew Onishuk
Authored: Mon Dec 7 22:04:54 2015 +0200
Committer: Andrew Onishuk
Committed: Mon Dec 7 22:04:54 2015 +0200
--
ambari-server/src/main/python/upgradeHelper.py | 36 ++-
.../0.4.0/configuration/usersync-properties.xml | 3 +
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 4 +-
.../catalog/UpgradeCatalog_2.2_to_2.3.json | 107 ---
4 files changed, 131 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/00134fe7/ambari-server/src/main/python/upgradeHelper.py
--
diff --git a/ambari-server/src/main/python/upgradeHelper.py
b/ambari-server/src/main/python/upgradeHelper.py
index 1a6da53..31aa721 100644
--- a/ambari-server/src/main/python/upgradeHelper.py
+++ b/ambari-server/src/main/python/upgradeHelper.py
@@ -211,6 +211,8 @@ class Options(Const):
ZK_OPTIONS = "zoo.cfg"
KAFKA_BROKER_CONF = "kafka-broker"
RANGER_ADMIN = "admin-properties"
+ RANGER_USERSYNC = "usersync-properties"
+ RANGER_ENV = "ranger-env"
KAFKA_PORT = "port"
RANGER_EXTERNAL_URL = "policymgr_external_url"
ZK_CLIENTPORT = "clientPort"
@@ -1514,6 +1516,28 @@ def get_hdfs_batch_filespool_dir(config_name, component):
return path
+def get_usersync_sync_source():
+ ug_sync_source =
'org.apache.ranger.unixusersync.process.UnixUserGroupBuilder'
+ sync_source = 'unix'
+ if Options.server_config_factory is not None and Options.RANGER_USERSYNC in
Options.server_config_factory.items():
+props = Options.server_config_factory.get_config(Options.RANGER_USERSYNC)
+if "SYNC_SOURCE" in props.properties:
+ sync_source = props.properties['SYNC_SOURCE']
+
+if sync_source == 'ldap':
+ ug_sync_source =
'org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder'
+ return ug_sync_source
+
+def get_audit_check(audit_type):
+ audit_check_flag = "false"
+ if Options.server_config_factory is not None and Options.RANGER_ENV in
Options.server_config_factory.items():
+props = Options.server_config_factory.get_config(Options.RANGER_ENV)
+audit_property = "xasecure.audit.destination.{0}".format(audit_type)
+if audit_property in props.properties:
+ audit_check_flag = props.properties[audit_property]
+
+ return audit_check_flag
+
def get_jt_host(catalog):
"""
:type catalog: UpgradeCatalog
@@ -1554,11 +1578,13 @@ def get_ranger_service_details():
data['RANGER_JDBC_DIALECT'] =
'org.eclipse.persistence.platform.database.MySQLPlatform'
data['RANGER_JDBC_URL'] =
'jdbc:mysql://{0}/{1}'.format(properties_latest['db_host'],
properties_latest['db_name'])
data['RANGER_AUDIT_JDBC_URL'] =
'jdbc:mysql://{0}/{1}'.format(properties_latest['db_host'],
properties_latest['audit_db_name'])
+data['RANGER_ROOT_JDBC_URL'] =
'jdbc:mysql://{0}'.format(properties_latest['db_host'])
elif properties_latest['DB_FLAVOR'].lower() == 'oracle':
data['RANGER_JDBC_DRIVER'] = 'oracle.jdbc.OracleDriver'
data['RANGER_JDBC_DIALECT'] =
'org.eclipse.persistence.platform.database.OraclePlatform'
data['RANGER_JDBC_URL'] =
'jdbc:oracle:thin:@//{0}'.format(properties_latest['db_host'])
data['RANGER_AUDIT_JDBC_URL'] =
'jdbc:oracle:thin:@//{0}'.format(properties_latest['db_host'])
+data['RANGER_ROOT_JDBC_URL'] =
'jdbc:oracle:thin:@//{0}'.format(properties_latest['db_host'])
return data
@@ -1762,8 +1788,6 @@ def _substitute_handler(upgrade_catalog, tokens, value):
value = value.replace(token, get_audit_jdbc_url())
elif token == "{STORM_AUDIT_JDBC_URL}":
value = value.replace(token, get_audit_jdbc_url())
-elif token == "{AUDIT_DB_PASSWD}":
- value = value.replace(token, get_audit_db_passwd())
elif token == "{AUDIT_TO_DB_HDFS}":
value = value.replace(token,
get_audit_to_db_enabled("ranger-hdfs-plugin-properties"))
elif token == "{AUDIT_TO_DB_HBASE}":
@@ -1794,6 +1818,14 @@ def _substitute_handler(upgrade_catalog, tokens, value):
value = value.replace(token,
get_hdfs_batch_filespool_dir("ranger-knox-plugin-properties", "knox"))
elif token == "{AUDIT_HDFS_FILESPOOL_DIR_STORM}":
value = value.replace(token,
get_hdfs_batch_filespool_dir("ranger-storm-plugin-properties", "storm"))
+elif token == "{USERSYNC_SYNC_SOURCE}":
+ value
ambari git commit: AMBARI-13034. If for some reason, structured-out-status.json is empty then ambari-server will fail to report any status.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 c8215b0e1 -> 2d8d76329
AMBARI-13034. If for some reason, structured-out-status.json is empty then
ambari-server will fail to report any status.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d8d7632
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d8d7632
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d8d7632
Branch: refs/heads/branch-2.2
Commit: 2d8d76329d9c4b7208ae32dbffced0de3410b6a2
Parents: c8215b0
Author: Vitaly Brodetskyi
Authored: Mon Dec 7 21:34:43 2015 +0200
Committer: Vitaly Brodetskyi
Committed: Mon Dec 7 21:34:43 2015 +0200
--
.../python/resource_management/libraries/script/script.py | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d8d7632/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index cdf3465..398cee8 100644
---
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -112,10 +112,11 @@ class Script(object):
def load_structured_out(self):
Script.structuredOut = {}
if os.path.exists(self.stroutfile):
- with open(self.stroutfile, 'r') as fp:
-Script.structuredOut = json.load(fp)
+ if os.path.getsize(self.stroutfile) > 0:
+with open(self.stroutfile, 'r') as fp:
+ Script.structuredOut = json.load(fp)
-# version is only set in a specific way and should not be carried
+# version is only set in a specific way and should not be carried
if "version" in Script.structuredOut:
del Script.structuredOut["version"]
# reset security issues and errors found on previous runs
ambari git commit: AMBARI-14256. Logging into Ambari UI when role is less than Cluster Administrator brings user to Views page
Repository: ambari
Updated Branches:
refs/heads/trunk ecd7d092b -> 63ec0ea4b
AMBARI-14256. Logging into Ambari UI when role is less than Cluster
Administrator brings user to Views page
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63ec0ea4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63ec0ea4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63ec0ea4
Branch: refs/heads/trunk
Commit: 63ec0ea4b00b4c3e5ce0671287ccfea528cb202f
Parents: ecd7d09
Author: Alex Antonenko
Authored: Mon Dec 7 20:24:34 2015 +0200
Committer: Alex Antonenko
Committed: Mon Dec 7 20:50:53 2015 +0200
--
ambari-web/app/routes/main.js| 2 +-
.../test/controllers/global/user_settings_controller_test.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/63ec0ea4/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index dbdd6df..46315ae 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -49,7 +49,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
var currentClusterStatus =
App.clusterStatus.get('value');
if (router.get('currentState.parentState.name') !==
'views'
&& currentClusterStatus &&
self.get('installerStatuses').contains(currentClusterStatus.clusterState)) {
-if (App.isAccessible('ADMIN')) {
+if (App.isAuthorized('AMBARI.ADD_DELETE_CLUSTERS')) {
self.redirectToInstaller(router,
currentClusterStatus, false);
} else {
Em.run.next(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/63ec0ea4/ambari-web/test/controllers/global/user_settings_controller_test.js
--
diff --git
a/ambari-web/test/controllers/global/user_settings_controller_test.js
b/ambari-web/test/controllers/global/user_settings_controller_test.js
index 92bb346..13a73df 100644
--- a/ambari-web/test/controllers/global/user_settings_controller_test.js
+++ b/ambari-web/test/controllers/global/user_settings_controller_test.js
@@ -38,7 +38,7 @@ describe('App.UserSettingsController', function () {
sinon.stub(App.ModalPopup, 'show', function(dataToShow){
dataToShowRes = dataToShow;
});
- sinon.stub(App, 'isAccessible').returns(true);
+ sinon.stub(App, 'isAuthorized').returns(true);
var emulatorClass = function() {};
emulatorClass.prototype.done = function(func) {
if (func) {
@@ -49,7 +49,7 @@ describe('App.UserSettingsController', function () {
sinon.stub(userSettingsController, 'dataLoading').returns(emulator);
});
afterEach(function () {
- App.isAccessible.restore();
+ App.isAuthorized.restore();
App.ModalPopup.show.restore();
userSettingsController.dataLoading.restore();
});
ambari git commit: AMBARI-14255 Restart All Required button can be clicked even if it is disabled (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 53583b2df -> ecd7d092b
AMBARI-14255 Restart All Required button can be clicked even if it is disabled
(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ecd7d092
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ecd7d092
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ecd7d092
Branch: refs/heads/trunk
Commit: ecd7d092beab85aa3ab4c666d7ea7d402a5c19a6
Parents: 53583b2
Author: Aleksandr Kovalenko
Authored: Mon Dec 7 19:56:25 2015 +0200
Committer: Aleksandr Kovalenko
Committed: Mon Dec 7 19:56:25 2015 +0200
--
ambari-web/app/controllers/main/service.js | 24
.../test/controllers/main/service_test.js | 13 ++-
2 files changed, 26 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecd7d092/ambari-web/app/controllers/main/service.js
--
diff --git a/ambari-web/app/controllers/main/service.js
b/ambari-web/app/controllers/main/service.js
index 93bf8a1..1005533 100644
--- a/ambari-web/app/controllers/main/service.js
+++ b/ambari-web/app/controllers/main/service.js
@@ -301,17 +301,21 @@ App.MainServiceController = Em.ArrayController.extend({
var self = this;
var servicesList = [];
var hostComponentsToRestart = [];
-App.HostComponent.find().filterProperty('staleConfigs').forEach(function
(hostComponent) {
- hostComponentsToRestart.push({
-component_name: hostComponent.get('componentName'),
-service_name: hostComponent.get('service.serviceName'),
-hosts: hostComponent.get('hostName')
+if (!this.get('isRestartAllRequiredDisabled')) {
+ App.HostComponent.find().filterProperty('staleConfigs').forEach(function
(hostComponent) {
+hostComponentsToRestart.push({
+ component_name: hostComponent.get('componentName'),
+ service_name: hostComponent.get('service.serviceName'),
+ hosts: hostComponent.get('hostName')
+});
+servicesList.push(hostComponent.get('service.displayName'));
});
- servicesList.push(hostComponent.get('service.displayName'));
-});
-return App.showConfirmationPopup(function () {
- self.restartHostComponents(hostComponentsToRestart);
-},
Em.I18n.t('services.service.refreshAll.confirmMsg').format(servicesList.uniq().join(',
')), null, null, Em.I18n.t('services.service.restartAll.confirmButton'));
+ return App.showConfirmationPopup(function () {
+self.restartHostComponents(hostComponentsToRestart);
+ },
Em.I18n.t('services.service.refreshAll.confirmMsg').format(servicesList.uniq().join(',
')), null, null, Em.I18n.t('services.service.restartAll.confirmButton'));
+} else {
+ return null;
+}
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecd7d092/ambari-web/test/controllers/main/service_test.js
--
diff --git a/ambari-web/test/controllers/main/service_test.js
b/ambari-web/test/controllers/main/service_test.js
index 2cbaf29..cad39f9 100644
--- a/ambari-web/test/controllers/main/service_test.js
+++ b/ambari-web/test/controllers/main/service_test.js
@@ -393,7 +393,11 @@ describe('App.MainServiceController', function () {
});
it('should show confirmation popup with list of services and call
restartHostComponents after confirmation', function () {
- var popup = mainServiceController.restartAllRequired();
+ var popup;
+ mainServiceController.reopen({
+isRestartAllRequiredDisabled: false
+ });
+ popup = mainServiceController.restartAllRequired();
popup.onPrimary();
expect(App.showConfirmationPopup.args[0][1]).to.equal(Em.I18n.t('services.service.refreshAll.confirmMsg').format('displayName1,
displayName2'));
expect(mainServiceController.restartHostComponents.calledWith([
@@ -410,6 +414,13 @@ describe('App.MainServiceController', function () {
])).to.be.true;
});
+it('should not open popup if isRestartAllRequiredDisabled is true',
function(){
+ mainServiceController.reopen({
+isRestartAllRequiredDisabled: true
+ });
+ expect(mainServiceController.restartAllRequired()).to.be.null;
+});
+
});
describe('#restartHostComponents', function () {
ambari git commit: AMBARI-14253 AMS service check fails on CentOS7 (dsen)
Repository: ambari Updated Branches: refs/heads/branch-2.2 af92f9046 -> c8215b0e1 AMBARI-14253 AMS service check fails on CentOS7 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c8215b0e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c8215b0e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c8215b0e Branch: refs/heads/branch-2.2 Commit: c8215b0e12d6380e5f4329b8ac9a213404cfde77 Parents: af92f90 Author: Dmytro Sen Authored: Mon Dec 7 19:11:10 2015 +0200 Committer: Dmytro Sen Committed: Mon Dec 7 19:13:02 2015 +0200 -- .../AMBARI_METRICS/0.1.0/package/scripts/service_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c8215b0e/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py index e4d588d..2243fe9 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py @@ -39,7 +39,7 @@ class AMSServiceCheck(Script): AMS_METRICS_POST_URL = "/ws/v1/timeline/metrics/" AMS_METRICS_GET_URL = "/ws/v1/timeline/metrics?%s" AMS_CONNECT_TRIES = 10 - AMS_CONNECT_TIMEOUT = 10 + AMS_CONNECT_TIMEOUT = 15 @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) def service_check(self, env):
[ambari] Git Push Summary
Repository: ambari Updated Branches: refs/heads/AMBARI-12885 [created] 53583b2df
ambari git commit: AMBARI-14253 AMS service check fails on CentOS7 (dsen)
Repository: ambari Updated Branches: refs/heads/trunk a0d8e722c -> 53583b2df AMBARI-14253 AMS service check fails on CentOS7 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53583b2d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53583b2d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53583b2d Branch: refs/heads/trunk Commit: 53583b2df6282318ce20bd1d80c9025cb179f761 Parents: a0d8e72 Author: Dmytro Sen Authored: Mon Dec 7 19:11:10 2015 +0200 Committer: Dmytro Sen Committed: Mon Dec 7 19:11:10 2015 +0200 -- .../AMBARI_METRICS/0.1.0/package/scripts/service_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/53583b2d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py index e4d588d..2243fe9 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py @@ -39,7 +39,7 @@ class AMSServiceCheck(Script): AMS_METRICS_POST_URL = "/ws/v1/timeline/metrics/" AMS_METRICS_GET_URL = "/ws/v1/timeline/metrics?%s" AMS_CONNECT_TRIES = 10 - AMS_CONNECT_TIMEOUT = 10 + AMS_CONNECT_TIMEOUT = 15 @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) def service_check(self, env):
ambari git commit: AMBARI-14248. After ambari-server upgrade "start all" operation is triggered with 1 minute delay.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 01820d6f0 -> a0d8e722c
AMBARI-14248. After ambari-server upgrade "start all" operation is triggered
with 1 minute delay.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a0d8e722
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a0d8e722
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a0d8e722
Branch: refs/heads/trunk
Commit: a0d8e722c643c676f8e2b0b4dd5e1ee7a77cb56a
Parents: 01820d6
Author: Vitaly Brodetskyi
Authored: Mon Dec 7 16:47:10 2015 +0200
Committer: Vitaly Brodetskyi
Committed: Mon Dec 7 16:47:10 2015 +0200
--
.../ambari/server/state/ConfigHelper.java | 55 +++-
1 file changed, 30 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0d8e722/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 2acd62b..57d4db4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -17,20 +17,12 @@
*/
package org.apache.ambari.server.state;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -44,12 +36,19 @@ import org.apache.ambari.server.upgrade.UpgradeCatalog170;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.persist.Transactional;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
/**
* Helper class that works with config traversals.
@@ -463,18 +462,24 @@ public class ConfigHelper {
}
public Set getPropertyValuesWithPropertyType(StackId stackId,
PropertyType propertyType, Cluster cluster) throws AmbariException {
-StackInfo stack = ambariMetaInfo.getStack(stackId.getStackName(),
-stackId.getStackVersion());
-
+StackInfo stack = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
+Map desiredConfigs = cluster.getDesiredConfigs();
+Map actualConfigs = new HashMap<>();
Set result = new HashSet();
+for (Map.Entry desiredConfigEntry :
desiredConfigs.entrySet()) {
+ String configType = desiredConfigEntry.getKey();
+ DesiredConfig desiredConfig = desiredConfigEntry.getValue();
+ actualConfigs.put(configType, cluster.getConfig(configType,
desiredConfig.getTag()));
+}
+
for (Service service : cluster.getServices().values()) {
Set serviceProperties =
ambariMetaInfo.getServiceProperties(stack.getName(), stack.getVersion(),
service.getName());
for (PropertyInfo serviceProperty : serviceProperties) {
if (serviceProperty.getPropertyTypes().contains(propertyType)) {
String stackPropertyConfigType =
fileNameToConfigType(serviceProperty.getFilename());
try {
-
result.add(cluster.getDesiredConfigByType(stackPropertyConfigType).getProperties().get(serviceProperty.getName()));
+
result.add(actualConfigs.get(stackPropertyConfigType).getProperties().get(serviceProperty.getName()));
} catch (Exception ex) {
}
}
@@ -486,7 +491,7 @@ public class ConfigHelper {
for (PropertyInfo stackProperty : stackProperties) {
if (stackProperty.getPropertyTypes().contains(propertyType)) {
String stackPropertyConfig
ambari git commit: AMBARI-14248. After ambari-server upgrade "start all" operation is triggered with 1 minute delay.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 47712103f -> af92f9046
AMBARI-14248. After ambari-server upgrade "start all" operation is triggered
with 1 minute delay.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af92f904
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af92f904
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af92f904
Branch: refs/heads/branch-2.2
Commit: af92f9046e71cf0c75b27badd51d56b3d10ea7f6
Parents: 4771210
Author: Vitaly Brodetskyi
Authored: Mon Dec 7 16:44:20 2015 +0200
Committer: Vitaly Brodetskyi
Committed: Mon Dec 7 16:45:11 2015 +0200
--
.../ambari/server/state/ConfigHelper.java | 55 +++-
1 file changed, 30 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/af92f904/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 2acd62b..57d4db4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -17,20 +17,12 @@
*/
package org.apache.ambari.server.state;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -44,12 +36,19 @@ import org.apache.ambari.server.upgrade.UpgradeCatalog170;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.persist.Transactional;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
/**
* Helper class that works with config traversals.
@@ -463,18 +462,24 @@ public class ConfigHelper {
}
public Set getPropertyValuesWithPropertyType(StackId stackId,
PropertyType propertyType, Cluster cluster) throws AmbariException {
-StackInfo stack = ambariMetaInfo.getStack(stackId.getStackName(),
-stackId.getStackVersion());
-
+StackInfo stack = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
+Map desiredConfigs = cluster.getDesiredConfigs();
+Map actualConfigs = new HashMap<>();
Set result = new HashSet();
+for (Map.Entry desiredConfigEntry :
desiredConfigs.entrySet()) {
+ String configType = desiredConfigEntry.getKey();
+ DesiredConfig desiredConfig = desiredConfigEntry.getValue();
+ actualConfigs.put(configType, cluster.getConfig(configType,
desiredConfig.getTag()));
+}
+
for (Service service : cluster.getServices().values()) {
Set serviceProperties =
ambariMetaInfo.getServiceProperties(stack.getName(), stack.getVersion(),
service.getName());
for (PropertyInfo serviceProperty : serviceProperties) {
if (serviceProperty.getPropertyTypes().contains(propertyType)) {
String stackPropertyConfigType =
fileNameToConfigType(serviceProperty.getFilename());
try {
-
result.add(cluster.getDesiredConfigByType(stackPropertyConfigType).getProperties().get(serviceProperty.getName()));
+
result.add(actualConfigs.get(stackPropertyConfigType).getProperties().get(serviceProperty.getName()));
} catch (Exception ex) {
}
}
@@ -486,7 +491,7 @@ public class ConfigHelper {
for (PropertyInfo stackProperty : stackProperties) {
if (stackProperty.getPropertyTypes().contains(propertyType)) {
String stackProp
ambari git commit: AMBARI-14188. During Upgrade Topology Manager Causes Ambari To Be Unresponsive With Infinite Loop (Sebastian Toader via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 8527f7619 -> 47712103f
AMBARI-14188. During Upgrade Topology Manager Causes Ambari To Be Unresponsive
With Infinite Loop (Sebastian Toader via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47712103
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47712103
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47712103
Branch: refs/heads/branch-2.2
Commit: 47712103f18b3e8fac57827a4cf38edba3752794
Parents: 8527f76
Author: Sumit Mohanty
Authored: Mon Dec 7 06:41:42 2015 -0800
Committer: Sumit Mohanty
Committed: Mon Dec 7 06:41:42 2015 -0800
--
ambari-server/pom.xml | 6 ++
.../org/apache/ambari/server/state/Cluster.java | 8 +-
.../ambari/server/state/DesiredConfig.java | 56 +-
.../server/state/cluster/ClusterImpl.java | 57 --
.../ambari/server/topology/AmbariContext.java | 49 -
.../ambari/server/topology/TopologyManager.java | 4 +-
.../ambari/server/state/DesiredConfigTest.java | 17 +++
.../server/topology/AmbariContextTest.java | 107 +++
8 files changed, 288 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/47712103/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 390b448..9a51e9d 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1901,6 +1901,12 @@
test
+ nl.jqno.equalsverifier
+ equalsverifier
+ 1.7.4
+ test
+
+
org.objenesis
objenesis-tck
1.2
http://git-wip-us.apache.org/repos/asf/ambari/blob/47712103/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
index 3aaa9a5..e10c808 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
@@ -404,11 +404,17 @@ public interface Cluster {
*/
boolean isConfigTypeExists(String configType);
/**
- * Gets the desired configurations for the cluster.
+ * Gets the active desired configurations for the cluster.
* @return a map of type-to-configuration information.
*/
Map getDesiredConfigs();
+ /**
+ * Gets all versions of the desired configurations for the cluster.
+ * @return a map of type-to-configuration information.
+ */
+ Map> getAllDesiredConfigVersions();
+
/**
* Creates a cluster response based on the current cluster definition
http://git-wip-us.apache.org/repos/asf/ambari/blob/47712103/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
index 0635284..80d05f7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java
@@ -20,6 +20,8 @@ package org.apache.ambari.server.state;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -119,9 +121,9 @@ public class DesiredConfig {
* Used to represent an override on a host.
*/
//TODO include changes for config versions
- public static class HostOverride {
-private String hostName;
-private String versionOverrideTag;
+ public final static class HostOverride {
+private final String hostName;
+private final String versionOverrideTag;
/**
* @param name the host name
@@ -148,6 +150,27 @@ public class DesiredConfig {
return versionOverrideTag;
}
+@Override
+public boolean equals(Object o) {
+ if (this == o) return true;
+
+ if (o == null || getClass() != o.getClass()) return false;
+
+ HostOverride that = (HostOverride) o;
+
+ return new EqualsBuilder()
+.append(hostName, that.hostName)
+.append(versionOverrideTag, that.versionOverrideTag)
+.isEquals();
+}
+
+@Override
+public int hashCode() {
+ return new HashCodeBuilder(1
[2/2] ambari git commit: AMBARI-14247. Most tasks fail in non-root in case of advanced sudoers settings (aonishuk)
AMBARI-14247. Most tasks fail in non-root in case of advanced sudoers settings
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8527f761
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8527f761
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8527f761
Branch: refs/heads/branch-2.2
Commit: 8527f761993f2379036bd14a49f9247674961f8a
Parents: cd85ccd
Author: Andrew Onishuk
Authored: Mon Dec 7 15:58:40 2015 +0200
Committer: Andrew Onishuk
Committed: Mon Dec 7 15:58:40 2015 +0200
--
.../src/main/python/resource_management/core/sudo.py| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8527f761/ambari-common/src/main/python/resource_management/core/sudo.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/sudo.py
b/ambari-common/src/main/python/resource_management/core/sudo.py
index 1a83ec5..46fa9d0 100644
--- a/ambari-common/src/main/python/resource_management/core/sudo.py
+++ b/ambari-common/src/main/python/resource_management/core/sudo.py
@@ -28,6 +28,7 @@ from resource_management.core import shell
from resource_management.core.logger import Logger
from resource_management.core.exceptions import Fail
from ambari_commons.os_check import OSCheck
+import subprocess
if os.geteuid() == 0:
def chown(path, owner, group):
@@ -206,8 +207,12 @@ else:
def stat(path):
class Stat:
def __init__(self, path):
-out = shell.checked_call(["stat", "-c", "%u %g %a", path],
sudo=True)[1]
-uid_str, gid_str, mode_str = out.split(' ')
+cmd = ["stat", "-c", "%u %g %a", path]
+code, out, err = shell.checked_call(cmd, sudo=True,
stderr=subprocess.PIPE)
+values = out.split(' ')
+if len(values) != 3:
+ raise Fail("Execution of '{0}' returned unexpected output.
{2}\n{3}".format(cmd, code, err, out))
+uid_str, gid_str, mode_str = values
self.st_uid, self.st_gid, self.st_mode = int(uid_str), int(gid_str),
int(mode_str, 8)
return Stat(path)
[1/2] ambari git commit: AMBARI-14247. Most tasks fail in non-root in case of advanced sudoers settings (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 cd85ccd0a -> 8527f7619
refs/heads/trunk aa1177cb9 -> 01820d6f0
AMBARI-14247. Most tasks fail in non-root in case of advanced sudoers settings
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01820d6f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01820d6f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01820d6f
Branch: refs/heads/trunk
Commit: 01820d6f0ba80a778f46a2edf3430e66ba3405ec
Parents: aa1177c
Author: Andrew Onishuk
Authored: Mon Dec 7 15:58:37 2015 +0200
Committer: Andrew Onishuk
Committed: Mon Dec 7 15:58:37 2015 +0200
--
.../src/main/python/resource_management/core/sudo.py| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/01820d6f/ambari-common/src/main/python/resource_management/core/sudo.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/sudo.py
b/ambari-common/src/main/python/resource_management/core/sudo.py
index 1a83ec5..46fa9d0 100644
--- a/ambari-common/src/main/python/resource_management/core/sudo.py
+++ b/ambari-common/src/main/python/resource_management/core/sudo.py
@@ -28,6 +28,7 @@ from resource_management.core import shell
from resource_management.core.logger import Logger
from resource_management.core.exceptions import Fail
from ambari_commons.os_check import OSCheck
+import subprocess
if os.geteuid() == 0:
def chown(path, owner, group):
@@ -206,8 +207,12 @@ else:
def stat(path):
class Stat:
def __init__(self, path):
-out = shell.checked_call(["stat", "-c", "%u %g %a", path],
sudo=True)[1]
-uid_str, gid_str, mode_str = out.split(' ')
+cmd = ["stat", "-c", "%u %g %a", path]
+code, out, err = shell.checked_call(cmd, sudo=True,
stderr=subprocess.PIPE)
+values = out.split(' ')
+if len(values) != 3:
+ raise Fail("Execution of '{0}' returned unexpected output.
{2}\n{3}".format(cmd, code, err, out))
+uid_str, gid_str, mode_str = values
self.st_uid, self.st_gid, self.st_mode = int(uid_str), int(gid_str),
int(mode_str, 8)
return Stat(path)
ambari git commit: AMBARI-14246. UT failures for Ambari Web (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e67521e27 -> aa1177cb9
AMBARI-14246. UT failures for Ambari Web (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aa1177cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aa1177cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aa1177cb
Branch: refs/heads/trunk
Commit: aa1177cb97b2e109581fe96ffa98e778d8ec641c
Parents: e67521e
Author: Oleg Nechiporenko
Authored: Mon Dec 7 15:41:14 2015 +0200
Committer: Oleg Nechiporenko
Committed: Mon Dec 7 15:41:14 2015 +0200
--
ambari-web/app/assets/test/tests.js | 10 --
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/views/common/modal_popup.js| 2 +-
ambari-web/test/controllers/main/host/details_test.js | 9 -
ambari-web/test/router_test.js| 4 ++--
5 files changed, 12 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/aa1177cb/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index e497aa2..36828f2 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -333,12 +333,10 @@ var files = [
App.initialize();
describe('Ambari Web Unit tests', function() {
- for (var i = 0; i < files.length; i++) {
-
-describe(files[i], function() {
- require(files[i]);
+ files.forEach(function (file) {
+describe(file, function() {
+ require(file);
});
-
- }
+ });
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/aa1177cb/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index d1d76f3..71ee9db 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2842,7 +2842,7 @@ var ajax = Em.Object.extend({
var opt = {};
if (!urls[config.name]) {
- console.warn('Invalid name provided!');
+ console.warn('Invalid name provided `' + config.name + '`!');
return null;
}
opt = formatRequest.call(urls[config.name], params);
http://git-wip-us.apache.org/repos/asf/ambari/blob/aa1177cb/ambari-web/app/views/common/modal_popup.js
--
diff --git a/ambari-web/app/views/common/modal_popup.js
b/ambari-web/app/views/common/modal_popup.js
index fbf539a..529ee9d 100644
--- a/ambari-web/app/views/common/modal_popup.js
+++ b/ambari-web/app/views/common/modal_popup.js
@@ -65,7 +65,7 @@ App.ModalPopup = Ember.View.extend({
showCloseButton: true,
didInsertElement: function () {
-if (this.autoHeight) {
+if (this.autoHeight && !$.mocho) {
var block = this.$().find('#modal > .modal-body').first();
if(block.offset()) {
block.css('max-height', $(window).height() - block.offset().top -
this.marginBottom + $(window).scrollTop()); // fix popup height
http://git-wip-us.apache.org/repos/asf/ambari/blob/aa1177cb/ambari-web/test/controllers/main/host/details_test.js
--
diff --git a/ambari-web/test/controllers/main/host/details_test.js
b/ambari-web/test/controllers/main/host/details_test.js
index c5cf548..4608516 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -74,7 +74,7 @@ describe('App.MainHostDetailsController', function () {
});
});
- describe('#stopComponent()', function () {
+describe('#stopComponent()', function () {
beforeEach(function () {
sinon.stub(App, 'showConfirmationPopup', function (callback) {
@@ -958,10 +958,10 @@ describe('App.MainHostDetailsController', function () {
});
describe('#loadConfigsSuccessCallback()', function () {
-
+var mockUrlParams = [];
beforeEach(function () {
sinon.stub(controller, "constructConfigUrlParams", function () {
-return this.get('mockUrlParams');
+return mockUrlParams;
});
});
afterEach(function () {
@@ -969,12 +969,11 @@ describe('App.MainHostDetailsController', function () {
});
it('url params is empty', function () {
- controller.set('mockUrlParams', []);
expect(controller.loadConfigsSuccessCallback()).to.be.false;
expect(App.ajax.send.called).to.be.false;
});
it('url params are correct', function () {
- controller.set('mockUrlParams', ['param1']);
+ mockUrlParams = ['param1'];
expect(controller.loadConfigsSuccessCallback()).to.b
[2/2] ambari git commit: AMBARI-14233. Ranger LDAP configs messed up after Ambari upgrade from 2.1.2 to 2.1.3. Additional fix (dlysnichenko)
AMBARI-14233. Ranger LDAP configs messed up after Ambari upgrade from 2.1.2 to
2.1.3. Additional fix (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e67521e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e67521e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e67521e2
Branch: refs/heads/trunk
Commit: e67521e27c533bf7aa131904a8ba32e8e2f5b319
Parents: 2915a9a
Author: Lisnichenko Dmitro
Authored: Mon Dec 7 14:18:58 2015 +0200
Committer: Lisnichenko Dmitro
Committed: Mon Dec 7 14:19:58 2015 +0200
--
.../server/upgrade/UpgradeCatalog213.java | 27 +++-
1 file changed, 15 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e67521e2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 956f4cb..a3f3d39 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -1244,18 +1244,21 @@ public class UpgradeCatalog213 extends
AbstractUpgradeCatalog {
for (final Cluster cluster :
getCheckedClusterMap(ambariManagementController.getClusters()).values()) {
Config rangerUgsyncSiteProperties =
cluster.getDesiredConfigByType(RANGER_UGSYNC_SITE_CONFIG);
if (rangerUgsyncSiteProperties != null &&
rangerUgsyncSiteProperties.getProperties().containsKey(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY))
{
-if
(rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY).equals("ldap"))
{
- Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
- "org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder");
- updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
-} else if
(rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY).equals("unix"))
{
- Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
- "org.apache.ranger.unixusersync.process.UnixUserGroupBuilder");
- updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
-} else if
(rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY).equals("file"))
{
- Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
-
"org.apache.ranger.unixusersync.process.FileSourceUserGroupBuilder");
- updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+String sourceClassValue =
rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY);
+if (sourceClassValue != null) {
+ if ("ldap".equals(sourceClassValue)) {
+Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
+"org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder");
+updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+ } else if ("unix".equals(sourceClassValue)) {
+Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
+"org.apache.ranger.unixusersync.process.UnixUserGroupBuilder");
+updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+ } else if ("file".equals(sourceClassValue)) {
+Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
+
"org.apache.ranger.unixusersync.process.FileSourceUserGroupBuilder");
+updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+ }
}
}
}
[1/2] ambari git commit: AMBARI-14233. Ranger LDAP configs messed up after Ambari upgrade from 2.1.2 to 2.1.3. Additional fix (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 e15d1e0fb -> cd85ccd0a
refs/heads/trunk 2915a9a34 -> e67521e27
AMBARI-14233. Ranger LDAP configs messed up after Ambari upgrade from 2.1.2 to
2.1.3. Additional fix (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd85ccd0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd85ccd0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd85ccd0
Branch: refs/heads/branch-2.2
Commit: cd85ccd0a374c0cce0609ec2bd82763739236e1e
Parents: e15d1e0
Author: Lisnichenko Dmitro
Authored: Mon Dec 7 14:18:58 2015 +0200
Committer: Lisnichenko Dmitro
Committed: Mon Dec 7 14:18:58 2015 +0200
--
.../server/upgrade/UpgradeCatalog213.java | 27 +++-
1 file changed, 15 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cd85ccd0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 4126228..f80f7b9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -1241,18 +1241,21 @@ public class UpgradeCatalog213 extends
AbstractUpgradeCatalog {
for (final Cluster cluster :
getCheckedClusterMap(ambariManagementController.getClusters()).values()) {
Config rangerUgsyncSiteProperties =
cluster.getDesiredConfigByType(RANGER_UGSYNC_SITE_CONFIG);
if (rangerUgsyncSiteProperties != null &&
rangerUgsyncSiteProperties.getProperties().containsKey(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY))
{
-if
(rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY).equals("ldap"))
{
- Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
- "org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder");
- updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
-} else if
(rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY).equals("unix"))
{
- Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
- "org.apache.ranger.unixusersync.process.UnixUserGroupBuilder");
- updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
-} else if
(rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY).equals("file"))
{
- Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
-
"org.apache.ranger.unixusersync.process.FileSourceUserGroupBuilder");
- updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+String sourceClassValue =
rangerUgsyncSiteProperties.getProperties().get(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY);
+if (sourceClassValue != null) {
+ if ("ldap".equals(sourceClassValue)) {
+Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
+"org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder");
+updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+ } else if ("unix".equals(sourceClassValue)) {
+Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
+"org.apache.ranger.unixusersync.process.UnixUserGroupBuilder");
+updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+ } else if ("file".equals(sourceClassValue)) {
+Map updates =
Collections.singletonMap(RANGER_USERSYNC_SOURCE_IMPL_CLASS_PROPERTY,
+
"org.apache.ranger.unixusersync.process.FileSourceUserGroupBuilder");
+updateConfigurationPropertiesForCluster(cluster,
RANGER_UGSYNC_SITE_CONFIG, updates, true, false);
+ }
}
}
}
[2/2] ambari git commit: AMBARI-14244. Textarea with task logs is too wide
AMBARI-14244. Textarea with task logs is too wide
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2915a9a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2915a9a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2915a9a3
Branch: refs/heads/trunk
Commit: 2915a9a34b0fee2d001be60bd85fceddc9c57f0d
Parents: dcaaca2
Author: Alex Antonenko
Authored: Mon Dec 7 12:39:45 2015 +0200
Committer: Alex Antonenko
Committed: Mon Dec 7 12:39:45 2015 +0200
--
ambari-web/app/styles/application.less | 1 +
ambari-web/app/styles/stack_versions.less| 1 +
ambari-web/app/views/common/host_progress_popup_body_view.js | 7 ---
ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js | 7 ---
4 files changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2915a9a3/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index ae92649..d80278c 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1820,6 +1820,7 @@ a:focus {
display: none;
resize: none;
overflow: hidden;
+box-sizing: border-box;
}
.task-top-wrap {
http://git-wip-us.apache.org/repos/asf/ambari/blob/2915a9a3/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less
b/ambari-web/app/styles/stack_versions.less
index 8529606..f6d816d 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -252,6 +252,7 @@
textarea {
width: 100%;
min-height: 100px;
+ box-sizing: border-box;
}
}
.task-list {
http://git-wip-us.apache.org/repos/asf/ambari/blob/2915a9a3/ambari-web/app/views/common/host_progress_popup_body_view.js
--
diff --git a/ambari-web/app/views/common/host_progress_popup_body_view.js
b/ambari-web/app/views/common/host_progress_popup_body_view.js
index d9006ad..2f78f03 100644
--- a/ambari-web/app/views/common/host_progress_popup_body_view.js
+++ b/ambari-web/app/views/common/host_progress_popup_body_view.js
@@ -722,13 +722,14 @@ App.HostProgressPopupBodyView = App.TableView.extend({
* @method createClipBoard
*/
createClipBoard: function () {
-var logElement = $(".task-detail-log-maintext");
+var logElement = $(".task-detail-log-maintext"),
+ logElementRect = logElement[0].getBoundingClientRect();
$(".task-detail-log-clipboard-wrap").html('');
$(".task-detail-log-clipboard")
.html("stderr: \n" + $(".stderr").html() + "\n stdout:\n" +
$(".stdout").html())
.css('display', 'block')
- .width(logElement.width())
- .height(logElement.height())
+ .width(logElementRect.width)
+ .height(logElementRect.height)
.select();
logElement.css("display", "none");
http://git-wip-us.apache.org/repos/asf/ambari/blob/2915a9a3/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
--
diff --git a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
index e309b4c..8dfd398 100644
--- a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
+++ b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
@@ -247,13 +247,14 @@ App.WizardStep9HostLogPopupBodyView = Em.View.extend({
* @method createClipBoard
*/
createClipBoard: function () {
-var log = $(".task-detail-log-maintext");
+var log = $(".task-detail-log-maintext"),
+ logRect = log[0].getBoundingClientRect();
$(".task-detail-log-clipboard-wrap").html('');
$(".task-detail-log-clipboard")
.html("stderr: \n" + $(".stderr").html() + "\n stdout:\n" +
$(".stdout").html())
.css("display", "block")
- .width(log.width())
- .height(log.height())
+ .width(logRect.width)
+ .height(logRect.height)
.select();
log.css("display", "none")
},
[1/2] ambari git commit: AMBARI-14243. FE: Show message on login page if authentication failed
Repository: ambari
Updated Branches:
refs/heads/trunk 285539424 -> 2915a9a34
AMBARI-14243. FE: Show message on login page if authentication failed
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcaaca2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcaaca2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcaaca2e
Branch: refs/heads/trunk
Commit: dcaaca2ea87cd5bed4a44730f446de443349a92a
Parents: 2855394
Author: Alex Antonenko
Authored: Mon Dec 7 12:34:23 2015 +0200
Committer: Alex Antonenko
Committed: Mon Dec 7 12:34:23 2015 +0200
--
ambari-web/app/controllers/login_controller.js | 4 ++--
ambari-web/app/router.js | 9 -
2 files changed, 10 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcaaca2e/ambari-web/app/controllers/login_controller.js
--
diff --git a/ambari-web/app/controllers/login_controller.js
b/ambari-web/app/controllers/login_controller.js
index a3b8e32..fc64a54 100644
--- a/ambari-web/app/controllers/login_controller.js
+++ b/ambari-web/app/controllers/login_controller.js
@@ -37,7 +37,7 @@ App.LoginController = Em.Object.extend({
postLogin: function (isConnected, isAuthenticated, responseText) {
if (!isConnected) {
- this.set('errorMessage', Em.I18n.t('login.error.bad.connection'));
+ this.set('errorMessage', responseText ||
Em.I18n.t('login.error.bad.connection'));
} else if (!isAuthenticated) {
var errorMessage = "";
if( responseText === "User is disabled" ){
@@ -51,4 +51,4 @@ App.LoginController = Em.Object.extend({
this.set('isSubmitDisabled', false);
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcaaca2e/ambari-web/app/router.js
--
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 0df7485..7bd3a58 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -221,6 +221,9 @@ App.Router = Em.Router.extend({
} finally {
this.setAuthenticated(false);
}
+} else if (data.status >= 500) {
+ this.setAuthenticated(false);
+ this.loginErrorCallback(data);
}
},
@@ -331,12 +334,16 @@ App.Router = Em.Router.extend({
loginErrorCallback: function(request) {
var controller = this.get('loginController');
this.setAuthenticated(false);
-if (request.status == 403) {
+if (request.status > 400) {
var responseMessage = request.responseText;
try{
responseMessage = JSON.parse(request.responseText).message;
}catch(e){}
+}
+if (request.status == 403) {
controller.postLogin(true, false, responseMessage);
+} else if (request.status == 500) {
+ controller.postLogin(false, false, responseMessage);
} else {
controller.postLogin(false, false, null);
}
[1/2] ambari git commit: Revert "AMBARI-14237. UT failure: UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer (dlysnichenko)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 302e3f21e -> e15d1e0fb
refs/heads/trunk 40ab02040 -> 285539424
Revert "AMBARI-14237. UT failure:
UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer
(dlysnichenko)"
This reverts commit 40ab0204082e7c3a2d92fb3770ec7f9d103714b2.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28553942
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28553942
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28553942
Branch: refs/heads/trunk
Commit: 285539424ef5285708178b553e7ed05d38d0a754
Parents: 40ab020
Author: Lisnichenko Dmitro
Authored: Mon Dec 7 09:57:23 2015 +0200
Committer: Lisnichenko Dmitro
Committed: Mon Dec 7 09:57:23 2015 +0200
--
.../internal/UpgradeResourceProviderHDP22Test.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/28553942/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
index 408440a..b0e3467 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
@@ -131,11 +131,11 @@ public class UpgradeResourceProviderHDP22Test {
{
put("hive-site", new HashMap() {
{
-put("tag", configTagVersion2);
+put("tag", configTagVersion1);
}
});
}
-}).anyTimes();
+}).times(3);
expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class),
EasyMock.eq("h1"))).andReturn(new HashMap>() {
{
@@ -145,7 +145,7 @@ public class UpgradeResourceProviderHDP22Test {
}
});
}
-}).anyTimes();
+}).times(2);
expect(configHelper.getEffectiveConfigProperties(EasyMock.anyObject(Cluster.class),
EasyMock.anyObject(Map.class))).andReturn(
new HashMap>() {
@@ -159,7 +159,7 @@ public class UpgradeResourceProviderHDP22Test {
{
put("hive-site", configTagVersion2Properties);
}
-}).anyTimes();
+}).times(2);
expect(configHelper.getMergedConfig(EasyMock.anyObject(Map.class),
EasyMock.anyObject(Map.class))).andReturn(new HashMap()).anyTimes();
[2/2] ambari git commit: AMBARI-14237. UT failure: UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer (dlysnichenko)
AMBARI-14237. UT failure:
UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e15d1e0f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e15d1e0f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e15d1e0f
Branch: refs/heads/branch-2.2
Commit: e15d1e0fb3777f79cb473cf5de0f7a6bf30e63bd
Parents: 302e3f2
Author: Lisnichenko Dmitro
Authored: Mon Dec 7 10:00:19 2015 +0200
Committer: Lisnichenko Dmitro
Committed: Mon Dec 7 10:00:19 2015 +0200
--
.../internal/UpgradeResourceProviderHDP22Test.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e15d1e0f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
index a8fa393..2ef1aa0 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java
@@ -140,11 +140,11 @@ public class UpgradeResourceProviderHDP22Test {
{
put("hive-site", new HashMap() {
{
-put("tag", configTagVersion1);
+put("tag", configTagVersion2);
}
});
}
-}).times(3);
+}).anyTimes();
expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class),
EasyMock.eq("h1"))).andReturn(new HashMap>() {
{
@@ -154,7 +154,7 @@ public class UpgradeResourceProviderHDP22Test {
}
});
}
-}).times(2);
+}).anyTimes();
expect(configHelper.getEffectiveConfigProperties(EasyMock.anyObject(Cluster.class),
EasyMock.anyObject(Map.class))).andReturn(
new HashMap>() {
@@ -168,7 +168,7 @@ public class UpgradeResourceProviderHDP22Test {
{
put("hive-site", configTagVersion2Properties);
}
-}).times(2);
+}).anyTimes();
expect(configHelper.getMergedConfig(EasyMock.anyObject(Map.class),
EasyMock.anyObject(Map.class))).andReturn(new HashMap()).anyTimes();
