This is an automated email from the ASF dual-hosted git repository.
atkach 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 22f6a50 AMBARI-24815 Add column to show which service recommended
changes during upgrade refer to
22f6a50 is described below
commit 22f6a504dee9d98eca3c5eb9fcc90bbe1d12f716
Author: Andrii Tkach <[email protected]>
AuthorDate: Tue Oct 23 12:55:53 2018 +0300
AMBARI-24815 Add column to show which service recommended changes during
upgrade refer to
---
.../main/admin/stack_and_upgrade_controller.js | 8 ++++++--
ambari-web/app/messages.js | 1 +
.../main/admin/stack_and_upgrade_controller_test.js | 17 ++++++++++++++---
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index e76fef0..98fc330 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1031,12 +1031,14 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
var configsMergeCheckData = Em.get(configsMergeWarning,
'UpgradeChecks.failed_detail');
if (configsMergeCheckData && Em.isArray(configsMergeCheckData)) {
configs = configsMergeCheckData.reduce(function (allConfigs, item) {
- var isDeprecated = Em.isNone(item.new_stack_value),
- willBeRemoved = Em.isNone(item.result_value);
+ const isDeprecated = Em.isNone(item.new_stack_value),
+ willBeRemoved = Em.isNone(item.result_value),
+ configInfo =
App.configsCollection.getConfigByName(item.property, item.type) || {};
return allConfigs.concat({
type: item.type,
name: item.property,
+ serviceName: configInfo.serviceName,
wasModified: (!isDeprecated && !willBeRemoved &&
Em.compare(item.current, item.result_value) === 0),
currentValue: item.current,
recommendedValue: isDeprecated ?
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.deprecated') :
item.new_stack_value,
@@ -2301,6 +2303,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
output += '<table style="text-align: left;"><thead><tr>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.configType') + '</th>' +
+ '<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.serviceName') + '</th>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.propertyName') + '</th>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.currentValue') + '</th>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.recommendedValue') + '</th>'
+
@@ -2310,6 +2313,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
configs.context.forEach(function (config) {
output += '<tr>' +
'<td>' + config.type + '</td>' +
+ '<td>' + App.format.role(config.serviceName) + '</td>' +
'<td>' + config.name + '</td>' +
'<td>' + config.currentValue + '</td>' +
'<td>' + config.recommendedValue + '</td>' +
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index e93c508..773b1aa 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -476,6 +476,7 @@ Em.I18n.translations = {
'popup.clusterCheck.Upgrade.configsMerge.alert': 'During upgrade, the
following configuration changes will be applied.',
'popup.clusterCheck.Upgrade.configsMerge.configType': 'Config Type',
'popup.clusterCheck.Upgrade.configsMerge.propertyName': 'Property Name',
+ 'popup.clusterCheck.Upgrade.configsMerge.serviceName': 'Service Name',
'popup.clusterCheck.Upgrade.configsMerge.currentValue': 'Current Value',
'popup.clusterCheck.Upgrade.configsMerge.recommendedValue': 'Recommended
Value',
'popup.clusterCheck.Upgrade.configsMerge.resultingValue': 'Resulting Value',
diff --git
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index cd67340..34f48c2 100644
---
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -579,9 +579,6 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
);
expect(controller.upgrade.callCount).to.equal(item.upgradeCalledCount);
expect(App.showClusterCheckPopup.callCount).to.equal(item.showClusterCheckPopupCalledCount);
- if (item.check.id === 'CONFIG_MERGE') {
-
expect(App.showClusterCheckPopup.firstCall.args[2]).to.eql(item.configs);
- }
});
});
});
@@ -2162,6 +2159,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 't0',
name: 'p0',
+ serviceName: 'HDFS',
currentValue: 'c0',
recommendedValue: 'n0',
isDeprecated: false,
@@ -2172,6 +2170,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 't1',
name: 'p1',
+ serviceName: 'HDFS',
currentValue: 'c1',
recommendedValue: 'n1',
isDeprecated: false,
@@ -2182,6 +2181,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 't2',
name: 'p2',
+ serviceName: 'HDFS',
currentValue: 'c2',
recommendedValue:
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.deprecated'),
isDeprecated: true,
@@ -2230,6 +2230,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 't0',
name: 'p0',
+ serviceName: 'HDFS',
currentValue: 'c0',
recommendedValue: 'n0',
isDeprecated: false,
@@ -2240,6 +2241,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 't1',
name: 'p1',
+ serviceName: 'HDFS',
currentValue: 'c1',
recommendedValue: 'n1',
isDeprecated: false,
@@ -2250,6 +2252,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 't2',
name: 'p2',
+ serviceName: 'HDFS',
currentValue: 'c2',
recommendedValue:
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.deprecated'),
isDeprecated: true,
@@ -2264,6 +2267,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
"recommendedValue": "c2",
"resultingValue": "c3",
"type": "t3",
+ serviceName: 'HDFS',
"wasModified": true,
"willBeRemoved": false
}
@@ -2274,7 +2278,9 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
cases.forEach(function (item) {
it(item.title, function () {
+ sinon.stub(App.configsCollection,
'getConfigByName').returns({serviceName: 'HDFS'});
expect(controller.getConfigsWarnings(item.configsMergeWarning)).to.eql(item.configs);
+ App.configsCollection.getConfigByName.restore();
});
});
@@ -2415,6 +2421,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 'type1',
name: 'name1',
+ serviceName: 'S1',
currentValue: 'currentValue1',
recommendedValue: 'recommendedValue1',
resultingValue: 'resultingValue1'
@@ -2422,6 +2429,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
{
type: 'type2',
name: 'name2',
+ serviceName: 'S2',
currentValue: 'currentValue2',
recommendedValue: 'recommendedValue2',
resultingValue: 'resultingValue2'
@@ -2444,6 +2452,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
/*eslint-disable no-useless-concat */
expect(mock.document.write.calledWith('<table style="text-align:
left;"><thead><tr>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.configType') + '</th>' +
+ '<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.serviceName') + '</th>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.propertyName') + '</th>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.currentValue') + '</th>' +
'<th>' +
Em.I18n.t('popup.clusterCheck.Upgrade.configsMerge.recommendedValue') + '</th>'
+
@@ -2451,6 +2460,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
'</tr></thead><tbody>' +
'<tr>' +
'<td>' + 'type1' + '</td>' +
+ '<td>' + 'S1' + '</td>' +
'<td>' + 'name1' + '</td>' +
'<td>' + 'currentValue1' + '</td>' +
'<td>' + 'recommendedValue1' + '</td>' +
@@ -2458,6 +2468,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
'</tr>' +
'<tr>' +
'<td>' + 'type2' + '</td>' +
+ '<td>' + 'S2' + '</td>' +
'<td>' + 'name2' + '</td>' +
'<td>' + 'currentValue2' + '</td>' +
'<td>' + 'recommendedValue2' + '</td>' +
