You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/05/31 00:14:32 UTC
svn commit: r1488039 [8/10] - in /incubator/ambari/branches/branch-1.2.4: ./
ambari-agent/ ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/
ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/
ambari-agent/src/main/puppet/modules/hdp-...
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/test/tests.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/test/tests.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/test/tests.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/test/tests.js Thu May 30 22:14:29 2013
@@ -36,11 +36,9 @@ require('test/main/dashboard_test');
require('test/main/host/details_test');
require('test/main/host_test');
require('test/main/item_test');
-require('test/utils/config_test');
-require('test/utils/date_test');
require('test/utils/form_field_test');
-require('test/utils/host_progress_popup_test');
require('test/utils/misc_test');
require('test/utils/validator_test');
+require('test/utils/config_test');
require('test/utils/string_utils_test');
-require('test/views/common/chart/linear_time_test');
+require('test/views/common/chart/linear_time_test');
\ No newline at end of file
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/config.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/config.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/config.js Thu May 30 22:14:29 2013
@@ -34,8 +34,6 @@ App.componentsUpdateInterval = 6000;
App.contentUpdateInterval = 15000;
App.maxRunsForAppBrowser = 500;
App.pageReloadTime=3600000;
-App.singleNodeInstall = false;
-App.singleNodeAlias = document.location.hostname;
// experimental features are automatically enabled if running on brunch server
App.enableExperimental = false;
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/global/cluster_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/global/cluster_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/global/cluster_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/global/cluster_controller.js Thu May 30 22:14:29 2013
@@ -120,7 +120,7 @@ App.ClusterController = Em.Controller.ex
if (host) {
hostName = host.get('publicHostName');
}
- return "http://" + (App.singleNodeInstall ? App.singleNodeAlias : hostName) + "/ganglia";
+ return "http://" + hostName + "/ganglia";
}
}
}
@@ -154,7 +154,7 @@ App.ClusterController = Em.Controller.ex
if (host) {
hostName = host.get('publicHostName');
}
- return "http://" + (App.singleNodeInstall ? App.singleNodeAlias : hostName) + "/nagios";
+ return "http://" + hostName + "/nagios";
}
}
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/cluster.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/cluster.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/cluster.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/cluster.js Thu May 30 22:14:29 2013
@@ -17,7 +17,6 @@
*/
var App = require('app');
-var stringUtils = require('utils/string_utils');
App.MainAdminClusterController = Em.Controller.extend({
name:'mainAdminClusterController',
@@ -41,16 +40,16 @@ App.MainAdminClusterController = Em.Cont
var upgradeVersion = this.get('upgradeVersion') || App.defaultStackVersion;
var currentStack = {};
var upgradeStack = {};
- var currentVersion = App.get('currentStackVersionNumber');
+ var currentVersion = App.currentStackVersion.replace(/HDP-/, '');
var minUpgradeVersion = currentVersion;
upgradeVersion = upgradeVersion.replace(/HDP-/, '');
data.items.mapProperty('Versions.stack_version').forEach(function(version){
- upgradeVersion = (stringUtils.compareVersions(upgradeVersion, version) === -1) ? version : upgradeVersion;
+ upgradeVersion = (upgradeVersion < version) ? version : upgradeVersion;
});
currentStack = data.items.findProperty('Versions.stack_version', currentVersion);
upgradeStack = data.items.findProperty('Versions.stack_version', upgradeVersion);
minUpgradeVersion = upgradeStack.Versions.min_upgrade_version;
- if(minUpgradeVersion && (stringUtils.compareVersions(minUpgradeVersion, currentVersion) === 1)){
+ if(minUpgradeVersion && (minUpgradeVersion > currentVersion)){
upgradeVersion = currentVersion;
upgradeStack = currentStack;
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/misc_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/misc_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/misc_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/misc_controller.js Thu May 30 22:14:29 2013
@@ -42,7 +42,6 @@ App.MainAdminMiscController = App.MainSe
});
},
loadServiceTagSuccess: function(data, opt, params) {
- var installedServices = App.Service.find().mapProperty("serviceName");
var serviceConfigsDef = params.serviceConfigsDef;
var serviceName = this.get('content.serviceName');
var loadedClusterSiteToTagMap = {};
@@ -58,8 +57,6 @@ App.MainAdminMiscController = App.MainSe
var misc_configs = configSet.globalConfigs.filterProperty('serviceName', this.get('selectedService')).filterProperty('category', 'Users and Groups').filterProperty('isVisible', true);
- misc_configs = App.config.miscConfigVisibleProperty(misc_configs, installedServices);
-
var sortOrder = this.get('configs').filterProperty('serviceName', this.get('selectedService')).filterProperty('category', 'Users and Groups').filterProperty('isVisible', true).mapProperty('name');
var sorted = [];
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/add/step3.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/add/step3.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/add/step3.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/add/step3.js Thu May 30 22:14:29 2013
@@ -77,7 +77,7 @@ App.MainAdminSecurityAddStep3Controller
newService.hosts.push({
name: name,
publicName: name,
- logTasks: stages.polledData.filterProperty("Tasks.host_name", name)
+ logTasks: stages.polledData.filterProperty("Tasks.host_name",name)
});
});
services.push(newService);
@@ -102,8 +102,13 @@ App.MainAdminSecurityAddStep3Controller
} else if (currentStage && currentStage.get('stage') === 'stage3') {
if (App.testMode) {
currentStage.set('isSuccess', true);
+ currentStage.set('isCompleted', true);
+ this.moveToNextStage();
} else {
- this.loadClusterConfigs();
+ var self = this;
+ window.setTimeout(function () {
+ self.loadClusterConfigs();
+ }, 12000);
}
}
}
@@ -112,9 +117,12 @@ App.MainAdminSecurityAddStep3Controller
onCompleteStage: function () {
var index = this.get('stages').filterProperty('isCompleted', true).length;
if (index > 0) {
+ var self = this;
var lastCompletedStageResult = this.get('stages').objectAt(index - 1).get('isSuccess');
if (lastCompletedStageResult) {
- this.moveToNextStage();
+ window.setTimeout(function () {
+ self.moveToNextStage();
+ }, 50);
}
}
}.observes('stages.@each.isCompleted'),
@@ -128,6 +136,7 @@ App.MainAdminSecurityAddStep3Controller
addInfoToStages: function () {
this.addInfoToStage2();
+ this.addInfoToStage3();
this.addInfoToStage4();
},
@@ -148,9 +157,13 @@ App.MainAdminSecurityAddStep3Controller
stage2.set('data', data);
},
+ addInfoToStage3: function () {
+
+ },
+
addInfoToStage4: function () {
var stage4 = this.get('stages').findProperty('stage', 'stage4');
- var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services?params/run_smoke_test=true';
+ var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services';
var data = '{"RequestInfo": {"context": "' + Em.I18n.t('requestInfo.startAllServices') + '"}, "Body": {"ServiceInfo": {"state": "STARTED"}}}';
stage4.set('url', url);
stage4.set('data', data);
@@ -330,7 +343,7 @@ App.MainAdminSecurityAddStep3Controller
serviceUsers.pushObject({id: 'puppet var', name: 'hbase_user', value: 'hbase'});
serviceUsers.pushObject({id: 'puppet var', name: 'hive_user', value: 'hive'});
} else {
- App.router.get('mainAdminSecurityController').setSecurityStatus();
+ App.router.get('mainAdminSecurityController').getSecurityStatusFromServer();
}
},
@@ -412,6 +425,7 @@ App.MainAdminSecurityAddStep3Controller
if (this.get('noOfWaitingAjaxCalls') == 0) {
var currentStage = this.get('stages').findProperty('stage', 'stage3');
currentStage.set('isSuccess', true);
+ currentStage.set('isCompleted', true);
}
},
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/disable.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/disable.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/disable.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/admin/security/disable.js Thu May 30 22:14:29 2013
@@ -21,7 +21,7 @@ App.MainAdminSecurityDisableController =
name: 'mainAdminSecurityDisableController',
secureMapping: require('data/secure_mapping'),
- configMapping: App.config.get('configMapping'),
+ configMapping: require('data/config_mapping'),
secureProperties: require('data/secure_properties').configProperties.slice(0),
stages: [],
configs: [],
@@ -84,7 +84,10 @@ App.MainAdminSecurityDisableController =
currentStage.set('isCompleted', true);
this.moveToNextStage();
} else {
- this.loadClusterConfigs();
+ var self = this;
+ window.setTimeout(function () {
+ self.loadClusterConfigs();
+ }, 12000);
}
}
}
@@ -93,9 +96,10 @@ App.MainAdminSecurityDisableController =
onCompleteStage: function () {
var index = this.get('stages').filterProperty('isCompleted', true).length;
if (index > 0) {
+ var self = this;
var lastCompletedStageResult = this.get('stages').objectAt(index - 1).get('isSuccess');
if (lastCompletedStageResult) {
- this.moveToNextStage();
+ self.moveToNextStage();
}
}
}.observes('stages.@each.isCompleted'),
@@ -123,6 +127,7 @@ App.MainAdminSecurityDisableController =
addInfoToStages: function () {
this.addInfoToStage2();
+ this.addInfoToStage3();
this.addInfoToStage4();
},
@@ -143,9 +148,13 @@ App.MainAdminSecurityDisableController =
stage2.set('data', data);
},
+ addInfoToStage3: function () {
+
+ },
+
addInfoToStage4: function () {
var stage4 = this.get('stages').findProperty('stage', 'stage4');
- var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services?params/run_smoke_test=true';
+ var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services';
var data = '{"RequestInfo": {"context": "' + Em.I18n.t('requestInfo.startAllServices') + '"}, "Body": {"ServiceInfo": {"state": "STARTED"}}}';
stage4.set('url', url);
stage4.set('data', data);
@@ -268,6 +277,7 @@ App.MainAdminSecurityDisableController =
if (this.get('noOfWaitingAjaxCalls') == 0) {
var currentStage = this.get('stages').findProperty('stage', 'stage3');
currentStage.set('isSuccess', true);
+ currentStage.set('isCompleted', true);
}
},
@@ -312,6 +322,9 @@ App.MainAdminSecurityDisableController =
case 'zookeeper.znode.parent':
_serviceConfigTags.configs[configName] = '/hbase-unsecure';
break;
+ case 'oozie.service.AuthorizationService.authorization.enabled':
+ _serviceConfigTags.configs[configName] = 'false';
+ break;
default:
delete _serviceConfigTags.configs[configName];
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/info/configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/info/configs.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/info/configs.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/info/configs.js Thu May 30 22:14:29 2013
@@ -29,9 +29,9 @@ App.MainServiceInfoConfigsController = E
uiConfigs: [],
customConfig: [],
isApplyingChanges: false,
- serviceConfigs: App.config.get('preDefinedServiceConfigs'),
- configs: App.config.get('preDefinedConfigProperties'),
- configMapping: App.config.get('configMapping'),
+ serviceConfigs: require('data/service_configs'),
+ configs: require('data/config_properties').configProperties,
+ configMapping: require('data/config_mapping'),
customConfigs: require('data/custom_configs'),
/**
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/item.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/item.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/item.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/main/service/item.js Thu May 30 22:14:29 2013
@@ -193,9 +193,7 @@ App.MainServiceItemController = Em.Contr
*/
reassignMaster: function (hostComponent) {
console.log('In Reassign Master', hostComponent);
- var reassignMasterController = App.router.get('reassignMasterController');
- reassignMasterController.saveComponentToReassign(hostComponent);
- reassignMasterController.setCurrentStep('1');
+ App.router.get('reassignMasterController').saveComponentToReassign(hostComponent);
App.router.transitionTo('reassignMaster');
},
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard.js Thu May 30 22:14:29 2013
@@ -429,6 +429,7 @@ App.WizardController = Em.Controller.ext
App.db.setSlaveComponentHosts(undefined);
App.db.setCluster(undefined);
App.db.setAllHostNames(undefined);
+ App.db.setSlaveProperties(undefined);
App.db.setInstallOptions(undefined);
App.db.setAllHostNamesPattern(undefined);
},
@@ -456,8 +457,7 @@ App.WizardController = Em.Controller.ext
name: 'wizard.service_components',
sender: this,
data: {
- stackUrl: App.get('stack2VersionURL'),
- stackVersion: App.get('currentStackVersionNumber')
+ stackUrl: App.get('stack2VersionURL')
},
success: 'loadServiceComponentsSuccessCallback',
error: 'loadServiceComponentsErrorCallback'
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/slave_component_groups_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/slave_component_groups_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/slave_component_groups_controller.js Thu May 30 22:14:29 2013
@@ -84,7 +84,7 @@ App.SlaveComponentGroupsController = Em.
// returns key-value pairs i.e. all fields for slave component for this specific service.
componentProperties: function (serviceName) {
- var serviceConfigs = App.config.get('preDefinedServiceConfigs').findProperty('serviceName', serviceName);
+ var serviceConfigs = require('data/service_configs').findProperty('serviceName', serviceName);
var configs = [];
var componentName = null;
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step12_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step12_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step12_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step12_controller.js Thu May 30 22:14:29 2013
@@ -19,18 +19,11 @@
App.WizardStep12Controller = App.MainServiceInfoConfigsController.extend({
modifiedConfigs: [],
- oldConfigs: [],
afterLoad: function () {
if (this.get('dataIsLoaded')) {
this.get('stepConfigs').objectAt(0).get('configs').filterProperty('isEditable', false).setEach('isEditable', true);
this.get('stepConfigs').objectAt(0).get('configs').filterProperty('displayType', 'masterHost').setEach('isVisible', false);
- this.get('oldConfigs').clear();
- this.get('modifiedConfigs').clear();
- this.get('stepConfigs').objectAt(0).get('configs').forEach(function (config) {
- this.get('oldConfigs').push(jQuery.extend({}, config));
- }, this
- );
}
}.observes('dataIsLoaded'),
@@ -50,16 +43,18 @@ App.WizardStep12Controller = App.MainSer
if (this.get('isSubmitDisabled')) {
return false;
}
+ var self = this;
+ this.get('modifiedConfigs').clear();
this.get('stepConfigs').objectAt(0).get('configs').forEach(function (config) {
- var oldConfig = this.get('oldConfigs').filterProperty('name', config.get('name')).findProperty('id', config.get('id'));
- if (!oldConfig || oldConfig.get('value') !== config.get('value')) {
- this.get('modifiedConfigs').push({
+ if (config.get('defaultValue') !== config.get('value')) {
+ self.get('modifiedConfigs').push({
name: config.get('displayName'),
- oldValue: !oldConfig ? 'null' : oldConfig.get('value') + ' ' + (oldConfig.get('unit') || ''),
- value: config.get('value') + ' ' + (config.get('unit') || '')
+ oldValue: config.get('defaultValue'),
+ value: config.get('value'),
+ unit: config.get('unit') || false
});
}
- }, this);
+ });
App.router.send('next');
}
});
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step14_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step14_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step14_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step14_controller.js Thu May 30 22:14:29 2013
@@ -70,7 +70,7 @@ App.WizardStep14Controller = Em.Controll
configs: [],
globals: [],
- configMapping: App.config.get('configMapping').all(),
+ configMapping: require('data/config_mapping').all(),
newConfigsTag: null,
createdConfigs: [],
@@ -752,10 +752,10 @@ App.WizardStep14Controller = Em.Controll
task = 0;
}
if (!polledData.someProperty('Tasks.status', 'PENDING') && !polledData.someProperty('Tasks.status', 'QUEUED') && !polledData.someProperty('Tasks.status', 'IN_PROGRESS')) {
- if (polledData.everyProperty('Tasks.status', 'COMPLETED')) {
- this.setTasksStatus(task, 'COMPLETED');
- } else {
+ if (polledData.someProperty('Tasks.status', 'FAILED')) {
this.setTasksStatus(task, 'FAILED');
+ } else {
+ this.setTasksStatus(task, 'COMPLETED');
}
stopPolling = true;
} else {
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step3_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step3_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step3_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step3_controller.js Thu May 30 22:14:29 2013
@@ -280,9 +280,8 @@ App.WizardStep3Controller = Em.Controlle
App.router.get('installerController').setLowerStepsDisable(3);
this.set('isSubmitDisabled', true);
} else {
- App.router.get('installerController.isStepDisabled').filter(function(step){
- if(step.step >= 0 && step.step <= 2) return true;
- }).setEach('value', false);
+ App.router.get('installerController.isStepDisabled').findProperty('step', 1).set('value', false);
+ App.router.get('installerController.isStepDisabled').findProperty('step', 2).set('value', false);
}
}.observes('isInstallInProgress'),
@@ -356,6 +355,15 @@ App.WizardStep3Controller = Em.Controlle
}
},
+ /*
+ stopBootstrap: function () {
+ console.log('stopBootstrap() called');
+ Ember.run.later(this, function () {
+ this.startRegistration();
+ }, 1000);
+ },
+ */
+
startRegistration: function () {
if (this.get('registrationStartedAt') == null) {
this.set('registrationStartedAt', new Date().getTime());
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step4_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step4_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step4_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step4_controller.js Thu May 30 22:14:29 2013
@@ -17,7 +17,6 @@
*/
var App = require('app');
-var stringUtils = require('utils/string_utils');
App.WizardStep4Controller = Em.ArrayController.extend({
@@ -54,13 +53,7 @@ App.WizardStep4Controller = Em.ArrayCont
// prevent against getting error when not all elements have been loaded yet
if (hbase && zookeeper && hive && hcatalog && webhcat) {
- if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === -1) {
- zookeeper.set('isSelected', hbase.get('isSelected') || hive.get('isSelected'));
- }else{
- if (!zookeeper.get('isSelected')) {
- zookeeper.set('isSelected', hbase.get('isSelected'));
- }
- }
+ zookeeper.set('isSelected', hbase.get('isSelected') || hive.get('isSelected'));
hcatalog.set('isSelected', hive.get('isSelected'));
webhcat.set('isSelected', hive.get('isSelected'));
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step6_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step6_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step6_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step6_controller.js Thu May 30 22:14:29 2013
@@ -146,8 +146,8 @@ App.WizardStep6Controller = Em.Controlle
* @return {*}
*/
isServiceSelected: function (name) {
- return !!(this.get('content.services').findProperty('serviceName', name) &&
- this.get('content.services').findProperty('serviceName', name).get('isSelected'));
+ return this.get('content.services').findProperty('serviceName', name) &&
+ this.get('content.services').findProperty('serviceName', name).get('isSelected');
},
/**
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step7_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step7_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step7_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step7_controller.js Thu May 30 22:14:29 2013
@@ -91,7 +91,20 @@ App.WizardStep7Controller = Em.Controlle
*/
activateSpecialConfigs: function () {
var miscConfigs = this.get('stepConfigs').findProperty('serviceName', 'MISC').configs;
- miscConfigs = App.config.miscConfigVisibleProperty(miscConfigs, this.get('selectedServiceNames'));
+ var showProxyGroup = this.get('selectedServiceNames').contains('HIVE') ||
+ this.get('selectedServiceNames').contains('HCATALOG') ||
+ this.get('selectedServiceNames').contains('OOZIE');
+ miscConfigs.findProperty('name', 'proxyuser_group').set('isVisible', showProxyGroup);
+ miscConfigs.findProperty('name', 'hbase_user').set('isVisible', this.get('selectedServiceNames').contains('HBASE'));
+ miscConfigs.findProperty('name', 'mapred_user').set('isVisible', this.get('selectedServiceNames').contains('MAPREDUCE'));
+ miscConfigs.findProperty('name', 'hive_user').set('isVisible', this.get('selectedServiceNames').contains('HIVE'));
+ miscConfigs.findProperty('name', 'hcat_user').set('isVisible', this.get('selectedServiceNames').contains('HCATALOG'));
+ miscConfigs.findProperty('name', 'webhcat_user').set('isVisible', this.get('selectedServiceNames').contains('WEBHCAT'));
+ miscConfigs.findProperty('name', 'oozie_user').set('isVisible', this.get('selectedServiceNames').contains('OOZIE'));
+ miscConfigs.findProperty('name', 'zk_user').set('isVisible', this.get('selectedServiceNames').contains('ZOOKEEPER'));
+ miscConfigs.findProperty('name', 'gmetad_user').set('isVisible', this.get('selectedServiceNames').contains('GANGLIA'));
+ miscConfigs.findProperty('name', 'rrdcached_base_dir').set('isVisible', this.get('selectedServiceNames').contains('GANGLIA'));
+ miscConfigs.findProperty('name', 'nagios_user').set('isVisible', this.get('selectedServiceNames').contains('NAGIOS'));
},
/**
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step8_controller.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/controllers/wizard/step8_controller.js Thu May 30 22:14:29 2013
@@ -17,7 +17,6 @@
*/
var App = require('app');
-var stringUtils = require('utils/string_utils');
App.WizardStep8Controller = Em.Controller.extend({
name: 'wizardStep8Controller',
@@ -28,7 +27,7 @@ App.WizardStep8Controller = Em.Controlle
configs: [],
globals: [],
ajaxQueue: [],
- configMapping: App.config.get('configMapping').all(),
+ configMapping: require('data/config_mapping').all(),
slaveComponentConfig: null,
isSubmitDisabled: false,
hasErrorOccurred: false,
@@ -376,6 +375,43 @@ App.WizardStep8Controller = Em.Controlle
}
},
+ getServiceInfo: function (componentName) {
+ var serviceConfig;
+ switch (componentName) {
+ case 'DATANODE':
+ serviceConfig = {
+ name: 'HDFS',
+ siteName: 'hdfs-site',
+ domain: 'datanode-global'
+ };
+ break;
+ case 'TASKTRACKER':
+ serviceConfig = {
+ name: 'MAPREDUCE',
+ siteName: 'mapred-site',
+ domain: 'tasktracker-global'
+ };
+ break;
+ case 'NODEMANAGER':
+ serviceConfig = {
+ name: 'YARN',
+ siteName: 'yarn-site',
+ domain: 'nodemanager-global'
+ };
+ break;
+ case 'HBASE_REGIONSERVER':
+ serviceConfig = {
+ name: 'HBASE',
+ siteName: 'hbase-site',
+ domain: 'regionserver-global'
+ };
+ break;
+ default:
+ serviceConfig = {};
+ }
+ return serviceConfig;
+ },
+
/**
* Load all info about cluster to <code>clusterInfo</code> variable
*/
@@ -446,7 +482,7 @@ App.WizardStep8Controller = Em.Controlle
case 'MAPREDUCE':
this.loadMapReduce(serviceObj);
break;
- case 'MAPREDUCE2':
+ case 'MAPREDUCEv2':
this.loadMapReduce2(serviceObj);
break;
case 'YARN':
@@ -1282,7 +1318,7 @@ App.WizardStep8Controller = Em.Controlle
this.applyConfigurationToSite(this.createMapredQueueAcls());
}
}
- if (selectedServices.someProperty('serviceName', 'MAPREDUCE2')) {
+ if (selectedServices.someProperty('serviceName', 'MAPREDUCEv2')) {
this.applyConfigurationToSite(this.createMrSiteObj());
if (App.supports.capacitySchedulerUi) {
this.applyConfigurationToSite(this.createMapredQueueAcls());
@@ -1380,16 +1416,6 @@ App.WizardStep8Controller = Em.Controlle
var hdfsSiteObj = this.get('configs').filterProperty('filename', 'hdfs-site.xml');
var hdfsProperties = {};
hdfsSiteObj.forEach(function (_configProperty) {
-
- if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), '2.0.0') === 1 ||
- stringUtils.compareVersions(App.get('currentStackVersionNumber'), '2.0.0') === 0) {
- // TODO Remove temporary hack. This was added to not set
- // dfs.hosts and dfs.hosts.exclude properties on HDP 2 stacks.
- if ("dfs.hosts"==_configProperty.name || "dfs.hosts.exclude"==_configProperty.name) {
- _configProperty.value = "";
- }
- }
-
hdfsProperties[_configProperty.name] = _configProperty.value;
this._recordHostOverrideFromObj(_configProperty, 'hdfs-site', 'version1', this);
console.log("STEP*: name of the property is: " + _configProperty.name);
@@ -1427,7 +1453,7 @@ App.WizardStep8Controller = Em.Controlle
var mrProperties = {};
configs.forEach(function (_configProperty) {
mrProperties[_configProperty.name] = _configProperty.value;
- this._recordHostOverrideFromObj(_configProperty, 'yarn-site', 'version1', this);
+ this._recordHostOverrideFromObj(_configProperty, 'mapred-site', 'version1', this);
console.log("STEP*: name of the property is: " + _configProperty.name);
console.log("STEP8: value of the property is: " + _configProperty.value);
}, this);
@@ -1539,6 +1565,32 @@ App.WizardStep8Controller = Em.Controlle
return {type: 'webhcat-site', tag: 'version1', properties: webHCatProperties};
},
+ getConfigForService: function (serviceName) {
+ switch (serviceName) {
+ case 'HDFS':
+ return {config: {'global': 'version1', 'core-site': 'version1', 'hdfs-site': 'version1'}};
+ case 'MAPREDUCE':
+ return {config: {'global': 'version1', 'core-site': 'version1', 'mapred-site': 'version1', 'capacity-scheduler': 'version1', 'mapred-queue-acls': 'version1'}};
+ case 'MAPREDUCEv2':
+ return {config: {'global': 'version1', 'core-site': 'version1', 'mapred-site': 'version1', 'mapred-queue-acls': 'version1'}};
+ case 'YARN':
+ return {config: {'global': 'version1', 'yarn-site': 'version1', 'capacity-scheduler': 'version1'}};
+ case 'HBASE':
+ return {config: {'global': 'version1', 'hbase-site': 'version1'}};
+ case 'OOZIE':
+ return {config: {'global': 'version1', 'oozie-site': 'version1'}};
+ case 'HIVE':
+ return {config: {'global': 'version1', 'hive-site': 'version1'}};
+ case 'WEBHCAT':
+ return {config: {'global': 'version1', 'webhcat-site': 'version1'}};
+ case 'HUE':
+ return {config: {'global': 'version1', 'hue-site': 'version1'}};
+ default:
+ return {config: {'global': 'version1'}};
+ }
+ },
+
+
ajaxQueueFinished: function () {
//do something
},
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/config_properties.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/config_properties.js Thu May 30 22:14:29 2013
@@ -882,6 +882,114 @@ module.exports =
"category": "CapacityScheduler",
"filename": "capacity-scheduler.xml"
},
+ /*{
+ "id": "site property",
+ "name": "mapred.cluster.map.memory.mb",
+ "displayName": "Map slot memory",
+ "displayType": "int",
+ "value": '-1',
+ "defaultValue": '-1',
+ "description": "The size, in terms of virtual memory, of a single map slot in the Map-Reduce framework, used by " +
+ "the scheduler. A job can ask for multiple slots for a single map task via \"Map task memory\", upto the limit " +
+ "specified by \"Max map task memory\", if the scheduler supports the feature. The value of -1 indicates that " +
+ "this feature is turned off.",
+ "isVisible": true,
+ "isRequired": true,
+ "serviceName": "MAPREDUCE",
+ "category": "CapacityScheduler",
+ "unit":"MB",
+ "filename": 'capacity-scheduler.xml'
+ },
+ {
+ "id": "site property",
+ "name": "mapred.cluster.reduce.memory.mb",
+ "displayName": "Reduce slot memory",
+ "displayType": "int",
+ "value": '-1',
+ "defaultValue": '-1',
+ "description": "The size, in terms of virtual memory, of a single reduce slot in the Map-Reduce framework, " +
+ "used by the scheduler. A job can ask for multiple slots for a single reduce task via \"Reduce task memory\", " +
+ "upto the limit specified by \"Max reduce task memory\", if the scheduler supports the feature.The value of " +
+ "-1 indicates that this feature is turned off.",
+ "isVisible": true,
+ "isRequired": true,
+ "serviceName": "MAPREDUCE",
+ "category": "CapacityScheduler",
+ "unit":"MB",
+ "filename": 'capacity-scheduler.xml'
+ },
+ {
+ "id": "site property",
+ "name": "mapred.cluster.max.map.memory.mb",
+ "displayName": "Max map task memory",
+ "displayType": "int",
+ "value": '-1',
+ "defaultValue": '-1',
+ "description": "The maximum size, in terms of virtual memory, of a single map task launched by the Map-Reduce " +
+ "framework, used by the scheduler. A job can ask for multiple slots for a single map task via " +
+ "\"Map task memory\", upto the limit specified by \"Max map task memory\", if the scheduler supports the " +
+ "feature. The value of -1 indicates that this feature is turned off.",
+ "isVisible": true,
+ "isRequired": true,
+ "serviceName": "MAPREDUCE",
+ "category": "CapacityScheduler",
+ "unit":"MB",
+ "filename": 'capacity-scheduler.xml'
+ },
+ {
+ "id": "site property",
+ "name": "mapred.cluster.max.reduce.memory.mb",
+ "displayName": "Max reduce task memory",
+ "displayType": "int",
+ "value": '-1',
+ "defaultValue": '-1',
+ "description": "The maximum size, in terms of virtual memory, of a single reduce task launched by the Map-Reduce " +
+ "framework, used by the scheduler. A job can ask for multiple slots for a single reduce task via \"Reduce task " +
+ "memory\", upto the limit specified by \"Max reduce task memory\", if the scheduler supports the feature. " +
+ "The value of -1 indicates that this feature is turned off.",
+ "isVisible": true,
+ "isRequired": true,
+ "serviceName": "MAPREDUCE",
+ "category": "CapacityScheduler",
+ "unit":"MB",
+ "filename": 'capacity-scheduler.xml'
+ },
+ {
+ "id": "site property",
+ "name": "mapred.job.map.memory.mb",
+ "displayName": "Map task memory",
+ "displayType": "int",
+ "value": '-1',
+ "defaultValue": '-1',
+ "description": "The size, in terms of virtual memory, of a single map task for the job. A job can ask for " +
+ "multiple slots for a single map task, rounded up to the next multiple of \"Map slot memory\" and upto " +
+ "the limit specified by \"Max map task memory\", if the scheduler supports the feature. The value of -1 " +
+ "indicates that this feature is turned off iff \"Map slot memory\" is also turned off.",
+ "isVisible": true,
+ "isRequired": true,
+ "serviceName": "MAPREDUCE",
+ "category": "CapacityScheduler",
+ "unit":"MB",
+ "filename": 'capacity-scheduler.xml'
+ },
+ {
+ "id": "site property",
+ "name": "mapred.job.reduce.memory.mb",
+ "displayName": "Reduce task memory",
+ "displayType": "int",
+ "value": '-1',
+ "defaultValue": '-1',
+ "description": "The size, in terms of virtual memory, of a single reduce task for the job. A job can ask for " +
+ "multiple slots for a single reduce task, rounded up to the next multiple of \"Reduce slot memory\" and upto " +
+ "the limit specified by \"Max reduce task memory\", if the scheduler supports the feature. The value of -1 " +
+ "indicates that this feature is turned off iff \"Task slot memory\" is also turned off.",
+ "isVisible": true,
+ "isRequired": true,
+ "serviceName": "MAPREDUCE",
+ "category": "CapacityScheduler",
+ "unit":"MB",
+ "filename": 'capacity-scheduler.xml'
+ },*/
/**********************************************HBASE***************************************/
{
"id": "puppet var",
@@ -2132,8 +2240,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName": "MISC",
- "category": "General",
- "belongsToService":[]
+ "category": "General"
},
{
"id": "puppet var",
@@ -2148,8 +2255,7 @@ module.exports =
"filename": "core-site.xml",
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["HIVE","WEBHCAT","OOZIE"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2163,8 +2269,7 @@ module.exports =
"filename": "hdfs-site.xml",
"domain": "global",
"serviceName": "MISC",
- "category": "Advanced",
- "belongsToService":[]
+ "category": "Advanced"
},
{
"id": "puppet var",
@@ -2178,8 +2283,7 @@ module.exports =
"filename": "hdfs-site.xml",
"domain": "global",
"serviceName": "MISC",
- "category": "Advanced",
- "belongsToService":[]
+ "category": "Advanced"
},
{
"id": "puppet var",
@@ -2192,8 +2296,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName": "MISC",
- "category": "General",
- "belongsToService":[]
+ "category": "General"
},
{
"id": "puppet var",
@@ -2206,8 +2309,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName": "MISC",
- "category": "General",
- "belongsToService":[]
+ "category": "General"
},
{
"id": "puppet var",
@@ -2220,8 +2322,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName": "MISC",
- "category": "General",
- "belongsToService":[]
+ "category": "General"
},
/*
{
@@ -2276,8 +2377,7 @@ module.exports =
"displayType": "directory",
"isVisible": false,
"domain": "global",
- "serviceName": "MISC",
- "belongsToService":[]
+ "serviceName": "MISC"
},
{
"id": "puppet var",
@@ -2291,8 +2391,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName": "MISC",
- "category": "Advanced",
- "belongsToService":[]
+ "category": "Advanced"
},
{
"id": "puppet var",
@@ -2306,8 +2405,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName": "MISC",
- "category": "Advanced",
- "belongsToService":[]
+ "category": "Advanced"
},
/*
{
@@ -2423,8 +2521,7 @@ module.exports =
"isVisible": true,
"serviceName": "MISC",
"domain": "global",
- "category": "Users and Groups",
- "belongsToService":["HDFS"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2438,8 +2535,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["MAPREDUCE"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2453,8 +2549,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["HBASE"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2468,8 +2563,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["HIVE"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2483,8 +2577,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["HCATALOG"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2498,8 +2591,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["WEBHCAT"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2513,8 +2605,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["OOZIE"]
+ "category": "Users and Groups"
},
/*
{
@@ -2585,8 +2676,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["ZOOKEEPER"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2600,8 +2690,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["GANGLIA"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2615,8 +2704,7 @@ module.exports =
"isVisible": false,
"domain": "global",
"serviceName":"MISC",
- "category": "Users and Groups",
- "belongsToService":[]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2630,8 +2718,7 @@ module.exports =
"domain": "global",
"isVisible": true,
"serviceName":"MISC",
- "category": "Users and Groups",
- "belongsToService":["NAGIOS"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2645,8 +2732,7 @@ module.exports =
"isVisible": App.supports.customizeSmokeTestUser,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["HDFS"]
+ "category": "Users and Groups"
},
{
"id": "puppet var",
@@ -2660,8 +2746,7 @@ module.exports =
"isVisible": true,
"domain": "global",
"serviceName": "MISC",
- "category": "Users and Groups",
- "belongsToService":["HDFS"]
+ "category": "Users and Groups"
},
/*
{
@@ -2687,8 +2772,7 @@ module.exports =
"isOverridable": false,
"domain": "global",
"serviceName": "MISC",
- "category": "General",
- "belongsToService":["GANGLIA"]
+ "category": "General"
}
]
};
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/review_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/review_configs.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/review_configs.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/review_configs.js Thu May 30 22:14:29 2013
@@ -75,7 +75,7 @@ module.exports = [
]
}),
Ember.Object.create({
- service_name: 'MAPREDUCE2',
+ service_name: 'MAPREDUCEv2',
display_name: 'MapReduce 2',
service_components: [
Ember.Object.create({
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_configs.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_configs.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_configs.js Thu May 30 22:14:29 2013
@@ -40,6 +40,7 @@ module.exports = [
configCategories: [
App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
App.ServiceConfigCategory.create({ name: 'NameNode', displayName: 'NameNode'}),
+ App.ServiceConfigCategory.create({ name: 'SNameNode',displayName: 'SNameNode'}),
App.ServiceConfigCategory.create({ name: 'DataNode', displayName: 'DataNode'})
],
sites: ['global', 'core-site', 'hdfs-site'],
@@ -85,7 +86,8 @@ module.exports = [
displayName: 'HBase',
filename: 'hbase-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'HBase', displayName: 'HBase'})
+ App.ServiceConfigCategory.create({ name: 'HBase Master', displayName: 'HBase Master'}),
+ App.ServiceConfigCategory.create({ name: 'RegionServer', displayName: 'RegionServer'})
],
sites: ['hbase-site'],
configs: configProperties.filterProperty('serviceName', 'HBASE')
@@ -94,7 +96,7 @@ module.exports = [
serviceName: 'ZOOKEEPER',
displayName: 'ZooKeeper',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'ZooKeeper Server', displayName: 'ZooKeeper Server'})
+ App.ServiceConfigCategory.create({ name: 'ZooKeeper Server'})
],
configs: configProperties.filterProperty('serviceName', 'ZOOKEEPER')
@@ -104,7 +106,7 @@ module.exports = [
displayName: 'Oozie',
filename: 'oozie-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'Oozie Server', displayName: 'Oozie Server'})
+ App.ServiceConfigCategory.create({ name: 'Oozie Server'})
],
sites: ['oozie-site'],
configs: configProperties.filterProperty('serviceName', 'OOZIE')
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_mapping.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_mapping.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_mapping.js Thu May 30 22:14:29 2013
@@ -62,7 +62,7 @@ module.exports = [
},
{
"name": "dfs.secondary.namenode.keytab.file",
- "templateName": ["namenode_keytab"],
+ "templateName": ["snamenode_keytab"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "hdfs-site.xml"
@@ -111,16 +111,16 @@ module.exports = [
},
{
"name": "dfs.datanode.address",
- "templateName": ["dfs_datanode_address"],
+ "templateName": [],
"foreignKey": null,
- "value": "0.0.0.0:<templateName[0]>",
+ "value": "0.0.0.0:1019",
"filename": "hdfs-site.xml"
},
{
"name": "dfs.datanode.http.address",
- "templateName": ["dfs_datanode_http_address"],
+ "templateName": [],
"foreignKey": null,
- "value": "0.0.0.0:<templateName[0]>",
+ "value": "0.0.0.0:1022",
"filename": "hdfs-site.xml"
},
{
@@ -160,7 +160,7 @@ module.exports = [
},
{
"name": "hbase.master.keytab.file",
- "templateName": ["hbase_service_keytab"],
+ "templateName": ["hbase_master_keytab"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "hbase-site.xml"
@@ -174,7 +174,7 @@ module.exports = [
},
{
"name": "hbase.regionserver.keytab.file",
- "templateName": ["hbase_service_keytab"],
+ "templateName": ["regionserver_keytab"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "hbase-site.xml"
@@ -349,6 +349,13 @@ module.exports = [
"filename": "hbase-site.xml"
},
{
+ "name": "hbase.coprocessor.region.classes",
+ "templateName": [],
+ "foreignKey": null,
+ "value": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController",
+ "filename": "hbase-site.xml"
+ },
+ {
"name": "hbase.bulkload.staging.dir",
"templateName": [],
"foreignKey": null,
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_properties.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_properties.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/secure_properties.js Thu May 30 22:14:29 2013
@@ -23,7 +23,7 @@ module.exports =
"name": "security_enabled",
"displayName": "Enable security",
"value": "",
- "defaultValue":"true",
+ "defaultValue": "true",
"description": "Enable kerberos security for the cluster",
"isVisible": false,
"isOverridable": false,
@@ -151,29 +151,16 @@ module.exports =
},
{
"id": "puppet var",
- "name": "dfs_datanode_address",
- "displayName": "Datanode address",
- "value": "",
- "defaultValue": "1019",
- "description": "Address for DataNode",
- "displayType": "principal",
- "isVisible": false,
- "isOverridable": false,
- "serviceName": "HDFS",
- "category": "DataNode"
- },
- {
- "id": "puppet var",
- "name": "dfs_datanode_http_address",
- "displayName": "Datanode HTTP address",
+ "name": "snamenode_keytab",
+ "displayName": "Path to keytab file",
"value": "",
- "defaultValue": "1022",
- "description": "Address for DataNode",
- "displayType": "principal",
- "isVisible": false,
+ "defaultValue": "/etc/security/keytabs/sn.service.keytab",
+ "description": "path to SecondaryNameNode keytab file",
+ "displayType": "directory",
+ "isVisible": true,
"isOverridable": false,
"serviceName": "HDFS",
- "category": "DataNode"
+ "category": "SNameNode"
},
{
"id": "puppet var",
@@ -262,7 +249,7 @@ module.exports =
"displayName": "Primary name",
"value": "",
"defaultValue": "hbase",
- "description": "Primary name for HBase",
+ "description": "Primary name for HBase master",
"displayType": "principal",
"isVisible": true,
"isOverridable": false,
@@ -271,16 +258,29 @@ module.exports =
},
{
"id": "puppet var",
- "name": "hbase_service_keytab",
+ "name": "hbase_master_keytab",
"displayName": "Path to Keytab file",
"value": "",
- "defaultValue": "/etc/security/keytabs/hbase.service.keytab",
+ "defaultValue": "/etc/security/keytabs/hm.service.keytab",
"description": "keytab for HBase master",
"displayType": "directory",
"isVisible": true,
"isOverridable": false,
"serviceName": "HBASE",
- "category": "HBase"
+ "category": "HBase Master"
+ },
+ {
+ "id": "puppet var",
+ "name": "regionserver_keytab",
+ "displayName": "Path to Keytab file",
+ "value": "",
+ "defaultValue": "/etc/security/keytabs/rs.service.keytab",
+ "description": "keytab for RegionServer",
+ "displayType": "directory",
+ "isVisible": true,
+ "isOverridable": false,
+ "serviceName": "HBASE",
+ "category": "RegionServer"
},
//HIVE
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_components.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_components.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_components.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_components.js Thu May 30 22:14:29 2013
@@ -75,15 +75,15 @@ module.exports = new Ember.Set([
description: 'Client component for MapReduce'
},
{
- service_name: 'MAPREDUCE2',
- component_name: 'MAPREDUCE2_CLIENT',
+ service_name: 'MAPREDUCEv2',
+ component_name: 'MAPREDUCEv2_CLIENT',
display_name: 'MapReduce 2 Client',
isMaster: false,
isClient: true,
description: ''
},
{
- service_name: 'MAPREDUCE2',
+ service_name: 'MAPREDUCEv2',
component_name: 'HISTORYSERVER',
display_name: 'History Server',
isMaster: true,
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_configs.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_configs.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/service_configs.js Thu May 30 22:14:29 2013
@@ -19,6 +19,7 @@
var App = require('app');
require('models/service_config');
+var configProperties = App.ConfigProperties.create();
module.exports = [
{
@@ -35,7 +36,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'AdvancedHDFSSite', displayName : 'Custom hdfs-site.xml', siteFileName: 'hdfs-site.xml', canAddProperty: true})
],
sites: ['global', 'core-site', 'hdfs-site'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'HDFS')
},
{
@@ -51,21 +52,18 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
],
sites: ['global', 'core-site', 'mapred-site', 'capacity-scheduler', 'mapred-queue-acls'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'MAPREDUCE')
},
{
- serviceName: 'MAPREDUCE2',
+ serviceName: 'MAPREDUCEv2',
displayName: 'MapReduce 2',
filename: 'mapred-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'HistoryServer', displayName : 'History Server', hostComponentNames : ['HISTORYSERVER']}),
- App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
- App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
],
- sites: ['core-site', 'mapred-site', 'mapred-queue-acls'],
- configs: []
+ sites: ['global', 'core-site', 'mapred-site', 'mapred-queue-acls'],
+ configs: configProperties.filterProperty('serviceName', 'MAPREDUCEv2')
},
{
@@ -73,15 +71,10 @@ module.exports = [
displayName: 'YARN',
filename: 'yarn-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'Resource Manager', hostComponentNames : ['RESOURCEMANAGER']}),
- App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'Node Manager', hostComponentNames : ['NODEMANAGER']}),
- App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
- App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Capacity Scheduler', isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml', siteFileNames: ['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: true}),
- App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
- App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true})
+ App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
],
- sites: ['core-site', 'yarn-site', 'capacity-scheduler', 'mapred-queue-acls'],
- configs: []
+ sites: ['global', 'yarn-site', 'capacity-scheduler'],
+ configs: configProperties.filterProperty('serviceName', 'MAPREDUCEv2')
},
{
@@ -94,7 +87,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'AdvancedHiveSite', displayName : 'Custom hive-site.xml', siteFileName: 'hive-site.xml', canAddProperty: true})
],
sites: ['global', 'hive-site'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'HIVE')
},
{
@@ -107,7 +100,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'AdvancedWebHCatSite', displayName : 'Custom webhcat-site.xml', siteFileName: 'webhcat-site.xml', canAddProperty: true})
],
sites: ['global', 'webhcat-site'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'WEBHCAT')
},
{
@@ -122,7 +115,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'AdvancedHbaseSite', displayName : 'Custom hbase-site.xml', siteFileName: 'hbase-site.xml', canAddProperty: true})
],
sites: ['global', 'hbase-site'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'HBASE')
},
{
@@ -133,7 +126,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
],
sites: ['global'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'ZOOKEEPER')
},
{
@@ -146,7 +139,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'AdvancedOozieSite', displayName : 'Custom oozie-site.xml', siteFileName: 'oozie-site.xml', canAddProperty: true})
],
sites: ['global', 'oozie-site'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'OOZIE')
},
{
@@ -156,7 +149,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'})
],
sites: ['global'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'NAGIOS')
},
{
@@ -168,7 +161,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
],
sites: ['hue-site'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'HUE')
},
{
@@ -179,7 +172,7 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'Users and Groups', displayName : 'Users and Groups'})
],
sites: ['global'],
- configs: []
+ configs: configProperties.filterProperty('serviceName', 'MISC')
}
];
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/services.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/services.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/services.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/data/services.js Thu May 30 22:14:29 2013
@@ -36,7 +36,7 @@ module.exports = [
description: Em.I18n.t('services.mapreduce.description')
},
{
- serviceName: 'MAPREDUCE2',
+ serviceName: 'MAPREDUCEv2',
displayName: 'MapReduce 2',
isDisabled: false,
isSelected: true,
@@ -77,7 +77,7 @@ module.exports = [
},
{
serviceName: 'HIVE',
- displayName: 'Hive + HCat',
+ displayName: 'Hive + HCat + ZooKeeper',
isDisabled: false,
isSelected: true,
canBeSelected: true,
@@ -101,7 +101,7 @@ module.exports = [
},
{
serviceName: 'HBASE',
- displayName: 'HBase',
+ displayName: 'HBase + ZooKeeper',
isDisabled: false,
isSelected: true,
canBeSelected: true,
@@ -137,7 +137,7 @@ module.exports = [
isDisabled: false,
isSelected: true,
canBeSelected: true,
- description: Em.I18n.t('services.zookeeper.description')
+ isHidden: true
},
{
serviceName: 'HUE',
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/initialize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/initialize.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/initialize.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/initialize.js Thu May 30 22:14:29 2013
@@ -25,7 +25,6 @@ require('messages');
require('utils/base64');
require('utils/db');
require('utils/helper');
-require('utils/config')
require('models');
require('controllers');
require('templates');
@@ -33,7 +32,8 @@ require('views');
require('router');
require('utils/ajax');
-require('utils/updater');;
+require('utils/updater');
+require('utils/config');
require('mappers/server_data_mapper');
require('mappers/status_mapper');
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/mappers/service_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/mappers/service_mapper.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/mappers/service_mapper.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/mappers/service_mapper.js Thu May 30 22:14:29 2013
@@ -20,10 +20,7 @@ var App = require('app');
App.servicesMapper = App.QuickDataMapper.create({
servicesSortOrder: [
'HDFS',
- 'YARN',
'MAPREDUCE',
- 'MAPREDUCE2',
- 'TEZ',
'HBASE',
'HIVE',
'HCATALOG',
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/messages.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/messages.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/messages.js Thu May 30 22:14:29 2013
@@ -115,7 +115,6 @@ Em.I18n.translations = {
'common.search': 'Search',
'common.confirm': 'Confirm',
'common.upgrade': 'Upgrade',
- 'common.reUpgrade': 'Retry Upgrade',
'common.security':'Security',
'common.cluster':'Cluster',
'common.add': 'Add',
@@ -129,7 +128,7 @@ Em.I18n.translations = {
'common.abort': 'Abort',
'common.misc': 'Misc',
'common.operations': 'Operations',
- 'common.reinstall': 'Re-Install',
+ 'common.install': 'Install',
'common.errorPopup.header': 'An error has been encountered',
'common.use': 'Use',
'common.stacks': 'Stacks',
@@ -189,7 +188,7 @@ Em.I18n.translations = {
'services.pig.description':'Scripting platform for analyzing large datasets',
'services.hive.description':'Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service',
'services.oozie.description':'System for workflow coordination and execution of Apache Hadoop jobs',
- 'services.zookeeper.description':'Centralized service which provides highly reliable distributed coordination',
+ 'services.zookeeper.description':'ZooKeeper desc',
'services.hbase.description':'Non-relational distributed database and centralized service for configuration management & synchronization',
'services.hive.databaseComponent':'Database Server',
'services.mapreduce2.description':'Apache Hadoop NextGen MapReduce (client libraries)',
@@ -470,8 +469,6 @@ Em.I18n.translations = {
'installer.step13.sourceHost':'Source Host:',
'installer.step13.changes':'Configs to change:',
'installer.step13.component':'Component name:',
- 'installer.step13.oldValue':'Old value',
- 'installer.step13.newValue':'New value',
'installer.step14.task0':'{0} stop',
'installer.step14.task1':'{0} create',
'installer.step14.task2':'{0} configs create',
@@ -798,9 +795,6 @@ Em.I18n.translations = {
'services.zookeeper.title': '{0} ZooKeepers',
'services.zookeeper.postfix': 'running',
- 'services.mapreduce2.history.running': 'History server is running',
- 'services.mapreduce2.history.stopped': 'History server is stopped',
-
'services.mapReduce.config.addQueue':'Add Queue',
'services.mapReduce.config.editQueue':'Edit Queue',
'services.mapReduce.config.capacitySchedulerXml':'Custom capacity-scheduler.xml',
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/host_component.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/host_component.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/host_component.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/host_component.js Thu May 30 22:14:29 2013
@@ -26,7 +26,7 @@ App.HostComponent = DS.Model.extend({
service: DS.belongsTo('App.Service'),
actualConfigs: null,
isClient:function () {
- if(['PIG', 'SQOOP', 'HCAT', 'MAPREDUCE2_CLIENT'].contains(this.get('componentName'))){
+ if(['PIG', 'SQOOP', 'HCAT'].contains(this.get('componentName'))){
return true;
}
@@ -54,7 +54,6 @@ App.HostComponent = DS.Model.extend({
case 'OOZIE_SERVER':
case 'WEBHCAT_SERVER':
case 'HUE_SERVER':
- case 'HISTORYSERVER':
return true;
default:
return false;
@@ -88,33 +87,7 @@ App.HostComponent = DS.Model.extend({
}
}
return decommissioning;
- }.property('componentName', 'host.hostName', 'App.router.mainServiceController.hdfsService.decommissionDataNodes.@each.hostName'),
- /**
- * User friendly host component status
- */
- componentTextStatus: function () {
- var value = this.get("workStatus");
-
- switch(value){
- case "INSTALLING":
- return 'Installing...';
- case "INSTALL_FAILED":
- return 'Install Failed';
- case "INSTALLED":
- return 'Stopped';
- case "STARTED":
- return 'Started';
- case "STARTING":
- return 'Starting...';
- case "STOPPING":
- return 'Stopping...';
- case "UNKNOWN":
- return 'Heartbeat lost...';
- case "UPGRADE_FAILED":
- return 'Upgrade Failed';
- }
- return 'Unknown';
- }.property('workStatus','isDecommissioning')
+ }.property('componentName', 'host.hostName', 'App.router.mainServiceController.hdfsService.decommissionDataNodes.@each.hostName')
});
App.HostComponent.FIXTURES = [];
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js Thu May 30 22:14:29 2013
@@ -28,7 +28,7 @@ App.Service = DS.Model.extend({
alerts: DS.hasMany('App.Alert'),
quickLinks: DS.hasMany('App.QuickLinks'),
hostComponents: DS.hasMany('App.HostComponent'),
- serviceConfigsTemplate: App.config.get('preDefinedServiceConfigs'),
+ serviceConfigsTemplate: require('data/service_configs'),
runningHostComponents: null,
isStartDisabled: function () {
return !(this.get('healthStatus') == 'red');
@@ -118,9 +118,7 @@ App.Service = DS.Model.extend({
isConfigurable: function () {
var configurableServices = [
"HDFS",
- "YARN",
"MAPREDUCE",
- "MAPREDUCE2",
"HBASE",
"OOZIE",
"HIVE",
@@ -138,14 +136,8 @@ App.Service = DS.Model.extend({
switch (this.get('serviceName').toLowerCase()) {
case 'hdfs':
return 'HDFS';
- case 'yarn':
- return 'YARN';
case 'mapreduce':
return 'MapReduce';
- case 'mapreduce2':
- return 'MapReduce2';
- case 'tez':
- return 'Tez';
case 'hbase':
return 'HBase';
case 'oozie':
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service_config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service_config.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service_config.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service_config.js Thu May 30 22:14:29 2013
@@ -19,6 +19,10 @@
var App = require('app');
var validator = require('utils/validator');
+App.ConfigProperties = Ember.ArrayProxy.extend({
+ content: require('data/config_properties').configProperties
+});
+
App.ServiceConfig = Ember.Object.extend({
serviceName: '',
configCategories: [],
@@ -240,15 +244,6 @@ App.ServiceConfigProperty = Ember.Object
case 'datanode_hosts':
this.set('value', slaveComponentHostsInDB.findProperty('componentName', 'DATANODE').hosts.mapProperty('hostName'));
break;
- case 'hs_host':
- this.set('value', masterComponentHostsInDB.filterProperty('component', 'HISTORYSERVER').mapProperty('hostName'));
- break;
- case 'rm_host':
- this.set('value', masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName);
- break;
- case 'nm_hosts':
- this.set('value', slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER').hosts.mapProperty('hostName'));
- break;
case 'jobtracker_host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'JOBTRACKER').hostName);
break;
@@ -336,7 +331,7 @@ App.ServiceConfigProperty = Ember.Object
}, this);
break;
case 'mapred_local_dir':
- temp = slaveComponentHostsInDB.findProperty('componentName', 'TASKTRACKER') || slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER');
+ temp = slaveComponentHostsInDB.findProperty('componentName', 'TASKTRACKER');
temp.hosts.forEach(function (host) {
setOfHostNames.push(host.hostName);
}, this);
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/add_service_routes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/add_service_routes.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/add_service_routes.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/add_service_routes.js Thu May 30 22:14:29 2013
@@ -165,6 +165,7 @@ module.exports = Em.Route.extend({
addServiceController.saveSlaveComponentHosts(wizardStep6Controller);
addServiceController.get('content').set('serviceConfigProperties', null);
App.db.setServiceConfigProperties(null);
+ App.db.setSlaveProperties(null);
addServiceController.loadAdvancedConfigs();
router.transitionTo('step4');
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/installer.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/installer.js Thu May 30 22:14:29 2013
@@ -258,7 +258,7 @@ module.exports = Em.Route.extend({
controller.saveSlaveComponentHosts(wizardStep6Controller);
controller.get('content').set('serviceConfigProperties', null);
App.db.setServiceConfigProperties(null);
- App.db.setAdvancedServiceConfig(null);
+ App.db.setSlaveProperties(null);
controller.loadAdvancedConfigs();
router.transitionTo('step7');
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/main.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/main.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/main.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/main.js Thu May 30 22:14:29 2013
@@ -17,7 +17,6 @@
*/
var App = require('app');
-var stringUtils = require('utils/string_utils');
module.exports = Em.Route.extend({
route: '/main',
@@ -98,15 +97,9 @@ module.exports = Em.Route.extend({
apps: Em.Route.extend({
route: '/apps',
connectOutlets: function (router) {
- if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === 1 ||
- stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === 0) {
- Em.run.next(function () {
- router.transitionTo('main.dashboard');
- });
- } else {
- router.get('mainAppsController').loadRuns();
- router.get('mainController').connectOutlet('mainApps');
- }
+ //router.get('clusterController').loadRuns();
+ router.get('mainAppsController').loadRuns();
+ router.get('mainController').connectOutlet('mainApps');
}
}),
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/reassign_master_routes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/reassign_master_routes.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/reassign_master_routes.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/routes/reassign_master_routes.js Thu May 30 22:14:29 2013
@@ -54,6 +54,8 @@ module.exports = Em.Route.extend({
if (currentClusterStatus && currentClusterStatus.clusterState == 'REASSIGN_MASTER_INSTALLING') {
reassignMasterController.setCurrentStep('5');
App.db.data = currentClusterStatus.localdb;
+ } else {
+ reassignMasterController.setCurrentStep('1');
}
router.transitionTo('step' + reassignMasterController.get('currentStep'));
});
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/styles/application.less
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/styles/application.less?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/styles/application.less Thu May 30 22:14:29 2013
@@ -2250,18 +2250,6 @@ table.graphs {
.host-components .btn-group {
margin: 0 5px 10px 0;
-
- .component-text-status{
- cursor: default;
- display: block;
- padding: 3px 20px;
- clear: both;
- font-weight: normal;
- line-height: 20px;
- color: #333333;
- white-space: nowrap;
- font-style: italic;
- }
}
}
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates.js Thu May 30 22:14:29 2013
@@ -23,6 +23,5 @@
require('templates/main/service/info/summary/ganglia');
require('templates/main/service/info/summary/oozie');
require('templates/main/service/info/summary/zookeeper');
-require('templates/main/service/info/summary/mapreduce2');
require('templates/main/service/info/summary/hive');
require('templates/main/service/info/summary/hue');
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/admin/misc.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/admin/misc.hbs?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/admin/misc.hbs (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/admin/misc.hbs Thu May 30 22:14:29 2013
@@ -31,12 +31,10 @@
</thead>
<tbody>
{{#each user in controller.users}}
- {{#if user.isVisible}}
- <tr>
- <td>{{user.displayName}}</td>
- <td>{{user.value}}</td>
- </tr>
- {{/if}}
+ <tr>
+ <td>{{user.displayName}}</td>
+ <td>{{user.value}}</td>
+ </tr>
{{/each}}
</tbody>
</table>
Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/host/summary.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/host/summary.hbs?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/host/summary.hbs (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/main/host/summary.hbs Thu May 30 22:14:29 2013
@@ -64,60 +64,43 @@
<div class="span5">
{{#if App.isAdmin}}
<div class="btn-group">
- <a {{ bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown">
+ <a {{ bindAttr class=":btn :dropdown-toggle view.disabledClass"}} data-toggle="dropdown">
{{t common.action}}
<span class="caret pull-right"></span>
</a>
<ul class="dropdown-menu">
- <li>
- <div class="component-text-status">
- {{view.componentTextStatus}}
- </div>
- </li>
{{#if view.isDataNode}}
- {{#if view.isDataNodeDecommissionAvailable}}
- <li {{bindAttr class="view.noActionAvailable"}}>
- <a href="javascript:void(null)" data-toggle="modal" {{action "decommission" view.content target="controller"}}>
- {{t common.decommission}}
- </a>
- </li>
- {{/if}}
- {{#if view.isDataNodeRecommissionAvailable}}
- <li {{bindAttr class="view.noActionAvailable"}}>
- <a href="javascript:void(null)" data-toggle="modal" {{action "recommission" view.content target="controller"}}>
- {{t common.recommission}}
- </a>
- </li>
- {{/if}}
- {{/if}}
- {{#if view.isStart}}
- <li {{bindAttr class=" view.isDecommissioning:hidden view.noActionAvailable"}}>
- <a href="javascript:void(null)" data-toggle="modal" {{action "stopComponent" view.content target="controller"}}>
- {{t common.stop}}
- </a>
- </li>
- {{/if}}
- {{#unless view.isStart}}
- <li {{bindAttr class="view.isUpgradeFailed:hidden view.isInstallFailed:hidden view.isDecommissioning:hidden view.noActionAvailable"}}>
- <a href="javascript:void(null)" data-toggle="modal" {{action "startComponent" view.content target="controller"}}>
- {{t common.start}}
- </a>
- </li>
- {{/unless}}
- {{#if view.isUpgradeFailed}}
- <li {{bindAttr class="view.noActionAvailable"}}>
- <a href="javascript:void(null)" data-toggle="modal" {{action "upgradeComponent" view.content target="controller"}}>
- {{t common.reUpgrade}}
- </a>
- </li>
- {{/if}}
- {{#if view.isInstallFailed}}
- <li {{bindAttr class="view.noActionAvailable"}}>
- <a href="javascript:void(null)" data-toggle="modal" {{action "installComponent" view.content target="controller"}}>
- {{t common.reinstall}}
- </a>
- </li>
+ <li {{bindAttr class="view.isDataNodeDecommissionAvailable::hidden"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action "decommission" view.content target="controller"}}>
+ {{t common.decommission}}
+ </a>
+ </li>
+ <li {{bindAttr class="view.isDataNodeRecommissionAvailable::hidden"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action "recommission" view.content target="controller"}}>
+ {{t common.recommission}}
+ </a>
+ </li>
{{/if}}
+ <li {{bindAttr class="view.isStart::hidden"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action "stopComponent" view.content target="controller"}}>
+ {{t common.stop}}
+ </a>
+ </li>
+ <li {{bindAttr class="view.isStart:hidden: view.isInstallFailed:hidden: view.isDataNodeRecommissionAvailable:hidden"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action "startComponent" view.content target="controller"}}>
+ {{t common.start}}
+ </a>
+ </li>
+ <li {{bindAttr class="view.isUpgradeFailed::hidden"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action "upgradeComponent" view.content target="controller"}}>
+ {{t common.upgrade}}
+ </a>
+ </li>
+ <li {{bindAttr class="view.isInstallFailed::hidden"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action "installComponent" view.content target="controller"}}>
+ {{t common.install}}
+ </a>
+ </li>
</ul>
</div>
{{/if}}