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/03/10 12:13:19 UTC
ambari git commit: AMBARI-15367. Remove experimental flags for
stackUpgrade, enhancedConfigs, and storeKDCCredentials (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 662679619 -> e4544a575
AMBARI-15367. Remove experimental flags for stackUpgrade, enhancedConfigs, and storeKDCCredentials (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4544a57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4544a57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4544a57
Branch: refs/heads/trunk
Commit: e4544a575a39c25a20bc91822f9befd0ed865d1a
Parents: 6626796
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Mar 10 10:41:41 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Mar 10 13:13:14 2016 +0200
----------------------------------------------------------------------
ambari-web/app/app.js | 3 +-
ambari-web/app/config.js | 3 --
.../controllers/global/cluster_controller.js | 25 +-----------
.../app/controllers/global/update_controller.js | 2 +-
.../main/admin/kerberos/step2_controller.js | 4 +-
ambari-web/app/mappers/hosts_mapper.js | 41 ++++++++------------
.../common/modal_popups/invalid_KDC_popup.hbs | 16 ++++----
.../app/templates/main/admin/kerberos.hbs | 6 +--
ambari-web/app/templates/main/host.hbs | 6 +--
ambari-web/app/templates/main/host/summary.hbs | 6 +--
ambari-web/app/views/main/host.js | 4 --
ambari-web/app/views/main/host/menu.js | 4 +-
.../global/cluster_controller_test.js | 22 +----------
ambari-web/test/views/main/host/menu_test.js | 17 +-------
14 files changed, 40 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 52f34ab..ab189f8 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -194,10 +194,9 @@ module.exports = Em.Application.create({
/**
* when working with enhanced configs we should rely on stack version
* as version that is below 2.2 doesn't supports it
- * even if flag <code>supports.enhancedConfigs<code> is true
* @type {boolean}
*/
- isClusterSupportsEnhancedConfigs: Em.computed.and('isHadoop22Stack', 'supports.enhancedConfigs'),
+ isClusterSupportsEnhancedConfigs: Em.computed.alias('isHadoop22Stack'),
/**
* If NameNode High Availability is enabled
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index cba09d7..92ba8ae 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -65,7 +65,6 @@ App.enableExperimental = false;
App.supports = {
preUpgradeCheck: true,
- stackUpgrade: true,
displayOlderVersions: false,
autoRollbackHA: false,
alwaysEnableManagedMySQLForHive: false,
@@ -74,10 +73,8 @@ App.supports = {
installGanglia: false,
opsDuringRollingUpgrade: false,
customizedWidgetLayout: false,
- enhancedConfigs: true,
showPageLoadTime: false,
skipComponentStartAfterInstall: false,
- storeKDCCredentials: true,
preInstallChecks: false,
hostComboSearchBox: true,
serviceAutoStart: false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index 3c28e80..327bd45 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -202,9 +202,7 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
});
- if (App.get('supports.stackUpgrade')) {
- self.restoreUpgradeState();
- }
+ self.restoreUpgradeState();
App.router.get('wizardWatcherController').getUser();
@@ -424,26 +422,7 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, {
* @returns {$.ajax}
*/
createKerberosAdminSession: function (credentialResource, ajaxOpt) {
- if (App.get('supports.storeKDCCredentials')) {
- return credentialUtils.createOrUpdateCredentials(App.get('clusterName'), credentialUtils.ALIAS.KDC_CREDENTIALS, credentialResource).then(function() {
- if (ajaxOpt) {
- $.ajax(ajaxOpt);
- }
- });
- }
-
- return App.ajax.send({
- name: 'common.cluster.update',
- sender: this,
- data: {
- clusterName: App.get('clusterName'),
- data: [{
- session_attributes: {
- kerberos_admin: {principal: credentialResource.principal, password: credentialResource.key}
- }
- }]
- }
- }).success(function () {
+ return credentialUtils.createOrUpdateCredentials(App.get('clusterName'), credentialUtils.ALIAS.KDC_CREDENTIALS, credentialResource).then(function() {
if (ajaxOpt) {
$.ajax(ajaxOpt);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index de4523b..5fb69f3 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -260,7 +260,7 @@ App.UpdateController = Em.Controller.extend({
}
}
- realUrl = realUrl.replace("<stackVersions>", App.get('supports.stackUpgrade') ? stackVersionInfo : "");
+ realUrl = realUrl.replace("<stackVersions>", stackVersionInfo);
realUrl = realUrl.replace("<metrics>", lazyLoadMetrics ? "" : "metrics/disk,metrics/load/load_one,");
realUrl = realUrl.replace('<hostDetailsParams>', hostDetailsParams);
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index 9b411c6..36fb227 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -92,7 +92,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
}));
this.filterConfigs(this.get('configs'));
- if (App.get('supports.storeKDCCredentials') && !this.get('wizardController.skipClientInstall')) {
+ if (!this.get('wizardController.skipClientInstall')) {
this.initilizeKDCStoreProperties(this.get('configs'));
}
this.applyServicesConfigs(this.get('configs'));
@@ -249,7 +249,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
*/
createKerberosAdminSession: function (configs) {
configs = configs || this.get('stepConfigs')[0].get('configs');
- if (App.get('supports.storeKDCCredentials') && !this.get('wizardController.skipClientInstall')) {
+ if (!this.get('wizardController.skipClientInstall')) {
return this.createKDCCredentials(configs);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/mappers/hosts_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js
index d54c988..3eb99bf 100644
--- a/ambari-web/app/mappers/hosts_mapper.js
+++ b/ambari-web/app/mappers/hosts_mapper.js
@@ -92,7 +92,6 @@ App.hostsMapper = App.QuickDataMapper.create({
var currentServiceComponentsMap = App.get('componentConfigMapper').buildServiceComponentMap(cacheServices);
var newHostComponentsMap = {};
var selectedHosts = App.db.getSelectedHosts('mainHostController');
- var stackUpgradeSupport = App.get('supports.stackUpgrade');
var clusterName = App.get('clusterName');
var advancedHostComponents = [];
@@ -146,17 +145,15 @@ App.hostsMapper = App.QuickDataMapper.create({
}
}
- if (stackUpgradeSupport) {
- var currentVersion = item.stack_versions.findProperty('HostStackVersions.state', 'CURRENT');
- var currentVersionNumber = currentVersion && currentVersion.repository_versions
- ? Em.get(currentVersion.repository_versions[0], 'RepositoryVersions.repository_version') : '';
- for (var j = 0; j < item.stack_versions.length; j++) {
- var stackVersion = item.stack_versions[j];
- stackVersion.host_name = item.Hosts.host_name;
- stackVersion.is_visible = stringUtils.compareVersions(Em.get(stackVersion.repository_versions[0], 'RepositoryVersions.repository_version'), currentVersionNumber) >= 0
- || App.get('supports.displayOlderVersions') || !currentVersionNumber;
- stackVersions.push(this.parseIt(stackVersion, this.stackVersionConfig));
- }
+ var currentVersion = item.stack_versions.findProperty('HostStackVersions.state', 'CURRENT');
+ var currentVersionNumber = currentVersion && currentVersion.repository_versions
+ ? Em.get(currentVersion.repository_versions[0], 'RepositoryVersions.repository_version') : '';
+ for (var j = 0; j < item.stack_versions.length; j++) {
+ var stackVersion = item.stack_versions[j];
+ stackVersion.host_name = item.Hosts.host_name;
+ stackVersion.is_visible = stringUtils.compareVersions(Em.get(stackVersion.repository_versions[0], 'RepositoryVersions.repository_version'), currentVersionNumber) >= 0
+ || App.get('supports.displayOlderVersions') || !currentVersionNumber;
+ stackVersions.push(this.parseIt(stackVersion, this.stackVersionConfig));
}
var alertsSummary = item.alerts_summary;
@@ -166,15 +163,13 @@ App.hostsMapper = App.QuickDataMapper.create({
// There is no need to override existing index in host detail view since old model(already have indexes) will not be cleared.
item.index = (existingHost && !json.itemTotal)? existingHost.get('index'): index;
- if (stackUpgradeSupport) {
- this.config = $.extend(this.config, {
- stack_versions_key: 'stack_versions',
- stack_versions_type: 'array',
- stack_versions: {
- item: 'HostStackVersions.id'
- }
- })
- }
+ this.config = $.extend(this.config, {
+ stack_versions_key: 'stack_versions',
+ stack_versions_type: 'array',
+ stack_versions: {
+ item: 'HostStackVersions.id'
+ }
+ });
var parsedItem = this.parseIt(item, this.config);
parsedItem.is_requested = true;
parsedItem.last_heart_beat_time = App.dateTimeWithTimeZone(parsedItem.last_heart_beat_time);
@@ -199,9 +194,7 @@ App.hostsMapper = App.QuickDataMapper.create({
}
App.store.commit();
- if (stackUpgradeSupport) {
- App.store.loadMany(App.HostStackVersion, stackVersions);
- }
+ App.store.loadMany(App.HostStackVersion, stackVersions);
App.store.loadMany(App.HostComponent, components);
//"itemTotal" present only for Hosts page request
if (!Em.isNone(json.itemTotal)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs b/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
index 8c9142b..722e578 100644
--- a/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs
@@ -35,15 +35,13 @@
<div class="control-group">
<span class="control-label"></span>
<div class="controls ">
- {{#if App.supports.storeKDCCredentials}}
- <label>
- {{view Ember.Checkbox checkedBinding="view.parentView.storeCredentials" disabledBinding="view.parentView.checkboxDisabled" classNames="pull-left"}}
- <span {{bindAttr class=":mls view.parentView.checkboxDisabled:muted"}}>
- {{t admin.kerberos.credentials.store.label}}
- <a class="icon-question-sign icon-blue" rel="tooltip" href="javascript:void(null);" data-toggle="tooltip" {{bindAttr data-original-title="view.parentView.hintMessage"}}><a/>
- </span>
- </label>
- {{/if}}
+ <label>
+ {{view Ember.Checkbox checkedBinding="view.parentView.storeCredentials" disabledBinding="view.parentView.checkboxDisabled" classNames="pull-left"}}
+ <span {{bindAttr class=":mls view.parentView.checkboxDisabled:muted"}}>
+ {{t admin.kerberos.credentials.store.label}}
+ <a class="icon-question-sign icon-blue" rel="tooltip" href="javascript:void(null);" data-toggle="tooltip" {{bindAttr data-original-title="view.parentView.hintMessage"}}></a>
+ </span>
+ </label>
</div>
</div>
</form>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/templates/main/admin/kerberos.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs
index c1d859f..1e3be1a 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -24,10 +24,8 @@
{{#unless isManualKerberos}}
<button class="btn btn-success" id="regenerate-keytabs" {{bindAttr disabled="isKerberosButtonsDisabled"}} {{action regenerateKeytabs target="controller"}}>
<i class="icon-repeat"></i> {{t admin.kerberos.button.regenerateKeytabs}}</button>
- {{#if App.supports.storeKDCCredentials}}
- {{#if App.isCredentialStorePersistent}}
- <button class="btn btn-primary" {{action showManageKDCCredentialsPopup target="controller"}}>{{t admin.kerberos.credentials.store.menu.label}}</button>
- {{/if}}
+ {{#if App.isCredentialStorePersistent}}
+ <button class="btn btn-primary" {{action showManageKDCCredentialsPopup target="controller"}}>{{t admin.kerberos.credentials.store.menu.label}}</button>
{{/if}}
{{/unless}}
<br/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/templates/main/host.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs
index 233ff07..38f1b9a 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -40,7 +40,7 @@
{{view view.parentView.memorySort}}
{{view view.parentView.diskUsageSort}}
{{view view.parentView.loadAvgSort}}
- <th {{bindAttr class="App.supports.stackUpgrade::hidden App.stackVersionsAvailable::hidden :sort-view-11"}}>
+ <th {{bindAttr class="App.stackVersionsAvailable::hidden :sort-view-11"}}>
{{t hosts.host.menu.stackVersions}}
</th>
<th class="sort-view-6">{{t common.components}}</th>
@@ -91,7 +91,7 @@
</td>
<td class="load-avg">{{host.loadAvg}}</td>
- <td {{bindAttr class="App.supports.stackUpgrade::hidden App.stackVersionsAvailable::hidden view.hasSingleVersion:not-active-link :host-table-versions"}}>
+ <td {{bindAttr class="App.stackVersionsAvailable::hidden view.hasSingleVersion:not-active-link :host-table-versions"}}>
<a href="#" class="black" {{action displayVersions target="view"}}>
{{view.currentVersion}}
</a>
@@ -106,7 +106,7 @@
{{else}}
<tr>
<td class="first"></td>
- <td {{bindAttr colspan="view.colspan"}}>
+ <td colspan="12">
{{t hosts.table.noHosts}}
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/templates/main/host/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs
index 17a0b69..11b4861 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -159,10 +159,8 @@
<dt class="summary-agent-heart-label">{{t hosts.host.summary.agentHeartbeat}}:</dt>
<dd class="summary-agent-heart-value"> {{view.timeSinceHeartBeat}}</dd>
- {{#if App.supports.stackUpgrade}}
- <dt class="summary-cur-ver-label">{{t hosts.host.summary.currentVersion}}:</dt>
- <dd class="summary-cur-ver-value"> {{view.content.currentVersion}}</dd>
- {{/if}}
+ <dt class="summary-cur-ver-label">{{t hosts.host.summary.currentVersion}}:</dt>
+ <dd class="summary-cur-ver-value"> {{view.content.currentVersion}}</dd>
</dl>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index e38685c..5f337da 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -44,10 +44,6 @@ App.MainHostView = App.TableView.extend(App.TableServerViewMixin, {
*/
requestError: null,
- colspan: function () {
- return 11 + +App.get('supports.stackUpgrade');
- }.property("App.supports.stackUpgrade"),
-
/**
* List of hosts in cluster
* @type {Array}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/app/views/main/host/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/menu.js b/ambari-web/app/views/main/host/menu.js
index 5540014..d45d930 100644
--- a/ambari-web/app/views/main/host/menu.js
+++ b/ambari-web/app/views/main/host/menu.js
@@ -49,9 +49,7 @@ App.MainHostMenuView = Em.CollectionView.extend({
name: 'versions',
label: Em.I18n.t('hosts.host.menu.stackVersions'),
routing: 'stackVersions',
- hidden: function () {
- return !App.get('supports.stackUpgrade') || !App.get('stackVersionsAvailable')
- }.property('App.supports.stackUpgrade'),
+ hidden: !App.get('stackVersionsAvailable'),
id: 'host-details-summary-version'
}),
Em.Object.create({
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/test/controllers/global/cluster_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/global/cluster_controller_test.js b/ambari-web/test/controllers/global/cluster_controller_test.js
index d2c6876..2bf4ab4 100644
--- a/ambari-web/test/controllers/global/cluster_controller_test.js
+++ b/ambari-web/test/controllers/global/cluster_controller_test.js
@@ -212,27 +212,7 @@ describe('App.clusterController', function () {
App.get.restore();
});
- it("KDC Store supports disabled, credentials updated via kdc session call", function() {
- this.stub.withArgs('supports.storeKDCCredentials').returns(false);
- controller.createKerberosAdminSession({
- principal: 'admin',
- key: 'pass',
- type: 'persistent'
- }, {});
- var args = testHelpers.findAjaxRequest('name', 'common.cluster.update');
- expect(args[0]).to.exists;
- expect(args[0].sender).to.be.eql(controller);
- expect(args[0].data).to.be.eql({
- clusterName: 'test',
- data: [{
- session_attributes: {
- kerberos_admin: {principal: "admin", password: "pass"}
- }
- }]
- });
- });
- it("KDC Store supports enabled, credentials updated via credentials storage call", function() {
- this.stub.withArgs('supports.storeKDCCredentials').returns(true);
+ it("credentials updated via credentials storage call", function() {
controller.createKerberosAdminSession({
principal: 'admin',
key: 'pass',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4544a57/ambari-web/test/views/main/host/menu_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/menu_test.js b/ambari-web/test/views/main/host/menu_test.js
index 520314d..f9636d8 100644
--- a/ambari-web/test/views/main/host/menu_test.js
+++ b/ambari-web/test/views/main/host/menu_test.js
@@ -38,32 +38,17 @@ describe('App.MainHostMenuView', function () {
Em.A([
{
stackVersionsAvailable: true,
- stackUpgrade: true,
m: '`versions` is visible',
e: false
},
{
- stackVersionsAvailable: true,
- stackUpgrade: false,
- m: '`versions` is invisible (1)',
- e: true
- },
- {
- stackVersionsAvailable: false,
- stackUpgrade: true,
- m: '`versions` is invisible (2)',
- e: true
- },
- {
stackVersionsAvailable: false,
- stackUpgrade: false,
- m: '`versions` is invisible (3)',
+ m: '`versions` is invisible',
e: true
}
]).forEach(function (test) {
it(test.m, function () {
this.mock.withArgs('stackVersionsAvailable').returns(test.stackVersionsAvailable);
- this.mock.withArgs('supports.stackUpgrade').returns(test.stackUpgrade);
view.propertyDidChange('content');
expect(view.get('content').findProperty('name', 'versions').get('hidden')).to.equal(test.e);
});