You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jg...@apache.org on 2018/05/25 17:35:18 UTC
[ambari] branch branch-feature-AMBARI-14714 updated: Restored
missing data to config recommend request.
This is an automated email from the ASF dual-hosted git repository.
jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by this push:
new 1868c4c Restored missing data to config recommend request.
1868c4c is described below
commit 1868c4c677c176648fcfa12da460071b863be49f
Author: Jason Golieb <jg...@hortonworks.com>
AuthorDate: Wed May 23 16:52:45 2018 -0400
Restored missing data to config recommend request.
---
.../app/mixins/common/configs/enhanced_configs.js | 26 ++++++-------------
.../hosts/host_component_recommendation_mixin.js | 30 ++++++++--------------
.../app/mixins/wizard/assign_master_components.js | 4 +--
ambari-web/app/utils/ajax/ajax.js | 28 +-------------------
4 files changed, 21 insertions(+), 67 deletions(-)
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 51b5e11..92d1012 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -297,34 +297,23 @@ App.EnhancedConfigsMixin = Em.Mixin.create(App.ConfigWithOverrideRecommendationP
return params;
},
- /**
- * Get the url to use to request the correct stack version from stack advisor.
- * Falls back to using the old global config value if necessary.
- *
- * @param {object} options Should include stackName and stackVersion properties, which should refer to the mpack being installed.
- */
- getStackVersionUrl: function getStackVersionUrl(options) {
- if (options.stackName && options.stackVersion) {
- return '/stacks/' + options.stackName + '/versions/' + options.stackVersion;
- }
-
- return App.get('stackVersionURL');
- },
-
getRecommendationsRequest: function (dataToSend, callback) {
- var self = this;
+ const self = this;
this.set('recommendationsInProgress', true);
+ const stackVersionUrl = App.getStackVersionUrl(dataToSend.stackName, dataToSend.stackVersion) || App.get('stackVersionURL');
+
return App.ajax.send({
name: 'config.recommendations',
sender: self,
data: {
- stackVersionUrl: this.getStackVersionUrl(dataToSend),
- //exclude stackName and stackVersion from dataToSend
+ stackVersionUrl: stackVersionUrl,
dataToSend: {
recommend: dataToSend.recommend,
hosts: dataToSend.hosts,
services: dataToSend.services,
- changed_configurations: dataToSend.changed_configurations
+ changed_configurations: dataToSend.changed_configurations,
+ user_context: dataToSend.user_context,
+ recommendations: dataToSend.recommendations
}
},
success: 'loadRecommendationsSuccess',
@@ -332,6 +321,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create(App.ConfigWithOverrideRecommendationP
callback: function () {
self.set('recommendationsInProgress', false);
self.set('recommendationTimeStamp', (new Date).getTime());
+
if (callback) {
callback()
}
diff --git a/ambari-web/app/mixins/common/hosts/host_component_recommendation_mixin.js b/ambari-web/app/mixins/common/hosts/host_component_recommendation_mixin.js
index 0c6113d..e0cbb3f 100644
--- a/ambari-web/app/mixins/common/hosts/host_component_recommendation_mixin.js
+++ b/ambari-web/app/mixins/common/hosts/host_component_recommendation_mixin.js
@@ -91,32 +91,22 @@ App.HostComponentRecommendationMixin = Em.Mixin.create(App.BlueprintMixin, {
},
/**
- * Get the url to use to request the correct stack version from stack advisor.
- * Falls back to using the old global config value if necessary.
- *
- * @param {object} options Should include stackName and stackVersion properties, which should refer to the mpack being installed.
- */
- getStackVersionUrl(options) {
- if (options.stackName && options.stackVersion) {
- return '/stacks/' + options.stackName + '/versions/' + options.stackVersion;
- }
-
- return App.get('stackVersionURL');
- },
-
- /**
* Returns request data for recommendation request
* @param {HostComponentRecommendationOptions} options
* @return {HostRecommendationRequestData}
* @method getRecommendationRequestData
*/
getRecommendationRequestData: function(options) {
+ const stackVersionUrl = App.getStackVersionUrl(options.stackName, options.stackVersion) || App.get('stackVersionURL');
+
return {
- recommend: 'host_groups',
- stackVersionUrl: this.getStackVersionUrl(options),
- hosts: options.hosts,
- services: options.services,
- recommendations: options.blueprint || this.getComponentsBlueprint(options.components)
+ stackVersionUrl: stackVersionUrl,
+ dataToSend: {
+ recommend: 'host_groups',
+ hosts: options.hosts,
+ services: options.services,
+ recommendations: options.blueprint || this.getComponentsBlueprint(options.components)
+ }
};
},
@@ -128,7 +118,7 @@ App.HostComponentRecommendationMixin = Em.Mixin.create(App.BlueprintMixin, {
*/
loadComponentsRecommendationsFromServer: function(recommendationData) {
return App.ajax.send({
- name: 'wizard.loadrecommendations',
+ name: 'config.recommendations',
sender: this,
data: recommendationData,
success: 'loadRecommendationsSuccessCallback',
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js
index 35ede31..d0b4bd9 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -465,9 +465,9 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin, A
*/
getRecommendationRequestData: function(options) {
var res = this._super(options);
- res.services = this.getCurrentServiceNames();
+ res.dataToSend.services = this.getCurrentServiceNames();
if (!this.get('isInstallerWizard')) {
- res.recommendations = this.getCurrentMasterSlaveBlueprint();
+ res.dataToSend.recommendations = this.getCurrentMasterSlaveBlueprint();
}
return res;
},
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 9223787..80f35db 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2134,34 +2134,9 @@ var urls = {
}
},
-
- 'wizard.loadrecommendations': {
- 'real': '{stackVersionUrl}/recommendations',
- 'mock': '/data/stacks/HDP-2.1/recommendations.json',
- 'type': 'POST',
- 'format': function (data) {
- var q = {
- hosts: data.hosts,
- services: data.services,
- recommend: data.recommend
- };
-
- if (data.recommendations) {
- q.recommendations = data.recommendations;
- }
-
- return {
- data: JSON.stringify(q)
- }
- }
- },
-
-
- // TODO: merge with wizard.loadrecommendations query
'config.recommendations': {
'real': '{stackVersionUrl}/recommendations',
- 'mock': '/data/configurations/recommendations/configuration_dependencies.json',
- //'mock': '/data/stacks/HDP-2.1/recommendations_configs.json',
+ 'mock': '/data/stacks/HDP-2.1/recommendations.json',
'type': 'POST',
'format': function (data) {
return {
@@ -2186,7 +2161,6 @@ var urls = {
}
},
-
'preinstalled.checks': {
'real': '/requests',
'mock': '',
--
To stop receiving notification emails like this one, please contact
jgolieb@apache.org.