svn commit: r1476479 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/host/details.js ambari-web/app/messages.js

[yu...@apache.org]

Author: yusaku
Date: Sat Apr 27 03:18:38 2013
New Revision: 1476479

URL: http://svn.apache.org/r1476479
Log:
AMBARI-2033. Make frontend changes to account for the host component status UNKNOWN. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js
    incubator/ambari/trunk/ambari-web/app/messages.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1476479&r1=1476478&r2=1476479&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Apr 27 03:18:38 2013
@@ -802,6 +802,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2033. Decommission DataNode does not have any request context.
+ (yusaku)
+
  AMBARI-2029. Error when loading /main/services directly. (yusaku)
  
  AMBARI-2039. Service check should be scheduled on a client that is on

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js?rev=1476479&r1=1476478&r2=1476479&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js Sat Apr 27 03:18:38 2013
@@ -302,22 +302,24 @@ App.MainHostDetailsController = Em.Contr
         if (index < 0) {
           decommissionHostNames.push(hostName);
         }
-        self.doDatanodeDecommission(decommissionHostNames);
+        self.doDatanodeDecommission(decommissionHostNames, true);
       }
       App.router.get('backgroundOperationsController').showPopup();
     });
   },
 
   /**
-   * Performs either Decommission or Recommision by updating the hosts list on
+   * Performs either Decommission or Recommission by updating the hosts list on
    * server.
+   * @param decommission defines context for request (true for decommission and false for recommission)
    */
-  doDatanodeDecommission: function(decommissionHostNames){
+  doDatanodeDecommission: function(decommissionHostNames, decommission){
     var self = this;
     if (decommissionHostNames == null) {
       decommissionHostNames = [];
     }
     var invocationTag = String(new Date().getTime());
+    var context = decommission ? Em.I18n.t('hosts.host.datanode.decommission') : Em.I18n.t('hosts.host.datanode.recommission');
     var clusterName = App.router.get('clusterController.clusterName');
     var clusterUrl = App.apiPrefix + '/clusters/' + clusterName;
     var configsUrl = clusterUrl + '/configurations';
@@ -337,10 +339,14 @@ App.MainHostDetailsController = Em.Contr
       success: function(){
         var actionsUrl = clusterUrl + '/services/HDFS/actions/DECOMMISSION_DATANODE';
         var actionsData = {
-          parameters: {
-            excludeFileTag: invocationTag
+          RequestInfo: {
+            context: context},
+          Body: {
+            parameters: {
+              excludeFileTag: invocationTag
+            }
           }
-        }
+        };
         var actionsAjax = {
           type: 'POST',
           url: actionsUrl,
@@ -398,7 +404,7 @@ App.MainHostDetailsController = Em.Contr
         var hostName = self.get('content.hostName');
         var index = decommissionHostNames.indexOf(hostName);
         decommissionHostNames.splice(index, 1);
-        self.doDatanodeDecommission(decommissionHostNames);
+        self.doDatanodeDecommission(decommissionHostNames, false);
       }
       App.router.get('backgroundOperationsController').showPopup();
     });

Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1476479&r1=1476478&r2=1476479&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Sat Apr 27 03:18:38 2013
@@ -851,6 +851,9 @@ Em.I18n.translations = {
   'host.host.componentFilter.slave':'Slave Components',
   'host.host.componentFilter.client':'Client Components',
   'hosts.host.addComponent.note':'Note: After this component is installed, go to Services -> Nagios to restart the Nagios service.  This is required for the alerts and notifications to work properly.',
+  'hosts.host.datanode.decommission':'Decommission DataNode',
+  'hosts.host.datanode.recommission':'Recommission DataNode',
+
 
   'hosts.host.alert.noAlerts':'No alerts',
   'hosts.host.alert.noAlerts.message':'There are no alerts for this host.',