You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/10/05 11:52:44 UTC
ambari git commit: AMBARI-13308. Config Versions list isn't updated
while user is on the configs page after adding/removing HiveServer2
(onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b8be80b08 -> 920c29dd8
AMBARI-13308. Config Versions list isn't updated while user is on the configs page after adding/removing HiveServer2 (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/920c29dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/920c29dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/920c29dd
Branch: refs/heads/trunk
Commit: 920c29dd8d17f874448855398813e140863caf35
Parents: b8be80b
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Oct 5 12:49:30 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Oct 5 12:49:30 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 5 +++--
ambari-web/test/controllers/main/host/details_test.js | 9 +++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/920c29dd/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index 507e375..30304b2 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -433,7 +433,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
self.isServiceMetricsLoaded(function () {
self.loadConfigs();
});
- } else if (data.componentName == 'HIVE_METASTORE') {
+ } else if (['HIVE_METASTORE', 'HIVE_SERVER'].contains(data.componentName)) {
this.set('deleteHiveMetaStore', true);
this.loadConfigs('loadHiveConfigs');
} else if (data.componentName == 'NIMBUS') {
@@ -588,6 +588,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
}, Em.I18n.t('hosts.host.addComponent.' + componentName) + manualKerberosWarning);
break;
case 'HIVE_METASTORE':
+ case 'HIVE_SERVER':
returnFunc = App.showConfirmationPopup(function () {
self.set('hiveMetastoreHost', hostName);
self.loadConfigs("loadHiveConfigs");
@@ -671,7 +672,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
* @param {object} data
* @param {object} opt
* @param {object} params
- * @method installNewComponentSuccessCallbƒack
+ * @method installNewComponentSuccessCallback
*/
installNewComponentSuccessCallback: function (data, opt, params) {
if (!data || !data.Requests || !data.Requests.id) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/920c29dd/ambari-web/test/controllers/main/host/details_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js
index 673eb8f..846b3ef 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -2399,6 +2399,15 @@ describe('App.MainHostDetailsController', function () {
expect(controller.get('deleteHiveMetaStore')).to.be.true;
expect(controller.loadConfigs.calledWith('loadHiveConfigs')).to.be.true;
});
+ it('HIVE_SERVER component', function () {
+ var data = {
+ componentName: 'HIVE_SERVER'
+ };
+ controller._doDeleteHostComponentSuccessCallback({}, {}, data);
+ expect(controller.get('_deletedHostComponentResult')).to.be.null;
+ expect(controller.get('deleteHiveMetaStore')).to.be.true;
+ expect(controller.loadConfigs.calledWith('loadHiveConfigs')).to.be.true;
+ });
it('NIMBUS component', function () {
var data = {
componentName: 'NIMBUS'