You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/06/02 17:11:40 UTC
[1/2] ambari git commit: AMBARI-11613. With multiple KMS instances,
hadoop.security.key.provider.path and dfs.encryption.key.provider.uri
are set to an incorrect value. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk dfe0dfebe -> 19f18f577
AMBARI-11613. With multiple KMS instances, hadoop.security.key.provider.path and dfs.encryption.key.provider.uri are set to an incorrect value. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1208fc53
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1208fc53
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1208fc53
Branch: refs/heads/trunk
Commit: 1208fc5385296d89ca4513948ce06147e1f5476f
Parents: dfe0dfe
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Jun 2 15:29:38 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Jun 2 18:10:16 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 7 +-
.../test/controllers/main/host/details_test.js | 76 ++++++++++++++++++++
2 files changed, 78 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1208fc53/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 8ebb6d6..144465b 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -916,11 +916,8 @@ App.MainHostDetailsController = Em.Controller.extend({
}
];
- for (var i = 0; i < rkmsHosts.length; i++) {
- rkmsHosts[i] = rkmsHosts[i] + ':' + rkmsPort;
- }
- coreSiteConfigs.properties['hadoop.security.key.provider.path'] = 'kms://http@' + rkmsHosts.join(',') + '/kms';
- hdfsSiteConfigs.properties['dfs.encryption.key.provider.uri'] = 'kms://http@' + rkmsHosts.join(',') + '/kms';
+ coreSiteConfigs.properties['hadoop.security.key.provider.path'] = 'kms://http@' + rkmsHosts.join(';') + ':' + rkmsPort + '/kms';
+ hdfsSiteConfigs.properties['dfs.encryption.key.provider.uri'] = 'kms://http@' + rkmsHosts.join(';') + ':' + rkmsPort + '/kms';
this.saveConfigsBatch(groups, 'RANGER_KMS_SERVER', hostToInstall);
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/1208fc53/ambari-web/test/controllers/main/host/details_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js
index 15f7231..4023a0e 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -2564,4 +2564,80 @@ describe('App.MainHostDetailsController', function () {
});
});
+
+ describe('#onLoadRangerConfigs()', function () {
+
+ var cases = [
+ {
+ 'kmsHosts': ['host1'],
+ 'kmsPort': 'port',
+ 'title': 'single host',
+ 'hostToInstall': undefined,
+ 'result': [
+ {
+ properties: {
+ 'core-site': {'hadoop.security.key.provider.path': 'kms://http@host1:port/kms'},
+ 'hdfs-site': {'dfs.encryption.key.provider.uri': 'kms://http@host1:port/kms'}
+ },
+ properties_attributes: {
+ 'core-site': undefined,
+ 'hdfs-site': undefined
+ }
+ }
+ ]
+ },
+ {
+ 'kmsHosts': ['host1', 'host2'],
+ 'kmsPort': 'port',
+ 'title': 'two hosts',
+ 'hostToInstall': 'host2',
+ 'result': [
+ {
+ properties: {
+ 'core-site': {'hadoop.security.key.provider.path': 'kms://http@host1;host2:port/kms'},
+ 'hdfs-site': {'dfs.encryption.key.provider.uri': 'kms://http@host1;host2:port/kms'}
+ },
+ properties_attributes: {
+ 'core-site': undefined,
+ 'hdfs-site': undefined
+ }
+ }
+ ]
+ }
+ ];
+
+ beforeEach(function () {
+ sinon.spy(controller, 'saveConfigsBatch')
+ });
+
+ afterEach(function () {
+ controller.saveConfigsBatch.restore();
+ });
+
+ cases.forEach(function (item) {
+ it(item.title, function () {
+ controller.set('rangerKMSServerHost', item.hostToInstall);
+ sinon.stub(controller, 'getRangerKMSServerHosts').returns(item.kmsHosts);
+ var data = {
+ items: [
+ {
+ type: 'kms-env',
+ properties: {'kms_port': item.kmsPort}
+ },
+ {
+ type: 'core-site',
+ properties: {}
+ },
+ {
+ type: 'hdfs-site',
+ properties: {}
+ }
+ ]
+ };
+ controller.onLoadRangerConfigs(data);
+ expect(controller.saveConfigsBatch.calledWith(item.result, 'RANGER_KMS_SERVER', item.hostToInstall)).to.be.true;
+ });
+ });
+
+ });
});
[2/2] ambari git commit: AMBARI-11616. Wrong cursor over activated
final button on configs page (akovalenko)
Posted by ak...@apache.org.
AMBARI-11616. Wrong cursor over activated final button on configs page (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/19f18f57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19f18f57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19f18f57
Branch: refs/heads/trunk
Commit: 19f18f5772ce42c10307405df92d82151c6601b6
Parents: 1208fc5
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Jun 2 16:49:17 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Jun 2 18:10:17 2015 +0300
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/19f18f57/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 347553e..3cfbddf 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1215,12 +1215,12 @@ h1 {
}
.btn-final .icon-lock{
color: #a6a6a6;
+ cursor: inherit;
}
.btn-final.active .icon-lock {
color: blue;
}
- .btn-final.active,
- .btn-final.active[disabled] { //copied from Bootstrap .btn.active
+ .btn-final.active { //copied from Bootstrap .btn.active
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
background-image: none;
@@ -1228,6 +1228,8 @@ h1 {
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ }
+ .btn-final.active[disabled] {
cursor: not-allowed;
}
a.accordion-toggle:hover {