[ambari] branch trunk updated: [AMBARI-24779] Move Namenode operation fails as it tries to install and start ZKFailoverController on non-HA cluster.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 343ccdb  [AMBARI-24779] Move Namenode operation fails as it tries to 
install and start ZKFailoverController on non-HA cluster.
343ccdb is described below

commit 343ccdb7bd1c4afa721bc9d0f1634e91ed47c5a3
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Oct 15 10:17:01 2018 -0700

    [AMBARI-24779] Move Namenode operation fails as it tries to install and 
start ZKFailoverController on non-HA cluster.
---
 ambari-web/app/controllers/main/service/reassign/step4_controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 21e4f0f..b95e206 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -121,7 +121,8 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
     var dependenciesToInstall = App.StackServiceComponent.find(componentName)
         .get('dependencies')
         .filter(function (component) {
-          return !(component.scope == 'host' ? hostInstalledComponents : 
clusterInstalledComponents).contains(component.componentName) && 
(installedServices.contains(component.serviceName));
+          return !(component.scope == 'host' ? hostInstalledComponents : 
clusterInstalledComponents).contains(component.componentName) && 
(installedServices.contains(component.serviceName))
+            && (componentName === 'NAMENODE' ? App.get('isHaEnabled'): true);
         })
         .mapProperty('componentName');
     this.set('dependentHostComponents', dependenciesToInstall);