Repository: ambari
Updated Branches:
  refs/heads/trunk 8a7b7559c -> 0774c1508


AMBARI-9719 Hive Metastore missing from the cluster after rolling back from 
'Move Hivemetastore'. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0774c150
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0774c150
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0774c150

Branch: refs/heads/trunk
Commit: 0774c150825fa8c9ddb5707bd9ad402305178fa4
Parents: 8a7b755
Author: aBabiichuk <[email protected]>
Authored: Fri Feb 20 12:12:22 2015 +0200
Committer: aBabiichuk <[email protected]>
Committed: Fri Feb 20 12:12:22 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/routes/reassign_master_routes.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0774c150/ambari-web/app/routes/reassign_master_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/reassign_master_routes.js 
b/ambari-web/app/routes/reassign_master_routes.js
index 2b2eaed..7632a4a 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -65,7 +65,14 @@ module.exports = App.WizardRoute.extend({
 
               if (parseInt(currStep) > 3) {
                 var self = this;
-                if(reassignMasterController.get('content.hasCheckDBStep') && 
currStep !== "7") {
+
+                var step4Controller = 
router.get('reassignMasterWizardStep4Controller');
+                var testDBTaskId = 
step4Controller.get('tasks').filterProperty('command', 
'testDBConnection').get('firstObject.id');
+
+                if(currStep !== "7" 
+                   && testDBTaskId 
+                   && 
reassignMasterController.get('content.tasksStatuses').get(testDBTaskId) === 
"FAILED")
+                {
                   App.showConfirmationPopup(function () {
                     App.router.transitionTo('step7');
                   }, Em.I18n.t('services.reassign.rollback.confirm'));

Reply via email to