You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/12/18 23:15:57 UTC
[1/5] git commit: AMBARI-3987 - Resource providers are set with wrong
stack version.
Updated Branches:
refs/heads/branch-1.4 b954a8d46 -> eb3837d28
AMBARI-3987 - Resource providers are set with wrong stack version.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/39c17aca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/39c17aca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/39c17aca
Branch: refs/heads/branch-1.4
Commit: 39c17aca03e850a4d1e905c85999fe658f15e21b
Parents: b954a8d
Author: tbeerbower <tb...@hortonworks.com>
Authored: Thu Dec 5 10:41:24 2013 -0500
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Dec 18 14:12:51 2013 -0800
----------------------------------------------------------------------
.../internal/AbstractProviderModule.java | 27 ++++-
.../internal/AbstractProviderModuleTest.java | 121 +++++++++++++++++++
2 files changed, 144 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/39c17aca/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 0f392d0..4011f4d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -43,11 +43,12 @@ import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.State;
-import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* An abstract provider module implementation.
@@ -315,6 +316,18 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
// ----- utility methods ---------------------------------------------------
+ /**
+ * Get the metrics version for the given cluster name.
+ *
+ * @param clusterName the cluster name
+ *
+ * @return the metrics version for the given cluster name
+ */
+ protected PropertyHelper.MetricsVersion getMetricsVersion(String clusterName) {
+ updateClusterVersion();
+ return clusterVersionsMap.get(clusterName);
+ }
+
protected abstract ResourceProvider createResourceProvider(Resource.Type type);
protected void registerResourceProvider(Resource.Type type) {
@@ -444,9 +457,15 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
for (Resource cluster : clusters) {
String clusterVersion = (String) cluster.getPropertyValue(CLUSTER_VERSION_PROPERTY_ID);
-
- PropertyHelper.MetricsVersion version = clusterVersion.startsWith("HDP-1") ?
- PropertyHelper.MetricsVersion.HDP1 : PropertyHelper.MetricsVersion.HDP2;
+ PropertyHelper.MetricsVersion version = PropertyHelper.MetricsVersion.HDP2;
+
+ Matcher m = Pattern.compile("[0-9]+(\\.[0-9]+)+").matcher(clusterVersion);
+ if (m.find()) {
+ clusterVersion = m.group(0);
+ if (clusterVersion.equals("1") || clusterVersion.startsWith("1.")) {
+ version = PropertyHelper.MetricsVersion.HDP1;
+ }
+ }
clusterVersionsMap.put(
(String) cluster.getPropertyValue(CLUSTER_NAME_PROPERTY_ID),
http://git-wip-us.apache.org/repos/asf/ambari/blob/39c17aca/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
new file mode 100644
index 0000000..36410c9
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
@@ -0,0 +1,121 @@
+package org.apache.ambari.server.controller.internal;
+
+import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
+import org.apache.ambari.server.controller.spi.NoSuchResourceException;
+import org.apache.ambari.server.controller.spi.Predicate;
+import org.apache.ambari.server.controller.spi.Request;
+import org.apache.ambari.server.controller.spi.RequestStatus;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
+import org.apache.ambari.server.controller.spi.ResourceProvider;
+import org.apache.ambari.server.controller.spi.SystemException;
+import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * AbstractProviderModule tests.
+ */
+public class AbstractProviderModuleTest {
+ @Test
+ public void testGetMetricsVersion() throws Exception {
+
+ TestAbstractProviderModule module = new TestAbstractProviderModule("HDP-1.0");
+ PropertyHelper.MetricsVersion version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP1, version);
+ version = module.getMetricsVersion("c2");
+ Assert.assertNull(version);
+
+ module = new TestAbstractProviderModule("HDPLocal-1.3.2");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP1, version);
+
+ module = new TestAbstractProviderModule("HDP-2.0.1");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+
+ module = new TestAbstractProviderModule("HDP-2.0.1.x");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+
+ module = new TestAbstractProviderModule("HDP-9.9.9");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+
+ module = new TestAbstractProviderModule("HDPLocal-2.0.0");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+ }
+
+ private static class TestAbstractProviderModule extends AbstractProviderModule {
+ private final String clusterVersion;
+
+ private TestAbstractProviderModule(String clusterVersion) {
+ this.clusterVersion = clusterVersion;
+ }
+
+ @Override
+ protected ResourceProvider createResourceProvider(Resource.Type type) {
+ return new TestResourceProvider(type, clusterVersion);
+ }
+ }
+
+ private static class TestResourceProvider implements ResourceProvider {
+ private final Resource.Type type;
+ private final String clusterVersion;
+
+ private TestResourceProvider(Resource.Type type, String clusterVersion) {
+ this.type = type;
+ this.clusterVersion = clusterVersion;
+ }
+
+ @Override
+ public RequestStatus createResources(Request request)
+ throws SystemException, UnsupportedPropertyException,
+ ResourceAlreadyExistsException, NoSuchParentResourceException {
+ return null;
+ }
+
+ @Override
+ public Set<Resource> getResources(Request request, Predicate predicate)
+ throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+
+ if (type == Resource.Type.Cluster) {
+ Resource cluster = new ResourceImpl(Resource.Type.Cluster);
+ cluster.setProperty(ClusterResourceProvider.CLUSTER_ID_PROPERTY_ID, 1);
+ cluster.setProperty(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, "c1");
+ cluster.setProperty(ClusterResourceProvider.CLUSTER_VERSION_PROPERTY_ID, clusterVersion);
+
+ return Collections.singleton(cluster);
+ }
+ return Collections.emptySet();
+ }
+
+ @Override
+ public RequestStatus updateResources(Request request, Predicate predicate)
+ throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ return null;
+ }
+
+ @Override
+ public RequestStatus deleteResources(Predicate predicate)
+ throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ return null;
+ }
+
+ @Override
+ public Map<Resource.Type, String> getKeyPropertyIds() {
+ return null;
+ }
+
+ @Override
+ public Set<String> checkPropertyIds(Set<String> propertyIds) {
+ return null;
+ }
+ }
+}
[3/5] git commit: Revert "AMBARI-3987 - Resource providers are set
with wrong stack version."
Posted by yu...@apache.org.
Revert "AMBARI-3987 - Resource providers are set with wrong stack version."
This reverts commit ba83fbf7f7a5219fd287128799bbed1b8b75bc96.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b21fa0c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b21fa0c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b21fa0c4
Branch: refs/heads/branch-1.4
Commit: b21fa0c4c46a9c657e86404f546a15508c84f780
Parents: 389279b
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Dec 5 14:54:13 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Dec 18 14:13:13 2013 -0800
----------------------------------------------------------------------
.../internal/AbstractProviderModule.java | 27 +----
.../internal/AbstractProviderModuleTest.java | 121 -------------------
2 files changed, 4 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b21fa0c4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 4011f4d..0f392d0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -43,12 +43,11 @@ import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.State;
+import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* An abstract provider module implementation.
@@ -316,18 +315,6 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
// ----- utility methods ---------------------------------------------------
- /**
- * Get the metrics version for the given cluster name.
- *
- * @param clusterName the cluster name
- *
- * @return the metrics version for the given cluster name
- */
- protected PropertyHelper.MetricsVersion getMetricsVersion(String clusterName) {
- updateClusterVersion();
- return clusterVersionsMap.get(clusterName);
- }
-
protected abstract ResourceProvider createResourceProvider(Resource.Type type);
protected void registerResourceProvider(Resource.Type type) {
@@ -457,15 +444,9 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
for (Resource cluster : clusters) {
String clusterVersion = (String) cluster.getPropertyValue(CLUSTER_VERSION_PROPERTY_ID);
- PropertyHelper.MetricsVersion version = PropertyHelper.MetricsVersion.HDP2;
-
- Matcher m = Pattern.compile("[0-9]+(\\.[0-9]+)+").matcher(clusterVersion);
- if (m.find()) {
- clusterVersion = m.group(0);
- if (clusterVersion.equals("1") || clusterVersion.startsWith("1.")) {
- version = PropertyHelper.MetricsVersion.HDP1;
- }
- }
+
+ PropertyHelper.MetricsVersion version = clusterVersion.startsWith("HDP-1") ?
+ PropertyHelper.MetricsVersion.HDP1 : PropertyHelper.MetricsVersion.HDP2;
clusterVersionsMap.put(
(String) cluster.getPropertyValue(CLUSTER_NAME_PROPERTY_ID),
http://git-wip-us.apache.org/repos/asf/ambari/blob/b21fa0c4/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
deleted file mode 100644
index 36410c9..0000000
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.apache.ambari.server.controller.internal;
-
-import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
-import org.apache.ambari.server.controller.spi.NoSuchResourceException;
-import org.apache.ambari.server.controller.spi.Predicate;
-import org.apache.ambari.server.controller.spi.Request;
-import org.apache.ambari.server.controller.spi.RequestStatus;
-import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
-import org.apache.ambari.server.controller.spi.ResourceProvider;
-import org.apache.ambari.server.controller.spi.SystemException;
-import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * AbstractProviderModule tests.
- */
-public class AbstractProviderModuleTest {
- @Test
- public void testGetMetricsVersion() throws Exception {
-
- TestAbstractProviderModule module = new TestAbstractProviderModule("HDP-1.0");
- PropertyHelper.MetricsVersion version = module.getMetricsVersion("c1");
- Assert.assertEquals(PropertyHelper.MetricsVersion.HDP1, version);
- version = module.getMetricsVersion("c2");
- Assert.assertNull(version);
-
- module = new TestAbstractProviderModule("HDPLocal-1.3.2");
- version = module.getMetricsVersion("c1");
- Assert.assertEquals(PropertyHelper.MetricsVersion.HDP1, version);
-
- module = new TestAbstractProviderModule("HDP-2.0.1");
- version = module.getMetricsVersion("c1");
- Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
-
- module = new TestAbstractProviderModule("HDP-2.0.1.x");
- version = module.getMetricsVersion("c1");
- Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
-
- module = new TestAbstractProviderModule("HDP-9.9.9");
- version = module.getMetricsVersion("c1");
- Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
-
- module = new TestAbstractProviderModule("HDPLocal-2.0.0");
- version = module.getMetricsVersion("c1");
- Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
- }
-
- private static class TestAbstractProviderModule extends AbstractProviderModule {
- private final String clusterVersion;
-
- private TestAbstractProviderModule(String clusterVersion) {
- this.clusterVersion = clusterVersion;
- }
-
- @Override
- protected ResourceProvider createResourceProvider(Resource.Type type) {
- return new TestResourceProvider(type, clusterVersion);
- }
- }
-
- private static class TestResourceProvider implements ResourceProvider {
- private final Resource.Type type;
- private final String clusterVersion;
-
- private TestResourceProvider(Resource.Type type, String clusterVersion) {
- this.type = type;
- this.clusterVersion = clusterVersion;
- }
-
- @Override
- public RequestStatus createResources(Request request)
- throws SystemException, UnsupportedPropertyException,
- ResourceAlreadyExistsException, NoSuchParentResourceException {
- return null;
- }
-
- @Override
- public Set<Resource> getResources(Request request, Predicate predicate)
- throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
-
- if (type == Resource.Type.Cluster) {
- Resource cluster = new ResourceImpl(Resource.Type.Cluster);
- cluster.setProperty(ClusterResourceProvider.CLUSTER_ID_PROPERTY_ID, 1);
- cluster.setProperty(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, "c1");
- cluster.setProperty(ClusterResourceProvider.CLUSTER_VERSION_PROPERTY_ID, clusterVersion);
-
- return Collections.singleton(cluster);
- }
- return Collections.emptySet();
- }
-
- @Override
- public RequestStatus updateResources(Request request, Predicate predicate)
- throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
- return null;
- }
-
- @Override
- public RequestStatus deleteResources(Predicate predicate)
- throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
- return null;
- }
-
- @Override
- public Map<Resource.Type, String> getKeyPropertyIds() {
- return null;
- }
-
- @Override
- public Set<String> checkPropertyIds(Set<String> propertyIds) {
- return null;
- }
- }
-}
[2/5] git commit: AMBARI-3966. Secure cluster: task-controller binary
should be owned by the group specified in taskcontroller.cfg. (jaimin)
Posted by yu...@apache.org.
AMBARI-3966. Secure cluster: task-controller binary should be owned by the group specified in taskcontroller.cfg. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/389279b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/389279b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/389279b6
Branch: refs/heads/branch-1.4
Commit: 389279b6f4405abc589c15b89615cdd4e1bfc20b
Parents: 39c17ac
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Dec 5 14:29:56 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Dec 18 14:12:58 2013 -0800
----------------------------------------------------------------------
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp | 2 +-
ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp | 2 +-
ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/389279b6/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
index da3d1cb..a734483 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
@@ -288,7 +288,7 @@ class hdp-hadoop(
if ($hdp::params::security_enabled == true) {
file { "${hdp::params::hadoop_bin}/task-controller":
owner => 'root',
- group => $hdp::params::user_group,
+ group => $hdp-hadoop::params::mapred_tt_group,
mode => '6050',
require => Hdp-hadoop::Package['hadoop'],
before => Anchor['hdp-hadoop::end']
http://git-wip-us.apache.org/repos/asf/ambari/blob/389279b6/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
index a8bbf80..5d74f86 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
@@ -152,7 +152,7 @@ define hdp-yarn::generate_common_configs() {
$container_executor = "${hdp::params::yarn_container_bin}/container-executor"
file { $container_executor:
ensure => present,
- group => $hdp::params::user_group,
+ group => $hdp-yarn::params::yarn_executor_container_group,
mode => 6050
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/389279b6/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
index 637b515..c644411 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
@@ -28,6 +28,7 @@ class hdp-yarn::params(
## security params
$security_enabled = $hdp::params::security_enabled
$smoke_user_keytab = $hdp::params::smokeuser_keytab
+ $yarn_executor_container_group = hdp_default("yarn-site/yarn.nodemanager.linux-container-executor.group","hadoop")
$kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"
## yarn-env
[4/5] git commit: AMBARI-3987 - Resource providers are set with wrong
stack version.
Posted by yu...@apache.org.
AMBARI-3987 - Resource providers are set with wrong stack version.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2628187e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2628187e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2628187e
Branch: refs/heads/branch-1.4
Commit: 2628187e44cd4406cf63366dc427034af0db6ab9
Parents: b21fa0c
Author: tbeerbower <tb...@hortonworks.com>
Authored: Thu Dec 5 18:06:26 2013 -0500
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Dec 18 14:13:22 2013 -0800
----------------------------------------------------------------------
.../internal/AbstractProviderModule.java | 26 +++-
.../internal/AbstractProviderModuleTest.java | 121 +++++++++++++++++++
2 files changed, 144 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2628187e/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 0f392d0..4d8cf5f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -48,6 +48,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* An abstract provider module implementation.
@@ -315,6 +317,18 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
// ----- utility methods ---------------------------------------------------
+ /**
+ * Get the metrics version for the given cluster name.
+ *
+ * @param clusterName the cluster name
+ *
+ * @return the metrics version for the given cluster name
+ */
+ protected PropertyHelper.MetricsVersion getMetricsVersion(String clusterName) {
+ updateClusterVersion();
+ return clusterVersionsMap.get(clusterName);
+ }
+
protected abstract ResourceProvider createResourceProvider(Resource.Type type);
protected void registerResourceProvider(Resource.Type type) {
@@ -444,9 +458,15 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
for (Resource cluster : clusters) {
String clusterVersion = (String) cluster.getPropertyValue(CLUSTER_VERSION_PROPERTY_ID);
-
- PropertyHelper.MetricsVersion version = clusterVersion.startsWith("HDP-1") ?
- PropertyHelper.MetricsVersion.HDP1 : PropertyHelper.MetricsVersion.HDP2;
+ PropertyHelper.MetricsVersion version = PropertyHelper.MetricsVersion.HDP2;
+
+ Matcher m = Pattern.compile("[0-9]+(\\.[0-9]+)+").matcher(clusterVersion);
+ if (m.find()) {
+ clusterVersion = m.group(0);
+ if (clusterVersion.equals("1") || clusterVersion.startsWith("1.")) {
+ version = PropertyHelper.MetricsVersion.HDP1;
+ }
+ }
clusterVersionsMap.put(
(String) cluster.getPropertyValue(CLUSTER_NAME_PROPERTY_ID),
http://git-wip-us.apache.org/repos/asf/ambari/blob/2628187e/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
new file mode 100644
index 0000000..36410c9
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractProviderModuleTest.java
@@ -0,0 +1,121 @@
+package org.apache.ambari.server.controller.internal;
+
+import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
+import org.apache.ambari.server.controller.spi.NoSuchResourceException;
+import org.apache.ambari.server.controller.spi.Predicate;
+import org.apache.ambari.server.controller.spi.Request;
+import org.apache.ambari.server.controller.spi.RequestStatus;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
+import org.apache.ambari.server.controller.spi.ResourceProvider;
+import org.apache.ambari.server.controller.spi.SystemException;
+import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * AbstractProviderModule tests.
+ */
+public class AbstractProviderModuleTest {
+ @Test
+ public void testGetMetricsVersion() throws Exception {
+
+ TestAbstractProviderModule module = new TestAbstractProviderModule("HDP-1.0");
+ PropertyHelper.MetricsVersion version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP1, version);
+ version = module.getMetricsVersion("c2");
+ Assert.assertNull(version);
+
+ module = new TestAbstractProviderModule("HDPLocal-1.3.2");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP1, version);
+
+ module = new TestAbstractProviderModule("HDP-2.0.1");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+
+ module = new TestAbstractProviderModule("HDP-2.0.1.x");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+
+ module = new TestAbstractProviderModule("HDP-9.9.9");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+
+ module = new TestAbstractProviderModule("HDPLocal-2.0.0");
+ version = module.getMetricsVersion("c1");
+ Assert.assertEquals(PropertyHelper.MetricsVersion.HDP2, version);
+ }
+
+ private static class TestAbstractProviderModule extends AbstractProviderModule {
+ private final String clusterVersion;
+
+ private TestAbstractProviderModule(String clusterVersion) {
+ this.clusterVersion = clusterVersion;
+ }
+
+ @Override
+ protected ResourceProvider createResourceProvider(Resource.Type type) {
+ return new TestResourceProvider(type, clusterVersion);
+ }
+ }
+
+ private static class TestResourceProvider implements ResourceProvider {
+ private final Resource.Type type;
+ private final String clusterVersion;
+
+ private TestResourceProvider(Resource.Type type, String clusterVersion) {
+ this.type = type;
+ this.clusterVersion = clusterVersion;
+ }
+
+ @Override
+ public RequestStatus createResources(Request request)
+ throws SystemException, UnsupportedPropertyException,
+ ResourceAlreadyExistsException, NoSuchParentResourceException {
+ return null;
+ }
+
+ @Override
+ public Set<Resource> getResources(Request request, Predicate predicate)
+ throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+
+ if (type == Resource.Type.Cluster) {
+ Resource cluster = new ResourceImpl(Resource.Type.Cluster);
+ cluster.setProperty(ClusterResourceProvider.CLUSTER_ID_PROPERTY_ID, 1);
+ cluster.setProperty(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, "c1");
+ cluster.setProperty(ClusterResourceProvider.CLUSTER_VERSION_PROPERTY_ID, clusterVersion);
+
+ return Collections.singleton(cluster);
+ }
+ return Collections.emptySet();
+ }
+
+ @Override
+ public RequestStatus updateResources(Request request, Predicate predicate)
+ throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ return null;
+ }
+
+ @Override
+ public RequestStatus deleteResources(Predicate predicate)
+ throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ return null;
+ }
+
+ @Override
+ public Map<Resource.Type, String> getKeyPropertyIds() {
+ return null;
+ }
+
+ @Override
+ public Set<String> checkPropertyIds(Set<String> propertyIds) {
+ return null;
+ }
+ }
+}
[5/5] git commit: AMBARI-4074. Fix mapred-site.xml configs. (yusaku)
Posted by yu...@apache.org.
AMBARI-4074. Fix mapred-site.xml configs. (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb3837d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb3837d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb3837d2
Branch: refs/heads/branch-1.4
Commit: eb3837d2874f145f9d1bc34fa5cab9c078cd5395
Parents: 2628187
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Dec 13 16:31:08 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Dec 18 14:13:33 2013 -0800
----------------------------------------------------------------------
ambari-web/app/data/config_mapping.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb3837d2/ambari-web/app/data/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/config_mapping.js b/ambari-web/app/data/config_mapping.js
index 9603dfb..59dde30 100644
--- a/ambari-web/app/data/config_mapping.js
+++ b/ambari-web/app/data/config_mapping.js
@@ -369,14 +369,14 @@ var configs = [
"filename": "mapred-site.xml"
},
{
- "name": "mapred.healthChecker.script.path",
+ "name": "mapred.job.tracker.persist.jobstatus.dir",
"templateName": ["mapred_jobstatus_dir"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "mapred-site.xml"
},
{
- "name": "mapred.job.tracker.persist.jobstatus.dir",
+ "name": "mapred.healthChecker.script.path",
"templateName": ["hadoop_conf_dir"],
"foreignKey": null,
"value": "<templateName[0]>/health_check",