Browse Source

AMBARI-20169. Handle on UI error on services API while trying to start all services with atleast one component in INSTALL_FAILED state (onechiporenko)

Oleg Nechiporenko 8 years ago
parent
commit
093aa3a073

+ 1 - 1
ambari-web/app/controllers/main/admin/kerberos/step8_controller.js

@@ -34,7 +34,7 @@ App.KerberosWizardStep8Controller = App.KerberosProgressPageController.extend({
         urlParams: "params/run_smoke_test=" + !skipServiceCheck
       },
       success: 'startPolling',
-      error: 'onTaskError'
+      error: 'startServicesErrorCallback'
     });
   },
 

+ 1 - 0
ambari-web/app/controllers/main/service.js

@@ -295,6 +295,7 @@ App.MainServiceController = Em.ArrayController.extend(App.SupportClientConfigsDo
    */
   allServicesCallErrorCallback: function (request, ajaxOptions, error, opt, params) {
     params.query.set('status', 'FAIL');
+    App.ajax.defaultErrorHandler(request, opt.url, opt.type, request.status);
   },
 
   /**

+ 6 - 1
ambari-web/app/mixins/wizard/wizardProgressPageController.js

@@ -506,10 +506,15 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create(App.InstallComponent, {
       sender: this,
       data: data,
       success: 'startPolling',
-      error: 'onTaskError'
+      error: 'startServicesErrorCallback'
     });
   },
 
+  startServicesErrorCallback: function (jqXHR, ajaxOptions, error, opt) {
+    App.ajax.defaultErrorHandler(jqXHR, opt.url, opt.type, jqXHR.status);
+    this.onTaskError(jqXHR, ajaxOptions, error, opt);
+  },
+
   /**
    * Create component on single or multiple hosts.
    *

+ 1 - 1
ambari-web/test/controllers/main/admin/kerberos/step8_controller_test.js

@@ -56,7 +56,7 @@ describe('App.KerberosWizardStep8Controller', function() {
           urlParams: "params/run_smoke_test=false"
         },
         success: 'startPolling',
-        error: 'onTaskError'
+        error: 'startServicesErrorCallback'
       });
     });
   });