Repository: ambari
Updated Branches:
refs/heads/trunk 5f95f11bc -> 97c524d96
AMBARI-10457. Storm Nimbus HA. (Sriharsha Chintalapani via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97c524d9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97c524d9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97c524d9
Branch: refs/heads/trunk
Commit: 97c524d969fb7b1d405ade65e3237bf7cb8ccb78
Parents: 5f95f11
Author: Yusaku Sako
Authored: Wed Apr 29 19:38:54 2015 -0700
Committer: Yusaku Sako
Committed: Wed Apr 29 19:38:54 2015 -0700
--
.../stacks/HDP/2.3/services/STORM/metainfo.xml | 23 +++
ambari-web/app/controllers/main/host/details.js | 148 +++
ambari-web/app/data/HDP2/site_properties.js | 13 ++
ambari-web/app/messages.js | 2 +
.../app/utils/configs/config_property_helper.js | 3 +
ambari-web/test/utils/config_test.js| 2 +-
6 files changed, 190 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/97c524d9/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
index b4dc4a1..092a4d0 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
@@ -40,6 +40,29 @@
+
+
+ NIMBUS
+ Nimbus
+ MASTER
+ 1+
+ true
+
+
+ ZOOKEEPER/ZOOKEEPER_SERVER
+ cluster
+
+true
+
+
+
+
+scripts/nimbus.py
+PYTHON
+1200
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/97c524d9/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 d23fc79..15df59f 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -233,6 +233,12 @@ App.MainHostDetailsController = Em.Controller.extend({
deleteHiveMetastoreMsg: Em.View.extend({
template:
Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.deleteHiveMetastore'))
}),
+ isNimbus: function () {
+return componentName == 'NIMBUS';
+ }.property(),
+ deleteNimbusMsg: Em.View.extend({
+template:
Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.deleteNimbus'))
+ }),
isChecked: false,
disablePrimary: function () {
return !this.get('isChecked');
@@ -329,6 +335,9 @@ App.MainHostDetailsController = Em.Controller.extend({
} else if (data.componentName == 'HIVE_METASTORE') {
this.set('deleteHiveMetaStore', true);
this.loadConfigs('loadHiveConfigs');
+} else if(data.componentName == 'NIMBUS') {
+ this.set('deleteNimbusHost', true);
+ this.loadConfigs('loadStormConfigs');
}
},
@@ -449,6 +458,7 @@ App.MainHostDetailsController = Em.Controller.extend({
self = this,
hiveHost = event.hiveMetastoreHost ? event.hiveMetastoreHost : "";
component = event.context,
+ hostName = this.get('content.hostName'),
componentName = component.get('componentName'),
missedComponents = !!hiveHost ? [] :
componentsUtils.checkComponentDependencies(componentName, {
scope: 'host',
@@ -474,6 +484,12 @@ App.MainHostDetailsController = Em.Controller.extend({
self.loadConfigs("loadHiveConfigs");
}, Em.I18n.t('hosts.host.addComponent.' + componentName ));
break;
+ case 'NIMBUS':
+returnFunc = App.showConfirmationPopup(function() {
+self.set('nimbusHost', hostName);
+self.loadConfigs("loadStormConfigs");
+}, Em.I18n.t('hosts.host.addComponent.' + componentName));
+break;
default:
returnFunc = this.addClientComponent(component);
}
@@ -627,6 +643,114 @@ App.MainHostDetailsController = Em.Controller.extend({
this.get('isOozieConfigLoaded').resolve();
},
+
+ /**
+ * Success callback for Storm load configs request
+ * @param {object} data
+ * @method loadStormConfigs
+ */
+ loadStormConfigs: function (data) {
+App.ajax.send({
+ name: 'admin.get.all_configurations',
+ sender: this,
+ data
