This is an automated email from the ASF dual-hosted git repository. ababiichuk 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 10664e3 AMBARI-23904 ZKFC fails to start while moving Namenode on a cluster with multiple namespaces. (ababiichuk) 10664e3 is described below commit 10664e3b66516cfc04ac124ee00362b1705a6781 Author: ababiichuk <ababiic...@hortonworks.com> AuthorDate: Fri May 18 21:05:05 2018 +0300 AMBARI-23904 ZKFC fails to start while moving Namenode on a cluster with multiple namespaces. (ababiichuk) --- .../app/controllers/main/service/reassign/step3_controller.js | 6 +++--- ambari-web/app/utils/configs/move_namenode_config_initializer.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ambari-web/app/controllers/main/service/reassign/step3_controller.js b/ambari-web/app/controllers/main/service/reassign/step3_controller.js index 65ccce9..bbc05d1 100644 --- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js @@ -482,7 +482,7 @@ App.ReassignMasterWizardStep3Controller = Em.Controller.extend({ if (additionalConfigs.hasOwnProperty(site)) { for (var property in additionalConfigs[site]) { if (additionalConfigs[site].hasOwnProperty(property)) { - if (App.get('isHaEnabled') && componentName === 'NAMENODE' && (property === 'fs.defaultFS' || property === 'dfs.namenode.rpc-address')) continue; + if (App.get('isHaEnabled') && componentName === 'NAMENODE' && (['fs.defaultFS', 'dfs.namenode.rpc-address', 'dfs.namenode.http-address', 'dfs.namenode.https-address'].contains(property))) continue; configs[site][property] = additionalConfigs[site][property].replace('<replace-value>', replaceValue); if (!this.get('propertiesToChange').hasOwnProperty(site)) { @@ -553,9 +553,9 @@ App.ReassignMasterWizardStep3Controller = Em.Controller.extend({ httpAddressPropertiesNames = propertyNames.filter(propertyName => propertyName.startsWith(propertyNameStart)), matchingPropertyName = httpAddressPropertiesNames.find(propertyName => configsObject[propertyName].startsWith(this.get('content.reassignHosts.source'))); if (matchingPropertyName) { - const nameSpaceMatch = matchingPropertyName.match(new RegExp(`${propertyNameStart}(\\w+)`)); + const nameNodeSuffixMatch = matchingPropertyName.match(new RegExp(`${propertyNameStart}(\\w+)`)); ret.namespaceId = nameSpace; - ret.suffix = nameSpaceMatch && nameSpaceMatch[1]; + ret.suffix = nameNodeSuffixMatch && nameNodeSuffixMatch[1]; break; } } diff --git a/ambari-web/app/utils/configs/move_namenode_config_initializer.js b/ambari-web/app/utils/configs/move_namenode_config_initializer.js index 248b902..491923e 100644 --- a/ambari-web/app/utils/configs/move_namenode_config_initializer.js +++ b/ambari-web/app/utils/configs/move_namenode_config_initializer.js @@ -30,7 +30,8 @@ App.MoveNameNodeConfigInitializer = App.MoveComponentConfigInitializerClass.crea initializers: { 'dfs.namenode.http-address.{{namespaceId}}.{{suffix}}': App.MoveComponentConfigInitializerClass.getTargetHostConfig(50070), 'dfs.namenode.https-address.{{namespaceId}}.{{suffix}}': App.MoveComponentConfigInitializerClass.getTargetHostConfig(50470), - 'dfs.namenode.rpc-address.{{namespaceId}}.{{suffix}}': App.MoveComponentConfigInitializerClass.getTargetHostConfig(8020) + 'dfs.namenode.rpc-address.{{namespaceId}}.{{suffix}}': App.MoveComponentConfigInitializerClass.getTargetHostConfig(8020), + 'dfs.namenode.servicerpc-address.{{namespaceId}}.{{suffix}}': App.MoveComponentConfigInitializerClass.getTargetHostConfig(8021), }, uniqueInitializers: { -- To stop receiving notification emails like this one, please contact ababiic...@apache.org.