You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/08/27 15:46:14 UTC
ambari git commit: AMBARI-12902 Stack meta for JDK support on
back-end (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk e0a78028b -> d02fa7616
AMBARI-12902 Stack meta for JDK support on back-end (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d02fa761
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d02fa761
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d02fa761
Branch: refs/heads/trunk
Commit: d02fa761665b896d87751294471c3054d5a294f2
Parents: e0a7802
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Aug 27 16:46:00 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Aug 27 16:46:00 2015 +0300
----------------------------------------------------------------------
.../controller/RootServiceResponseFactory.java | 1 +
.../server/controller/StackVersionResponse.java | 23 +++++++++++++++++++-
.../internal/StackVersionResourceProvider.java | 8 +++++++
.../apache/ambari/server/stack/StackModule.java | 2 ++
.../apache/ambari/server/state/StackInfo.java | 21 +++++++++++++++++-
.../server/state/stack/StackMetainfoXml.java | 16 +++++++++++++-
.../main/resources/stacks/HDP/2.0/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.1/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.2/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.3/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.4/metainfo.xml | 2 ++
.../RootServiceResponseFactoryTest.java | 5 +++--
12 files changed, 81 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
index e0dbe2c..6bb68b6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
@@ -158,6 +158,7 @@ public class RootServiceResponseFactory extends
case AMBARI_SERVER:
response = configs.getAmbariProperties();
response.put(JDK_LOCATION, managementController.getJdkResourceUrl());
+ response.put("java.version", System.getProperty("java.specification.version"));
break;
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
index 005b8a1..b14826a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
@@ -29,6 +29,25 @@ import org.apache.ambari.server.stack.Validable;
public class StackVersionResponse implements Validable{
+ private String minJdk;
+ private String maxJdk;
+
+ public String getMinJdk() {
+ return minJdk;
+ }
+
+ public void setMinJdk(String minJdk) {
+ this.minJdk = minJdk;
+ }
+
+ public String getMaxJdk() {
+ return maxJdk;
+ }
+
+ public void setMaxJdk(String maxJdk) {
+ this.maxJdk = maxJdk;
+ }
+
private String stackName;
private String stackVersion;
private String minUpgradeVersion;
@@ -57,7 +76,7 @@ public class StackVersionResponse implements Validable{
Map<String, Map<String, Map<String, String>>> configTypes,
File stackKerberosDescriptorFile,
Collection<File> serviceKerberosDescriptorFiles,
- Set<String> upgradePacks, boolean valid, Collection errorSet) {
+ Set<String> upgradePacks, boolean valid, Collection errorSet, String minJdk, String maxJdk) {
setStackVersion(stackVersion);
setMinUpgradeVersion(minUpgradeVersion);
setActive(active);
@@ -68,6 +87,8 @@ public class StackVersionResponse implements Validable{
setUpgradePacks(upgradePacks);
setValid(valid);
setErrors(errorSet);
+ setMinJdk(minJdk);
+ setMaxJdk(maxJdk);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
index adc3a45..f826d6d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
@@ -60,6 +60,8 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
public static final String STACK_CONFIG_TYPES = PropertyHelper.getPropertyId("Versions", "config_types");
public static final String STACK_PARENT_PROPERTY_ID = PropertyHelper.getPropertyId("Versions", "parent_stack_version");
public static final String UPGRADE_PACKS_PROPERTY_ID = PropertyHelper.getPropertyId("Versions", "upgrade_packs");
+ public static final String STACK_MIN_JDK = PropertyHelper.getPropertyId("Versions", "min_jdk");
+ public static final String STACK_MAX_JDK = PropertyHelper.getPropertyId("Versions", "max_jdk");
private static Set<String> pkPropertyIds = new HashSet<String>(
Arrays.asList(new String[] { STACK_NAME_PROPERTY_ID, STACK_VERSION_PROPERTY_ID }));
@@ -138,6 +140,12 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
setResourceProperty(resource, UPGRADE_PACKS_PROPERTY_ID,
response.getUpgradePacks(), requestedIds);
+ setResourceProperty(resource, STACK_MIN_JDK,
+ response.getMinJdk(), requestedIds);
+
+ setResourceProperty(resource, STACK_MAX_JDK,
+ response.getMaxJdk(), requestedIds);
+
resources.add(resource);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
index 2df6e04..4fe7ed7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
@@ -411,6 +411,8 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
stackInfo.setValid(false);
stackInfo.setErrors(smx.getErrors());
}
+ stackInfo.setMinJdk(smx.getMinJdk());
+ stackInfo.setMaxJdk(smx.getMaxJdk());
stackInfo.setMinUpgradeVersion(smx.getVersion().getUpgrade());
stackInfo.setActive(smx.getVersion().isActive());
stackInfo.setParentStackVersion(smx.getExtends());
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
index 2aa89cc..8e9d092 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
@@ -34,6 +34,25 @@ import org.apache.ambari.server.state.stack.StackRoleCommandOrder;
import org.apache.ambari.server.state.stack.UpgradePack;
public class StackInfo implements Comparable<StackInfo>, Validable{
+ private String minJdk;
+ private String maxJdk;
+
+ public String getMinJdk() {
+ return minJdk;
+ }
+
+ public void setMinJdk(String minJdk) {
+ this.minJdk = minJdk;
+ }
+
+ public String getMaxJdk() {
+ return maxJdk;
+ }
+
+ public void setMaxJdk(String maxJdk) {
+ this.maxJdk = maxJdk;
+ }
+
private String name;
private String version;
private String minUpgradeVersion;
@@ -257,7 +276,7 @@ public class StackInfo implements Comparable<StackInfo>, Validable{
(stackDescriptorFileFilePath == null) ? null : new File(stackDescriptorFileFilePath),
serviceDescriptorFiles,
null == upgradePacks ? Collections.<String>emptySet() : upgradePacks.keySet(),
- isValid(), getErrors());
+ isValid(), getErrors(), getMinJdk(), getMaxJdk());
}
public String getMinUpgradeVersion() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackMetainfoXml.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackMetainfoXml.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackMetainfoXml.java
index 55b1b9b..5f202ba 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackMetainfoXml.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackMetainfoXml.java
@@ -33,7 +33,21 @@ import org.apache.ambari.server.stack.Validable;
@XmlRootElement(name="metainfo")
@XmlAccessorType(XmlAccessType.FIELD)
public class StackMetainfoXml implements Validable{
-
+
+ public String getMinJdk() {
+ return minJdk;
+ }
+
+ public String getMaxJdk() {
+ return maxJdk;
+ }
+
+ @XmlElement(name="minJdk")
+ private String minJdk = null;
+
+ @XmlElement(name="maxJdk")
+ private String maxJdk = null;
+
@XmlElement(name="extends")
private String extendsVersion = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/resources/stacks/HDP/2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0/metainfo.xml
index 352b8d4..0d4c27f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0/metainfo.xml
@@ -20,4 +20,6 @@
<active>true</active>
</versions>
<extends>2.0.6</extends>
+ <minJdk>1.7</minJdk>
+ <maxJdk>1.7</maxJdk>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml
index 3c7f87d..8ee982c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml
@@ -20,4 +20,6 @@
<active>true</active>
</versions>
<extends>2.0.6</extends>
+ <minJdk>1.7</minJdk>
+ <maxJdk>1.7</maxJdk>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/resources/stacks/HDP/2.2/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/metainfo.xml
index 0be6cb6..437d3fd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/metainfo.xml
@@ -20,4 +20,6 @@
<active>true</active>
</versions>
<extends>2.1</extends>
+ <minJdk>1.7</minJdk>
+ <maxJdk>1.7</maxJdk>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/resources/stacks/HDP/2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/metainfo.xml
index d04b44b..f98b24b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/metainfo.xml
@@ -20,4 +20,6 @@
<active>true</active>
</versions>
<extends>2.2</extends>
+ <minJdk>1.7</minJdk>
+ <maxJdk>1.8</maxJdk>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/resources/stacks/HDP/2.4/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/metainfo.xml
index fbc1079..5d312a0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/metainfo.xml
@@ -20,4 +20,6 @@
<active>true</active>
</versions>
<extends>2.3</extends>
+ <minJdk>1.7</minJdk>
+ <maxJdk>1.8</maxJdk>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
index 1e870d6..9fc51bd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
@@ -149,8 +149,9 @@ public class RootServiceResponseFactoryTest {
if (response.getComponentName().equals(
RootServiceResponseFactory.Services.AMBARI.getComponents()[0].name())) {
assertEquals(ambariVersion, response.getComponentVersion());
- assertEquals(1, response.getProperties().size());
+ assertEquals(2, response.getProperties().size());
assertTrue(response.getProperties().containsKey("jdk_location"));
+ assertTrue(response.getProperties().containsKey("java.version"));
}
}
@@ -165,4 +166,4 @@ public class RootServiceResponseFactoryTest {
assertTrue(e instanceof ObjectNotFoundException);
}
}
-}
\ No newline at end of file
+}