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 2014/07/11 19:05:36 UTC
git commit: AMBARI-6468. NameNode HA wizard: create JournalNode and
ZKFC components before installing them. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 70ab76b23 -> e8c7e6ba0
AMBARI-6468. NameNode HA wizard: create JournalNode and ZKFC components before installing them. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8c7e6ba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8c7e6ba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8c7e6ba
Branch: refs/heads/trunk
Commit: e8c7e6ba0fc132c41419e30b810bad5c6fb6baad
Parents: 70ab76b
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Jul 11 20:00:23 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Jul 11 20:00:23 2014 +0300
----------------------------------------------------------------------
.../admin/highAvailability/step5_controller.js | 9 +++++
.../admin/highAvailability/step9_controller.js | 9 +++++
ambari-web/app/utils/ajax/ajax.js | 36 ++++++++++++++++++++
3 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8c7e6ba/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
index 3f37ce6..f5e93a5 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
@@ -50,6 +50,15 @@ App.HighAvailabilityWizardStep5Controller = App.HighAvailabilityProgressPageCont
},
installJournalNodes: function () {
+ App.ajax.send({
+ name: 'admin.high_availability.create_journalnode',
+ sender: this,
+ success: 'onJournalNodeCreate',
+ error: 'onJournalNodeCreate'
+ });
+ },
+
+ onJournalNodeCreate: function () {
var hostNames = this.get('content.masterComponentHosts').filterProperty('component', 'JOURNALNODE').mapProperty('hostName');
this.createComponent('JOURNALNODE', hostNames, "HDFS");
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8c7e6ba/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
index f490681..26ca0c7 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
@@ -41,6 +41,15 @@ App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageCont
},
installZKFC: function () {
+ App.ajax.send({
+ name: 'admin.high_availability.create_zkfc',
+ sender: this,
+ success: 'onZKFCCreate',
+ error: 'onZKFCCreate'
+ });
+ },
+
+ onZKFCCreate: function () {
var hostName = this.get('content.masterComponentHosts').filterProperty('component', 'NAMENODE').mapProperty('hostName');
this.createComponent('ZKFC', hostName, "HDFS");
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8c7e6ba/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index a0aaab1..702b5b1 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -804,6 +804,42 @@ var urls = {
}
}
},
+ 'admin.high_availability.create_journalnode': {
+ 'real': '/clusters/{clusterName}/services?ServiceInfo/service_name=HDFS',
+ 'mock': '',
+ 'type': 'POST',
+ 'format': function() {
+ return {
+ data: JSON.stringify({
+ "components": [
+ {
+ "ServiceComponentInfo": {
+ "component_name": "JOURNALNODE"
+ }
+ }
+ ]
+ })
+ }
+ }
+ },
+ 'admin.high_availability.create_zkfc': {
+ 'real': '/clusters/{clusterName}/services?ServiceInfo/service_name=HDFS',
+ 'mock': '',
+ 'type': 'POST',
+ 'format': function() {
+ return {
+ data: JSON.stringify({
+ "components": [
+ {
+ "ServiceComponentInfo": {
+ "component_name": "ZKFC"
+ }
+ }
+ ]
+ })
+ }
+ }
+ },
'admin.high_availability.load_configs': {
'real': '/clusters/{clusterName}/configurations?(type=core-site&tag={coreSiteTag})|(type=hdfs-site&tag={hdfsSiteTag})',
'mock': ''