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 2016/06/23 12:42:42 UTC
[1/3] ambari git commit: AMBARI-17401. Service actions are available
via firepath even if not visible on UI (RBAC) (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 49a10f14b -> b6f022d80
AMBARI-17401. Service actions are available via firepath even if not visible on UI (RBAC) (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b6f022d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6f022d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6f022d8
Branch: refs/heads/trunk
Commit: b6f022d80603567706c149b7c2b73c0bb0c23df6
Parents: 28ecf73
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jun 23 14:31:40 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jun 23 15:42:37 2016 +0300
----------------------------------------------------------------------
ambari-web/app/templates/main/service/item.hbs | 36 +++++++++++----------
1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b6f022d8/ambari-web/app/templates/main/service/item.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/item.hbs b/ambari-web/app/templates/main/service/item.hbs
index c22424b..43fb3dd 100644
--- a/ambari-web/app/templates/main/service/item.hbs
+++ b/ambari-web/app/templates/main/service/item.hbs
@@ -90,23 +90,25 @@
{{#if view.maintenance.length}}
<!-- Other service actions -->
{{#each option in view.maintenance}}
- <li {{bindAttr class="option.disabled option.isHidden:hidden option.hasSubmenu:dropdown-submenu option.hasSubmenu:submenu-left"}}>
- <a {{action "doAction" option target="controller" href=true}} {{bindAttr data-title="option.tooltip"}} rel="HealthTooltip">
- <i {{bindAttr class="option.cssClass"}}></i>
- {{option.label}}
- </a>
- {{#if option.hasSubmenu}}
- <div class="dropdown-menu-wrap">
- <ul class="dropdown-menu">
- {{#each item in option.submenuOptions}}
- <li>
- <a {{action "doAction" item target="controller" href=true}}>{{item.context.label}}</a>
- </li>
- {{/each}}
- </ul>
- </div>
- {{/if}}
- </li>
+ {{#unless option.isHidden}}
+ <li {{bindAttr class="option.disabled option.hasSubmenu:dropdown-submenu option.hasSubmenu:submenu-left"}}>
+ <a {{action "doAction" option target="controller" href=true}} {{bindAttr data-title="option.tooltip"}} rel="HealthTooltip">
+ <i {{bindAttr class="option.cssClass"}}></i>
+ {{option.label}}
+ </a>
+ {{#if option.hasSubmenu}}
+ <div class="dropdown-menu-wrap">
+ <ul class="dropdown-menu">
+ {{#each item in option.submenuOptions}}
+ <li>
+ <a {{action "doAction" item target="controller" href=true}}>{{item.context.label}}</a>
+ </li>
+ {{/each}}
+ </ul>
+ </div>
+ {{/if}}
+ </li>
+ {{/unless}}
{{/each}}
{{else}}
{{view App.SpinnerView classNames="service-button-spinner"}}
[2/3] ambari git commit: AMBARI-17400. Ambari could not detect the
spark-client that is dependency of livy (alexantonenko)
Posted by al...@apache.org.
AMBARI-17400. Ambari could not detect the spark-client that is dependency of livy (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28ecf734
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28ecf734
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28ecf734
Branch: refs/heads/trunk
Commit: 28ecf734ca1e8ac7e56801f4610956a2cd33b288
Parents: b83b3e2
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jun 23 14:10:56 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jun 23 15:42:37 2016 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step8_controller.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/28ecf734/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index b236373..3971cf5 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1217,7 +1217,8 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
* }
* </code>
*/
- var clientsToMasterMap = this.getClientsMap('isMaster');
+ var clientsToMasterMap = this.getClientsMap('isMaster'),
+ clientsToSlaveMap = this.getClientsMap('isSlave');
slaveHosts.forEach(function (_slave) {
if (_slave.componentName !== 'CLIENT') {
@@ -1254,6 +1255,13 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
});
}
}
+ if (clientsToSlaveMap[_client.component_name]) {
+ clientsToSlaveMap[_client.component_name].forEach(function (componentName) {
+ slaveHosts.filterProperty('componentName', componentName).forEach(function (slaveHost) {
+ hostNames = hostNames.concat(slaveHost.hosts.mapProperty('hostName')).uniq();
+ });
+ });
+ }
if (clientOnAllHosts.length > 0) {
var compOnAllHosts = false;
for (var i=0; i < clientOnAllHosts.length; i++) {
[3/3] ambari git commit: AMBARI-17399. Hive llap principals are shown
on Configure Identity even when Hive is not deployed (alexantonenko)
Posted by al...@apache.org.
AMBARI-17399. Hive llap principals are shown on Configure Identity even when Hive is not deployed (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b83b3e27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b83b3e27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b83b3e27
Branch: refs/heads/trunk
Commit: b83b3e274850fefcba22f330c15617375b04a325
Parents: 49a10f1
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jun 23 14:09:00 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jun 23 15:42:37 2016 +0300
----------------------------------------------------------------------
.../app/controllers/main/admin/kerberos.js | 3 --
.../main/admin/kerberos/step4_controller.js | 25 ++++++------
.../app/mixins/wizard/addSecurityConfigs.js | 40 ++++++--------------
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../admin/kerberos/step4_controller_test.js | 11 +-----
5 files changed, 29 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b83b3e27/ambari-web/app/controllers/main/admin/kerberos.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js
index e795bdf..d1d5012 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -65,9 +65,6 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
'none': Em.I18n.t('admin.kerberos.wizard.step1.option.manual')
},
- // use cluster descriptor instead of stack
- loadStackDescriptorConfigs: Em.alias('loadClusterDescriptorConfigs'),
-
getAddSecurityWizardStatus: function () {
return App.db.getSecurityWizardStatus();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/b83b3e27/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
index 1e165ab..6167ef2 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
@@ -75,17 +75,20 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
var successCallback = function(data) {
dfd.resolve(data);
};
- if (this.get('isWithinAddService')) {
- App.ajax.send({
- sender: this,
- name: 'admin.kerberize.cluster_descriptor_artifact'
- }).always(function(data, status) {
- self.storeClusterDescriptorStatus(status === 'success');
- self.loadClusterDescriptorConfigs().then(successCallback);
- });
- } else {
- this.loadStackDescriptorConfigs().then(successCallback);
- }
+ var checkDescriptor = function() {
+ if (self.get('isWithinAddService')) {
+ return App.ajax.send({
+ sender: self,
+ name: 'admin.kerberize.cluster_descriptor_artifact'
+ });
+ }
+ return $.Deferred().resolve().promise();
+ };
+
+ checkDescriptor().always(function(data, status) {
+ self.storeClusterDescriptorStatus(status === 'success');
+ self.loadClusterDescriptorConfigs(self.get('isWithinAddService') ? self.get('selectedServiceNames') : false).then(successCallback);
+ });
return dfd.promise();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/b83b3e27/ambari-web/app/mixins/wizard/addSecurityConfigs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
index a876804..7e495ea 100644
--- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
+++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
@@ -84,7 +84,7 @@ App.AddSecurityConfigs = Em.Mixin.create({
// generate configs for service level identity objects
configs = configs.concat(self.createResourceConfigs(service, serviceName));
// generate configs for service component level identity object
- service.components.forEach(function (component) {
+ Em.getWithDefault(service, 'components', []).forEach(function (component) {
configs = configs.concat(self.createResourceConfigs(component, serviceName));
});
});
@@ -327,7 +327,7 @@ App.AddSecurityConfigs = Em.Mixin.create({
kerberosDescriptor.services.forEach(function (_service) {
isConfigUpdated = this.updateResourceIdentityConfigs(_service, _config);
if (!isConfigUpdated) {
- _service.components.forEach(function (_component) {
+ Em.getWithDefault(_service, 'components', []).forEach(function (_component) {
isConfigUpdated = this.updateResourceIdentityConfigs(_component, _config);
}, this);
}
@@ -417,38 +417,22 @@ App.AddSecurityConfigs = Em.Mixin.create({
},
/**
- * Check if cluster descriptor should be loaded
- * @returns {Boolean}
- */
- shouldLoadClusterDescriptor: function() {
- return App.get('isKerberosEnabled') && !App.router.get('mainAdminKerberosController.defaultKerberosLoaded');
- }.property('App.isKerberosEnabled', 'App.router.mainAdminKerberosController.defaultKerberosLoaded'),
-
- /**
- * Make request for stack descriptor configs.
- * @returns {$.ajax}
- * @method loadStackDescriptorConfigs
- */
- loadStackDescriptorConfigs: function () {
- return App.ajax.send({
- sender: this,
- name: 'admin.kerberize.stack_descriptor',
- data: {
- stackName: App.get('currentStackName'),
- stackVersionNumber: App.get('currentStackVersionNumber')
- }
- });
- },
-
- /**
* Make request for cluster descriptor configs.
+ *
+ * @param {string[]|null} [services=null] services to be added
* @returns {$.ajax}
* @method loadClusterDescriptorConfigs
*/
- loadClusterDescriptorConfigs: function () {
+ loadClusterDescriptorConfigs: function (services) {
+ var servicesParam = services ? 'additional_services=' + services.join(',') : null,
+ queryParams = ['evaluate_when=true'].concat(servicesParam).compact().join('&');
+
return App.ajax.send({
sender: this,
- name: 'admin.kerberize.cluster_descriptor'
+ name: 'admin.kerberize.cluster_descriptor',
+ data: {
+ queryParams: '?' + queryParams
+ }
});
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/b83b3e27/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 2b46431..73b48b4 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1577,7 +1577,7 @@ var urls = {
'mock': '/data/wizard/kerberos/stack_descriptors.json'
},
'admin.kerberize.cluster_descriptor': {
- 'real': '/clusters/{clusterName}/kerberos_descriptors/COMPOSITE',
+ 'real': '/clusters/{clusterName}/kerberos_descriptors/COMPOSITE{queryParams}',
'mock': '/data/wizard/kerberos/stack_descriptors.json'
},
'admin.kerberos.cluster.artifact.create': {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b83b3e27/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
index 8ef0fe8..8bd2d1e 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
@@ -574,18 +574,17 @@ describe('App.KerberosWizardStep4Controller', function() {
beforeEach(function() {
c.reopen({
- isWithinAddService: true
+ isWithinAddService: true,
+ selectedServiceNames: []
});
sinon.stub(c, 'storeClusterDescriptorStatus');
sinon.stub(c, 'loadClusterDescriptorConfigs').returns(mock);
- sinon.stub(c, 'loadStackDescriptorConfigs').returns(mock);
sinon.stub(mock, 'then');
});
afterEach(function() {
c.loadClusterDescriptorConfigs.restore();
c.storeClusterDescriptorStatus.restore();
- c.loadStackDescriptorConfigs.restore();
mock.then.restore();
});
@@ -613,12 +612,6 @@ describe('App.KerberosWizardStep4Controller', function() {
expect(mock.then.calledOnce).to.be.true;
});
- it("loadStackDescriptorConfigs should be called", function() {
- c.set('isWithinAddService', false);
- c.getDescriptor();
- expect(c.loadStackDescriptorConfigs.calledOnce).to.be.true;
- });
-
it("then should be called, isWithinAddService is false", function() {
c.set('isWithinAddService', false);
c.getDescriptor();