You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/12/03 03:43:14 UTC
[2/7] ambari git commit: AMBARI-19069. Remove 'llap_queue_capacity'
references from UI code. (jaimin)
AMBARI-19069. Remove 'llap_queue_capacity' references from UI code. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e465c0e7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e465c0e7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e465c0e7
Branch: refs/heads/branch-feature-AMBARI-18456
Commit: e465c0e7a667e8c411a1ff38480bddd49e01427c
Parents: 5901b95
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Dec 2 14:39:39 2016 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Dec 2 14:39:39 2016 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 -
.../app/models/configs/objects/service_config_property.js | 7 -------
.../views/common/configs/widgets/slider_config_widget_view.js | 7 ++-----
3 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e465c0e7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 90ad70f..090244c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3200,7 +3200,6 @@ Em.I18n.translations = {
'config.infoMessage.wrong.value.for.combobox.widget': '"{0}" is not available in the list of valid values',
'config.warnMessage.outOfBoundaries.greater': 'Values greater than {0} are not recommended',
'config.warnMessage.outOfBoundaries.less': 'Values smaller than {0} are not recommended',
- 'config.warnMessage.llap_queue_capacity.max': 'LLAP will consume entire Yarn queue',
'errorMessage.config.required': 'This is required',
'errorMessage.config.number.integer': 'Must contain digits only',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e465c0e7/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index 5d85ae0..4459946 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -358,13 +358,6 @@ App.ServiceConfigProperty = Em.Object.extend({
} else if ((typeof this.get('value') != 'object') && ((this.get('value') + '').length === 0)) {
var widgetType = this.get('widgetType');
this.set('errorMessage', (this.get('isRequired') && (!['test-db-connection','label'].contains(widgetType))) ? Em.I18n.t('errorMessage.config.required') : '');
- } else if (this.get('name') === 'llap_queue_capacity') {
- if (!isNaN(parseInt(this.get('value'), 10)) && parseInt(this.get('value'), 10) === 100) {
- this.set('warnMessage', Em.I18n.t('config.warnMessage.llap_queue_capacity.max'));
- } else {
- this.set('warnMessage', '');
- this.set('errorMessage', this.validateErrors(this.get('value'), this.get('name'), this.get('retypedPassword')));
- }
} else {
this.set('errorMessage', this.validateErrors(this.get('value'), this.get('name'), this.get('retypedPassword')));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e465c0e7/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 71156f4..c7e810b 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -645,11 +645,8 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
return false;
}
}
- if (this.get('config.name') === 'llap_queue_capacity') {
- this.get('config').validate();
- } else {
- this.updateWarningsForCompatibilityWithWidget('');
- }
+
+ this.updateWarningsForCompatibilityWithWidget('');
return true;
}
return false;