You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/04/19 20:46:26 UTC
ambari git commit: AMBARI-15854. Slider View Controller needs to set
a System Property (Gour Saha via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 9ed03583b -> 4a46fe4d8
AMBARI-15854. Slider View Controller needs to set a System Property (Gour Saha via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a46fe4d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a46fe4d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a46fe4d
Branch: refs/heads/trunk
Commit: 4a46fe4d85934be1715973600a1edfcbc6ef72cb
Parents: 9ed0358
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Apr 19 11:34:09 2016 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Apr 19 11:41:37 2016 -0700
----------------------------------------------------------------------
.../ambari/view/slider/SliderAppsViewControllerImpl.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a46fe4d/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 72fb09f..42bd3ba 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -53,6 +53,7 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -1189,6 +1190,8 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
final boolean securityEnabled = Boolean.valueOf(getHadoopConfigs().get("security_enabled"));
final boolean twoWaySSlEnabled = json.has("twoWaySSLEnabled") ? Boolean.valueOf(json.get("twoWaySSLEnabled").getAsString()) : false;
JsonObject configs = json.get("typeConfigs").getAsJsonObject();
+ final String hdpVersion = configs.has("env.HDP_VERSION") ? configs.get(
+ "env.HDP_VERSION").getAsString() : null;
JsonObject resourcesObj = json.get("resources").getAsJsonObject();
JsonArray componentsArray = resourcesObj.get("components").getAsJsonArray();
String appsCreateFolderPath = getAppsCreateFolderPath();
@@ -1268,6 +1271,10 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
sliderClient.actionInstallKeytab(keytabArgs);
}
}
+ if (StringUtils.isNotEmpty(hdpVersion)) {
+ System.setProperty("HDP_VERSION", hdpVersion);
+ logger.info("Setting system property HDP_VERSION=" + hdpVersion);
+ }
sliderClient.actionInstallPkg(installArgs);
sliderClient.actionCreate(appName, createArgs);
ApplicationId applicationId = sliderClient.applicationId;