AMBARI-3250. NameNode HA wizard (rollback): Add Skip button for failed task, in rollback popup

ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js

@@ -111,6 +111,7 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
         command: commands[i],
         showRetry: false,
         showRollback: false,
+        showSkip: false,
         name: Em.I18n.t('admin.highAvailability.rollback.task' + i + '.title'),
         displayName: Em.I18n.t('admin.highAvailability.rollback.task' + i + '.title'),
         progress: 0,
@@ -136,6 +137,7 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
     } else if (this.get('tasks').someProperty('status', 'FAILED') || this.get('tasks').someProperty('status', 'TIMEDOUT') || this.get('tasks').someProperty('status', 'ABORTED')) {
       this.set('status', 'FAILED');
       this.get('tasks').findProperty('status', 'FAILED').set('showRetry', true);
+      this.get('tasks').findProperty('status', 'FAILED').set('showSkip', true);
     }
 
     var statuses = this.get('tasks').mapProperty('status');
@@ -150,6 +152,13 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
     });
   },
 
+  skipTask: function () {
+    var task = this.get('tasks').findProperty('status', 'FAILED');
+    task.set('showRetry', false);
+    task.set('showSkip', false);
+    task.set('status', 'COMPLETED');
+  },
+
   onTaskCompleted: function () {
     var curTaskStatus = this.getTaskStatus(this.get('currentTaskId'));
     if (curTaskStatus != 'FAILED' && curTaskStatus != 'TIMEDOUT' && curTaskStatus != 'ABORTED') {

ambari-web/app/messages.js

@@ -56,6 +56,7 @@ Em.I18n.translations = {
   'common.addComponent':'Add Component',
   'common.remove':'Remove',
   'common.retry':'Retry',
+  'common.skip':'Skip',
   'common.rollBack':'Rollback',
   'common.show':'Show',
   'common.hide':'Hide',

ambari-web/app/templates/main/admin/highAvailability/progress.hbs

@@ -47,6 +47,12 @@
           {{t common.rollBack}}
         </a>
       {{/if}}
+      {{#if task.showSkip}}
+        <a {{action skipTask target="controller"}} class="btn btn-primary retry">
+          <i class="icon-repeat icon-white"></i>
+          {{t common.skip}}
+        </a>
+      {{/if}}
       </div>
     </div>
   {{/view}}