Browse Source

AMBARI-10952 Implement a ambari-server property to suppress service checks during deploy cluster. (atkach)

Andrii Tkach 10 years ago
parent
commit
ef9b2f4a80

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

@@ -22,6 +22,7 @@ App.KerberosWizardStep8Controller = App.KerberosProgressPageController.extend({
   commands: ['startServices'],
 
   startServices: function () {
+    var skipServiceCheck = App.router.get('clusterController.ambariProperties')['skip.service.checks'] === "true";
     App.ajax.send({
       name: 'common.services.update',
       sender: this,
@@ -30,7 +31,7 @@ App.KerberosWizardStep8Controller = App.KerberosProgressPageController.extend({
         "ServiceInfo": {
           "state": "STARTED"
         },
-        urlParams: "params/run_smoke_test=true"
+        urlParams: "params/run_smoke_test=" + !skipServiceCheck
       },
       success: 'startPolling',
       error: 'onTaskError'

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

@@ -426,6 +426,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
    * @returns {$.ajax}
    */
   startServices: function (runSmokeTest, excludedServices) {
+    var skipServiceCheck = App.router.get('clusterController.ambariProperties')['skip.service.checks'] === "true";
     var data = {
       'ServiceInfo': {
         'state': 'STARTED'
@@ -443,7 +444,8 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({
     }
 
     if (runSmokeTest) {
-      data.urlParams = data.urlParams ? data.urlParams + '&params/run_smoke_test=true' : 'params/run_smoke_test=true';
+      data.urlParams = data.urlParams ? data.urlParams + '&' : '';
+      data.urlParams += 'params/run_smoke_test=' + !skipServiceCheck;
     }
 
     return App.ajax.send({

+ 6 - 0
ambari-web/test/controllers/main/service/reassign/step4_controller_test.js

@@ -969,6 +969,12 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
   });
 
   describe('#startServices()', function () {
+    before(function () {
+      sinon.stub(App.router, 'get').returns({"skip.service.checks": "false"});
+    });
+    after(function () {
+      App.router.get.restore();
+    });
     it('', function () {
       controller.startServices();
       expect(App.ajax.send.calledOnce).to.be.true;

+ 6 - 0
ambari-web/test/controllers/main/service/reassign/step6_controller_test.js

@@ -149,6 +149,12 @@ describe('App.ReassignMasterWizardStep6Controller', function () {
   });
 
   describe('#startServices()', function () {
+    before(function () {
+      sinon.stub(App.router, 'get').returns({"skip.service.checks": "false"});
+    });
+    after(function () {
+      App.router.get.restore();
+    });
     it('', function () {
       controller.startServices();
       expect(App.ajax.send.calledOnce).to.be.true;