ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-17736. llap_queue_capacity appears when disabled Interactive Query (alexantonenko)
Date Fri, 15 Jul 2016 15:30:57 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 e30b5f10e -> 62653c202


AMBARI-17736. llap_queue_capacity appears when disabled Interactive Query (alexantonenko)


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

Branch: refs/heads/branch-2.4
Commit: 62653c20200fa467203b692ed0efe86543f439ca
Parents: e30b5f1
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Jul 15 16:53:21 2016 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Jul 15 18:30:53 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/mixins/common/configs/configs_loader.js       | 1 +
 ambari-web/test/controllers/main/service/info/config_test.js | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/62653c20/ambari-web/app/mixins/common/configs/configs_loader.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_loader.js b/ambari-web/app/mixins/common/configs/configs_loader.js
index a4542b0..115a3e0 100644
--- a/ambari-web/app/mixins/common/configs/configs_loader.js
+++ b/ambari-web/app/mixins/common/configs/configs_loader.js
@@ -140,6 +140,7 @@ App.ConfigsLoader = Em.Mixin.create(App.GroupsMappingMixin, {
     this.set('isCompareMode', false);
     this.set('versionLoaded', false);
     version = version || this.get('currentDefaultVersion');
+    this.clearRecommendationsInfo();
     if (version === this.get('currentDefaultVersion') && (!switchToGroup || switchToGroup.get('isDefault')))
{
       this.set('selectedVersion', this.get('currentDefaultVersion'));
       this.loadCurrentVersions();

http://git-wip-us.apache.org/repos/asf/ambari/blob/62653c20/ambari-web/test/controllers/main/service/info/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js
index 2db8e0b..0aeb479 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -446,10 +446,12 @@ describe("App.MainServiceInfoConfigsController", function () {
   describe("#doCancel", function () {
     beforeEach(function () {
       sinon.stub(Em.run, 'once', Em.K);
+      sinon.stub(mainServiceInfoConfigsController, 'loadSelectedVersion');
       sinon.stub(mainServiceInfoConfigsController, 'clearRecommendationsInfo');
     });
     afterEach(function () {
       Em.run.once.restore();
+      mainServiceInfoConfigsController.loadSelectedVersion.restore();
       mainServiceInfoConfigsController.clearRecommendationsInfo.restore();
     });
 


Mime
View raw message