You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2016/01/14 21:41:24 UTC
ambari git commit: AMBARI-14642: Duplicate Kerberos related
properties for HAWQ (mithmatt via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk 8e86ef183 -> bb887c9d3
AMBARI-14642: Duplicate Kerberos related properties for HAWQ (mithmatt via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb887c9d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb887c9d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb887c9d
Branch: refs/heads/trunk
Commit: bb887c9d316861d717d957ca592bb2f2680b9d03
Parents: 8e86ef1
Author: Jun Aoki <ja...@apache.org>
Authored: Thu Jan 14 12:41:12 2016 -0800
Committer: Jun Aoki <ja...@apache.org>
Committed: Thu Jan 14 12:41:12 2016 -0800
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 44 ------------
.../test/controllers/wizard/step7_test.js | 75 --------------------
2 files changed, 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb887c9d/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 92abe21..7b423b6 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -698,7 +698,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
if (this.get('wizardController.name') == 'addServiceController') {
if (App.get('isHaEnabled')) this.addHawqConfigsOnNnHa(configs);
if (App.get('isRMHaEnabled')) this.addHawqConfigsOnRMHa(configs);
- if (App.get('isKerberosEnabled')) this.addHawqConfigsOnKerberizedCluster(configs);
}
if (App.get('isSingleNode')) this.removeHawqStandbyHostAddressConfig(configs);
return configs
@@ -907,49 +906,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
},
/**
- * For Kerberos Enabled cluster, HAWQ service requires additional config parameters in hdfs-client.xml and hawq-site.xml
- * This method ensures that these additional parameters are added to hdfs-client.xml and hawq-site.xml
- * @param configs existing configs on cluster
- * @returns {Object[]} existing configs + additional config parameters in hdfs-client.xml and hawq-site.xml
- */
- addHawqConfigsOnKerberizedCluster: function(configs) {
- Em.A([
- {
- name: 'hadoop.security.authentication',
- value: 'kerberos',
- filename: 'hdfs-client.xml',
- isOverridable: false,
- isReconfigurable: false
- }, {
- name: 'enable_secure_filesystem',
- value: 'ON',
- filename: 'hawq-site.xml',
- isOverridable: false,
- isReconfigurable: false
- }, {
- name: 'krb_server_keyfile',
- value: '/etc/security/keytabs/hawq.service.keytab',
- filename: 'hawq-site.xml',
- isOverridable: true,
- isReconfigurable: true
- }
- ]).forEach(function (property) {
- var newProperty = App.config.createDefaultConfig(property.name, 'HAWQ', property.filename, true);
- Em.setProperties(newProperty, {
- displayName: property.name,
- displayType: 'string',
- name: property.name,
- value: property.value,
- recommendedValue: property.value,
- isOverridable: property.isOverridable,
- isReconfigurable: property.isReconfigurable,
- isSecureConfig: true
- });
- configs.push(App.ServiceConfigProperty.create(newProperty));
- });
- },
-
- /**
* render configs, distribute them by service
* and wrap each in ServiceConfigProperty object
* @param stepConfigs
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb887c9d/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index b7a48c9..762cf1f 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1798,81 +1798,6 @@ describe('App.InstallerStep7Controller', function () {
});
});
- describe('#addHawqConfigsOnKerberizedCluster', function () {
- var secureProperties = [
- {
- name: 'hadoop.security.authentication',
- value: 'kerberos',
- file: 'hdfs-client',
- isOverridable: false,
- isReconfigurable: false
- }, {
- name: 'enable_secure_filesystem',
- value: 'ON',
- file: 'hawq-site',
- isOverridable: false,
- isReconfigurable: false
- }, {
- name: 'krb_server_keyfile',
- value: '/etc/security/keytabs/hawq.service.keytab',
- file: 'hawq-site',
- isOverridable: true,
- isReconfigurable: true
- }
- ];
-
- var configs = [
- {
- id: 'dummy__dummy-site',
- description: 'dummy__dummy-site',
- displayName: 'dummy',
- displayType: 'string',
- name: 'dummy',
- value: 'dummy'
- }
- ];
-
- beforeEach(function () {
- this.originalConfigsLength = configs.length;
- installerStep7Controller.addHawqConfigsOnKerberizedCluster(configs);
- });
-
- it('should add three security related configs for HAWQ if Kerberos is enabled', function () {
- // ensure 3 new configs are added
- expect(configs.length - this.originalConfigsLength).to.be.eql(3);
- });
-
- // check if all three new properties were added
- secureProperties.forEach(function (newProperty) {
- var id = newProperty.name + '__' + newProperty.file;
- describe(id, function () {
-
- beforeEach(function () {
- this.newPropertyAdded = configs.findProperty('id', id);
- });
-
- it('#name', function () {
- expect(this.newPropertyAdded.name).to.be.equal(newProperty.name);
- });
- it('#displayName', function () {
- expect(this.newPropertyAdded.displayName).to.be.equal(newProperty.name);
- });
- it('#value', function () {
- expect(this.newPropertyAdded.value).to.be.equal(newProperty.value);
- });
- it('#recommendedValue', function () {
- expect(this.newPropertyAdded.recommendedValue).to.be.equal(newProperty.value);
- });
- it('#isOverridable', function () {
- expect(this.newPropertyAdded.isOverridable).to.be.equal(newProperty.isOverridable);
- });
- it('#isReconfigurable', function () {
- expect(this.newPropertyAdded.isReconfigurable).to.be.equal(newProperty.isReconfigurable);
- });
- });
- });
- });
-
describe('#errorsCount', function () {
it('should ignore configs with widgets (enhanced configs)', function () {