You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/10 15:03:23 UTC
[11/39] git commit: AMBARI-7208. Adding HDFS service to a cluster
does not create SNameNode host component. (jaimin)
AMBARI-7208. Adding HDFS service to a cluster does not create SNameNode host component. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0f9fdec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0f9fdec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0f9fdec
Branch: refs/heads/branch-alerts-dev
Commit: c0f9fdeccc32c87d241e4b611caf39b2d9f88cb8
Parents: 74de327
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Sep 8 12:25:40 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Sep 8 12:25:47 2014 -0700
----------------------------------------------------------------------
ambari-web/app/app.js | 3 ++-
ambari-web/app/controllers/wizard/step8_controller.js | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0f9fdec/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 2b0e850..aa1281a 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -87,7 +87,8 @@ module.exports = Em.Application.create({
*/
isHaEnabled: function () {
if (!this.get('isHadoop2Stack')) return false;
- return !this.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE');
+ var isHDFSInstalled = App.Service.find().findProperty('serviceName','HDFS');
+ return isHDFSInstalled && !this.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE');
}.property('router.clusterController.isLoaded', 'isHadoop2Stack'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0f9fdec/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 2d511c2..04cb728 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -648,7 +648,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
// skip components that was hide on assign master page
if (component.get('isMaster') && !component.get('isShownOnInstallerAssignMasterPage')) return;
// no HA component
- if (App.get('isHaEnabled') && component.get('isHAComponentOnly')) return;
+ if (component.get('isHAComponentOnly')) return;
var displayName;
if (component.get('isClient')) {
displayName = Em.I18n.t('common.clients')
@@ -693,9 +693,9 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
}
else {
console.log(' --- ---INFO: step8: NOT component isMaster');
+ var componentName = component.get('isClient') ? Em.I18n.t('common.client').toUpperCase() : component.get('componentName');
var hostsLength = this.get('content.slaveComponentHosts')
- .findProperty('componentName', component.get('isClient') ? Em.I18n.t('common.client').toUpperCase() : component.get('componentName'))
- .hosts.length;
+ .findProperty('componentName', componentName).hosts.length;
componentValue = hostsLength + Em.I18n.t('installer.step8.host' + ((hostsLength > 1) ? 's' : ''));
}
}