ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject git commit: AMBARI-8113. Slider View: Stopped YARN service needs appropriate message (srimanth)
Date Mon, 03 Nov 2014 01:23:11 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 2583407a8 -> d744db13a


AMBARI-8113. Slider View: Stopped YARN service needs appropriate message (srimanth)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d744db13
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d744db13
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d744db13

Branch: refs/heads/trunk
Commit: d744db13ad75ad4eabd9a128e3b32597347ddb98
Parents: 2583407
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Sun Nov 2 17:10:39 2014 -0800
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Sun Nov 2 17:22:54 2014 -0800

----------------------------------------------------------------------
 .../org/apache/ambari/view/slider/SliderAppsViewController.java  | 1 +
 .../apache/ambari/view/slider/SliderAppsViewControllerImpl.java  | 2 +-
 .../src/main/resources/ui/app/controllers/slider_controller.js   | 4 ++++
 contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js   | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d744db13/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
index 4cdecf7..25b0b89 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
@@ -42,6 +42,7 @@ public interface SliderAppsViewController {
   public static final String PROPERTY_GANGLIA_SERVER_HOSTNAME = "ganglia.server.hostname";
   public static final String PROPERTY_GANGLIA_CUSTOM_CLUSTERS = "ganglia.additional.clusters";
   public static final String PROPERTY_YARN_RM_WEBAPP_URL = "yarn.rm.webapp.url";
+  public static final String PROPERTY_SLIDER_USER = "view.slider.user";
   public static final String PROPERTY_SLIDER_SECURITY_ENABLED = "slider.security.enabled";
 
   public static final String METRICS_API_NAME = "Metrics API";

http://git-wip-us.apache.org/repos/asf/ambari/blob/d744db13/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 afeaab7..0370372 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
@@ -27,7 +27,6 @@ import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URI;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -218,6 +217,7 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController
{
               newHadoopConfigs.put("yarn_user", yarnUser); // YARN service user
             }
             newHadoopConfigs.put("slider.user", getUserToRunAs(newHadoopConfigs)); // Slider
user
+            status.getParameters().put(PROPERTY_SLIDER_USER, newHadoopConfigs.get("slider.user"));
             if (newHadoopConfigs.containsKey("security_enabled")) {
               boolean securityEnabled = Boolean.valueOf(newHadoopConfigs.get("security_enabled"));
               if (securityEnabled) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d744db13/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
index 2e9db6d..9e6d1c8 100644
--- a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
+++ b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
@@ -96,6 +96,10 @@ App.SliderController = Ember.Controller.extend(App.RunPeriodically, {
       var key = model.get('viewConfigName');
       model.set('value', properties[key]);
     });
+    if (properties['view.slider.user'] != null
+        && properties['view.slider.user'] != App.get('sliderUser')) {
+      App.set('sliderUser', properties['view.slider.user']);
+    }
     this.initGangliaProperties();
     this.finishSliderConfiguration(data);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/d744db13/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
index ed9575b..b622992 100644
--- a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
+++ b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
@@ -31,7 +31,7 @@
 var urls = {
 
   'slider.getViewParams': {
-    real: '',
+    real: '?fields=ViewInstanceInfo',
     mock: '/data/resource/slider-properties.json',
     headers: {
       Accept: "text/plain; charset=utf-8",


Mime
View raw message