ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AmbariAMBARI-20169. Handle on UI error on services API while trying to start all services with atleast one component in INSTALL_FAILED state (onechiporenko)
Date Mon, 27 Feb 2017 10:28:45 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk eb784aaa1 -> 3a7e5a2f6


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


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

Branch: refs/heads/trunk
Commit: 3a7e5a2f694c8c7375a50ca05832aabb17136b33
Parents: eb784aa
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Mon Feb 27 11:33:38 2017 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Mon Feb 27 12:28:40 2017 +0200

----------------------------------------------------------------------
 .../app/controllers/main/admin/kerberos/step8_controller.js   | 2 +-
 ambari-web/app/controllers/main/service.js                    | 1 +
 ambari-web/app/mixins/wizard/wizardProgressPageController.js  | 7 ++++++-
 .../controllers/main/admin/kerberos/step8_controller_test.js  | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7e5a2f/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
index 3e659b9..efc4da0 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step8_controller.js
+++ b/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'
     });
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7e5a2f/ambari-web/app/controllers/main/service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service.js b/ambari-web/app/controllers/main/service.js
index 5dfc176..eb9df0d 100644
--- a/ambari-web/app/controllers/main/service.js
+++ b/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);
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7e5a2f/ambari-web/app/mixins/wizard/wizardProgressPageController.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js b/ambari-web/app/mixins/wizard/wizardProgressPageController.js
index 96eb0ae..ced5591 100644
--- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js
+++ b/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.
    *

http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7e5a2f/ambari-web/test/controllers/main/admin/kerberos/step8_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step8_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step8_controller_test.js
index 50a705d..0b19393 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step8_controller_test.js
+++ b/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'
       });
     });
   });


Mime
View raw message