Browse Source

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

Srimanth Gunturi 10 years ago
parent
commit
d744db13ad

+ 1 - 0
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";

+ 1 - 1
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) {

+ 4 - 0
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);
   },

+ 1 - 1
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",