This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 95f9e81 AMBARI-23424. Need to add new property for Ranger-Tagsync
when enabling federation for Namenode-HA via UI wizard (akovalenko)
95f9e81 is described below
commit 95f9e81cd5f4d9882f8b63316336c31ed8896d6a
Author: Aleksandr Kovalenko <[email protected]>
AuthorDate: Mon Apr 2 21:50:09 2018 +0300
AMBARI-23424. Need to add new property for Ranger-Tagsync when enabling
federation for Namenode-HA via UI wizard (akovalenko)
---
.../main/admin/federation/step3_controller.js | 25 +++++++++++++++++-----
.../main/admin/federation/step4_controller.js | 22 ++++++++++++++-----
.../data/configs/wizards/federation_properties.js | 23 +++++++++++++++++++-
ambari-web/app/messages.js | 2 +-
4 files changed, 60 insertions(+), 12 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
index b372587..f24785f 100644
--- a/ambari-web/app/controllers/main/admin/federation/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step3_controller.js
@@ -58,11 +58,16 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
onLoadConfigsTags: function (data) {
+ var urlParams = '(type=hdfs-site&tag=' +
data.Clusters.desired_configs['hdfs-site'].tag + ')';
+ if (App.Service.find().someProperty('serviceName', 'RANGER')) {
+ urlParams += '|(type=ranger-tagsync-site&tag=' +
data.Clusters.desired_configs['ranger-tagsync-site'].tag + ')' +
+ '|(type=ranger-hdfs-security&tag=' +
data.Clusters.desired_configs['ranger-hdfs-security'].tag + ')'
+ }
App.ajax.send({
name: 'admin.get.all_configurations',
sender: this,
data: {
- urlParams: '(type=hdfs-site&tag=' +
data.Clusters.desired_configs['hdfs-site'].tag + ')'
+ urlParams: urlParams
},
success: 'onLoadConfigs',
error: 'onTaskError'
@@ -91,16 +96,26 @@ App.NameNodeFederationWizardStep3Controller =
Em.Controller.extend(App.Blueprint
ret.journalnodes = journalNodes.map(function (c) {
return c.get('hostName') + ':8485'
}).join(';');
+ ret.clustername = App.get('clusterName');
- var hdfsConfigs = configsFromServer.findProperty('type',
'hdfs-site').properties;
+ var hdfsSiteConfigs = configsFromServer.findProperty('type',
'hdfs-site').properties;
+ var hdfsRangerConfigs = configsFromServer.findProperty('type',
'ranger-hdfs-security').properties;
- var dfsHttpA = hdfsConfigs['dfs.namenode.http-address'];
+ if (hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] ===
'{{repo_name}}') {
+ ret.ranger_service_name_ns1 = ret.clustername + '_hadoop_' +
ret.nameservice1;
+ ret.ranger_service_name_ns2 = ret.clustername + '_hadoop_' +
ret.nameservice2;
+ } else {
+ ret.ranger_service_name_ns1 =
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] + '_' + ret.nameservice1;
+ ret.ranger_service_name_ns2 =
hdfsRangerConfigs['ranger.plugin.hdfs.service.name'] + '_' + ret.nameservice2;
+ }
+
+ var dfsHttpA = hdfsSiteConfigs['dfs.namenode.http-address'];
ret.nnHttpPort = dfsHttpA ? dfsHttpA.split(':')[1] : 50070;
- var dfsHttpsA = hdfsConfigs['dfs.namenode.https-address'];
+ var dfsHttpsA = hdfsSiteConfigs['dfs.namenode.https-address'];
ret.nnHttpsPort = dfsHttpsA ? dfsHttpsA.split(':')[1] : 50470;
- var dfsRpcA = hdfsConfigs['dfs.namenode.rpc-address'];
+ var dfsRpcA = hdfsSiteConfigs['dfs.namenode.rpc-address'];
ret.nnRpcPort = dfsRpcA ? dfsRpcA.split(':')[1] : 8020;
return ret;
diff --git
a/ambari-web/app/controllers/main/admin/federation/step4_controller.js
b/ambari-web/app/controllers/main/admin/federation/step4_controller.js
index 9c9c9dd..c9c6557 100644
--- a/ambari-web/app/controllers/main/admin/federation/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step4_controller.js
@@ -22,7 +22,7 @@ App.NameNodeFederationWizardStep4Controller =
App.HighAvailabilityProgressPageCo
name: "nameNodeFederationWizardStep4Controller",
- commands: ['reconfigureHDFS', 'installNameNode', 'installZKFC',
'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode',
'bootstrapNameNode', 'createWidgets', 'startZKFC2', 'startNameNode2',
'restartAllServices'],
+ commands: ['reconfigureServices', 'installNameNode', 'installZKFC',
'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode',
'bootstrapNameNode', 'createWidgets', 'startZKFC2', 'startNameNode2',
'restartAllServices'],
tasksMessagesPrefix: 'admin.nameNodeFederation.wizard.step',
@@ -30,15 +30,27 @@ App.NameNodeFederationWizardStep4Controller =
App.HighAvailabilityProgressPageCo
return
this.get('content.masterComponentHosts').filterProperty('component',
'NAMENODE').filterProperty('isInstalled', false).mapProperty('hostName');
}.property('[email protected]'),
- reconfigureHDFS: function () {
+ reconfigureServices: function () {
+ var configs = [];
var data = this.get('content.serviceConfigProperties');
var note =
Em.I18n.t('admin.nameNodeFederation.wizard,step4.save.configuration.note');
- var configData = this.reconfigureSites(['hdfs-site'], data, note);
+ configs.push({
+ Clusters: {
+ desired_config: this.reconfigureSites(['hdfs-site'], data, note)
+ }
+ });
+ if (App.Service.find().someProperty('serviceName', 'RANGER')) {
+ configs.push({
+ Clusters: {
+ desired_config: this.reconfigureSites(['ranger-tagsync-site'], data,
note)
+ }
+ });
+ }
return App.ajax.send({
- name: 'common.service.configurations',
+ name: 'common.service.multiConfigurations',
sender: this,
data: {
- desired_config: configData
+ configs: configs
},
error: 'onTaskError',
success: 'installHDFSClients'
diff --git a/ambari-web/app/data/configs/wizards/federation_properties.js
b/ambari-web/app/data/configs/wizards/federation_properties.js
index 9ec419c..648aead 100644
--- a/ambari-web/app/data/configs/wizards/federation_properties.js
+++ b/ambari-web/app/data/configs/wizards/federation_properties.js
@@ -22,7 +22,8 @@ module.exports =
serviceName: 'MISC',
displayName: 'MISC',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'HDFS', displayName: 'HDFS'})
+ App.ServiceConfigCategory.create({ name: 'HDFS', displayName: 'HDFS'}),
+ App.ServiceConfigCategory.create({ name: 'RANGER', displayName:
'Ranger'})
],
sites: ['core-site'],
configs: [
@@ -225,6 +226,26 @@ module.exports =
"category": "HDFS",
"filename": "hdfs-site",
"serviceName": 'MISC'
+ },
+ {
+ "name":
"ranger.tagsync.atlas.hdfs.instance.{{clustername}}.nameservice.{{nameservice1}}.ranger.service",
+ "displayName":
"ranger.tagsync.atlas.hdfs.instance.{{clustername}}.nameservice.{{nameservice1}}.ranger.service",
+ "isReconfigurable": false,
+ "recommendedValue": "{{ranger_service_name_ns1}}",
+ "value": "{{ranger_service_name_ns1}}",
+ "category": "RANGER",
+ "filename": "ranger-tagsync-site",
+ "serviceName": 'MISC'
+ },
+ {
+ "name":
"ranger.tagsync.atlas.hdfs.instance.{{clustername}}.nameservice.{{nameservice2}}.ranger.service",
+ "displayName":
"ranger.tagsync.atlas.hdfs.instance.{{clustername}}.nameservice.{{nameservice2}}.ranger.service",
+ "isReconfigurable": false,
+ "recommendedValue": "{{ranger_service_name_ns2}}",
+ "value": "{{ranger_service_name_ns2}}",
+ "category": "RANGER",
+ "filename": "ranger-tagsync-site",
+ "serviceName": 'MISC'
}
]
}
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 7370032..fe4d6aa 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1689,7 +1689,7 @@ Em.I18n.translations = {
'admin.nameNodeFederation.wizard,step4.save.configuration.note':'This
configuration is created by Enable NameNode Federation wizard',
'admin.nameNodeFederation.wizard.step4.notice.inProgress':'Please wait while
NameNode Federation Wizard is being deployed.',
'admin.nameNodeFederation.wizard.step4.notice.completed':'NameNode
Federation Wizard has been enabled successfully.',
- 'admin.nameNodeFederation.wizard.step4.task0.title': 'Reconfigure HDFS',
+ 'admin.nameNodeFederation.wizard.step4.task0.title': 'Reconfigure Services',
'admin.nameNodeFederation.wizard.step4.task1.title': 'Install Additional
NameNodes',
'admin.nameNodeFederation.wizard.step4.task2.title': 'Install Additional
ZKFCs',
'admin.nameNodeFederation.wizard.step4.task3.title': 'Format NameNode',
--
To stop receiving notification emails like this one, please contact
[email protected].
