incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject svn commit: r1490428 - in /incubator/ambari/branches/branch-1.4.0/ambari-web/app: controllers/main/service/info/configs.js data/service_configs.js
Date Thu, 06 Jun 2013 20:24:26 GMT
Author: srimanth
Date: Thu Jun  6 20:24:26 2013
New Revision: 1490428

URL: http://svn.apache.org/r1490428
Log:
AMBARI-2298. YARN/MR2 do not start after reconfiguring. (Andrii Tkach via srimanth)

Modified:
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/service/info/configs.js
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/service/info/configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/service/info/configs.js?rev=1490428&r1=1490427&r2=1490428&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/service/info/configs.js
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/main/service/info/configs.js
Thu Jun  6 20:24:26 2013
@@ -1473,6 +1473,22 @@ App.MainServiceInfoConfigsController = E
         jobTrackerHost.defaultValue = this.get('content.hostComponents').findProperty('componentName',
'JOBTRACKER').get('host.hostName');
         globalConfigs.push(jobTrackerHost);
         break;
+      case 'MAPREDUCE2':
+        var historyServerHost = serviceConfigs.findProperty('name', 'hs_host');
+        historyServerHost.defaultValue = this.get('content.hostComponents').findProperty('componentName',
'HISTORYSERVER').get('host.hostName');
+        globalConfigs.push(historyServerHost);
+        break;
+      case 'YARN':
+        var resourceManagerHost = serviceConfigs.findProperty('name', 'rm_host');
+        resourceManagerHost.defaultValue = this.get('content.hostComponents').findProperty('componentName',
'RESOURCEMANAGER').get('host.hostName');
+        globalConfigs.push(resourceManagerHost);
+        //yarn.log.server.url config dependent on HistoryServer host
+        if(App.HostComponent.find().someProperty('componentName', 'HISTORYSERVER')){
+          historyServerHost = this.get('serviceConfigs').findProperty('serviceName', 'MAPREDUCE2').configs.findProperty('name',
'hs_host');
+          historyServerHost.defaultValue = App.HostComponent.find().findProperty('componentName',
'HISTORYSERVER').get('host.hostName');
+          globalConfigs.push(historyServerHost);
+        }
+        break;
       case 'HIVE':
         var hiveMetastoreHost = serviceConfigs.findProperty('name', 'hivemetastore_host');
         hiveMetastoreHost.defaultValue = this.get('content.hostComponents').findProperty('componentName',
'HIVE_SERVER').get('host.hostName');

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js?rev=1490428&r1=1490427&r2=1490428&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/data/service_configs.js Thu Jun
 6 20:24:26 2013
@@ -64,7 +64,7 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom
mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
     ],
-    sites: ['core-site', 'mapred-site', 'mapred-queue-acls'],
+    sites: ['global', 'core-site', 'mapred-site', 'mapred-queue-acls'],
     configs: []
   },
 
@@ -80,7 +80,7 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom
yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true})
     ],
-    sites: ['core-site', 'yarn-site', 'capacity-scheduler', 'mapred-queue-acls'],
+    sites: ['global', 'core-site', 'yarn-site', 'capacity-scheduler'],
     configs: []
   },
 



Mime
View raw message