You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/07/21 12:04:16 UTC
[1/2] ambari git commit: AMBARI-12423. Ambari - Deleting a Zookeeper
server doesn't update the the storm.zookeeper.servers property for Storm
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 0053a9ac2 -> e3e3d5c14
AMBARI-12423. Ambari - Deleting a Zookeeper server doesn't update the the storm.zookeeper.servers property for Storm (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09346edf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09346edf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09346edf
Branch: refs/heads/branch-2.1
Commit: 09346edf0953e4b358fa903fa806e6140eb1ea85
Parents: 0053a9a
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Jul 21 13:02:44 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Jul 21 13:02:44 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 36 ++++++++++++++++----
.../test/controllers/main/host/details_test.js | 2 +-
2 files changed, 31 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/09346edf/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 93ecf25..94ba5ec 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -346,6 +346,7 @@ App.MainHostDetailsController = Em.Controller.extend({
this.removeHostComponentModel(data.componentName, data.hostName);
if (data.componentName == 'ZOOKEEPER_SERVER') {
this.set('fromDeleteZkServer', true);
+ this.updateStormConfigs();
this.loadConfigs();
} else if (data.componentName == 'HIVE_METASTORE') {
this.set('deleteHiveMetaStore', true);
@@ -697,6 +698,19 @@ App.MainHostDetailsController = Em.Controller.extend({
},
/**
+ * Update zk configs
+ * @param {object} configs
+ * @method updateZkConfigs
+ */
+ updateZkConfigs: function(configs) {
+ var zks = this.getZkServerHosts();
+ var portValue = configs['zoo.cfg'] && Em.get(configs['zoo.cfg'], 'clientPort');
+ var zkPort = typeof portValue === 'udefined' ? '2181' : portValue;
+ var zksWithPort = this.concatZkNames(zks, zkPort);
+ this.setZKConfigs(configs, zksWithPort, zks);
+ },
+
+ /**
* update and save Storm related configs to server
* @param {object} data
* @method onLoadStormConfigs
@@ -712,6 +726,8 @@ App.MainHostDetailsController = Em.Controller.extend({
attributes[item.type] = item.properties_attributes || {};
}, this);
+ this.updateZkConfigs(configs);
+
configs['storm-site']['nimbus.seeds'] = JSON.stringify(stormNimbusHosts).replace(/"/g, "'");
var groups = [
{
@@ -1018,6 +1034,16 @@ App.MainHostDetailsController = Em.Controller.extend({
this.showBackgroundOperationsPopup();
},
+ /**
+ * Update storm config
+ * @method updateStormConfigs
+ */
+ updateStormConfigs: function() {
+ if (App.Service.find().findProperty('serviceName', 'STORM')) {
+ this.loadConfigs("loadStormConfigs");
+ }
+ },
+
/**
* Load tags
* @method checkZkConfigs
@@ -1028,6 +1054,7 @@ App.MainHostDetailsController = Em.Controller.extend({
var self = this;
this.removeObserver('App.router.backgroundOperationsController.serviceTimestamp', this, this.checkZkConfigs);
setTimeout(function () {
+ self.updateStormConfigs();
self.loadConfigs();
}, App.get('componentsUpdateInterval'));
}
@@ -1116,11 +1143,8 @@ App.MainHostDetailsController = Em.Controller.extend({
attributes[item.type] = item.properties_attributes || {};
}, this);
- var zks = this.getZkServerHosts();
- var portValue = configs['zoo.cfg'] && Em.get(configs['zoo.cfg'], 'clientPort');
- var zkPort = typeof portValue === 'udefined' ? '2181' : portValue;
- var zksWithPort = this.concatZkNames(zks, zkPort);
- this.setZKConfigs(configs, zksWithPort, zks);
+ this.updateZkConfigs(configs);
+
var groups = [
{
properties: {
@@ -1856,7 +1880,7 @@ App.MainHostDetailsController = Em.Controller.extend({
runningComponents: [],
nonDeletableComponents: [],
unknownComponents: []
- };
+ };
var self = this;
if (componentsOnHost && componentsOnHost.get('length') > 0) {
componentsOnHost.forEach(function (cInstance) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/09346edf/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 1883c70..cd35981 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -1049,7 +1049,7 @@ describe('App.MainHostDetailsController', function () {
var popup = controller.installComponent(event);
expect(App.ModalPopup.show.calledOnce).to.be.true;
popup.onPrimary();
- expect(App.ajax.send.calledOnce).to.be.true;
+ expect(App.ajax.send.called).to.be.true;
});
});
[2/2] ambari git commit: AMBARI-12464. Falcon
*.falcon.http.authentication.kerberos.name.rules should be text box,
not field (alexantonenko)
Posted by al...@apache.org.
AMBARI-12464. Falcon *.falcon.http.authentication.kerberos.name.rules should be text box, not field (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3e3d5c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3e3d5c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3e3d5c1
Branch: refs/heads/branch-2.1
Commit: e3e3d5c147f1cb1d441d8e3f5c4d75ebcfed6324
Parents: 09346ed
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Jul 21 09:47:51 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Jul 21 13:03:48 2015 +0300
----------------------------------------------------------------------
ambari-web/app/data/BIGTOP/site_properties.js | 1 +
ambari-web/app/data/HDP2/site_properties.js | 1 +
ambari-web/app/data/PHD/site_properties.js | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e3e3d5c1/ambari-web/app/data/BIGTOP/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/BIGTOP/site_properties.js b/ambari-web/app/data/BIGTOP/site_properties.js
index c01ac87..e71cab4 100644
--- a/ambari-web/app/data/BIGTOP/site_properties.js
+++ b/ambari-web/app/data/BIGTOP/site_properties.js
@@ -1637,6 +1637,7 @@ module.exports =
"name": "*.falcon.http.authentication.kerberos.name.rules",
"displayName": "*.falcon.http.authentication.kerberos.name.rules",
"category": "FalconStartupSite",
+ "displayType": "multiLine",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e3e3d5c1/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index ccea488..d946900 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1689,6 +1689,7 @@ var hdp2properties = [
"name": "*.falcon.http.authentication.kerberos.name.rules",
"displayName": "*.falcon.http.authentication.kerberos.name.rules",
"category": "FalconStartupSite",
+ "displayType": "multiLine",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e3e3d5c1/ambari-web/app/data/PHD/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/PHD/site_properties.js b/ambari-web/app/data/PHD/site_properties.js
index f3eccfc..b6e548c 100644
--- a/ambari-web/app/data/PHD/site_properties.js
+++ b/ambari-web/app/data/PHD/site_properties.js
@@ -1577,6 +1577,7 @@ module.exports =
"id": "site property",
"name": "*.falcon.http.authentication.kerberos.name.rules",
"displayName": "*.falcon.http.authentication.kerberos.name.rules",
+ "displayType": "multiLine",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"