Repository: ambari Updated Branches: refs/heads/branch-2.2 6b9909aef -> 7c13f0140
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/7c13f014 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c13f014 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c13f014 Branch: refs/heads/branch-2.2 Commit: 7c13f0140b0fc82655ffb3cc4aa983558257e9b4 Parents: 6b9909a Author: Sumit Mohanty <[email protected]> Authored: Tue Apr 19 11:34:09 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Apr 19 11:48:37 2016 -0700 ---------------------------------------------------------------------- .../ambari/view/slider/SliderAppsViewControllerImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7c13f014/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;
