Repository: ambari Updated Branches: refs/heads/trunk d538f38e7 -> 17e2bdcb1
AMBARI-11354. Couple of HBase configs to be renamed and unit display corrected (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/17e2bdcb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17e2bdcb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17e2bdcb Branch: refs/heads/trunk Commit: 17e2bdcb1c74b11cbacea9bdb1ecc6d023aa57f4 Parents: d538f38 Author: Srimanth Gunturi <[email protected]> Authored: Fri May 22 15:04:09 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Fri May 22 15:04:17 2015 -0700 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/configuration/hbase-site.xml | 2 +- .../HDP/2.2/services/HBASE/configuration/hbase-site.xml | 2 +- .../HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml | 2 +- .../common/configs/widgets/plain_config_text_field.hbs | 2 +- .../views/common/configs/widgets/plain_config_text_field.js | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/17e2bdcb/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml index dd983a8..5848b68 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml @@ -166,7 +166,7 @@ <description> The size of an individual memstore. Each column familiy within each region is allocated its own memstore. </description> - <display-name>Per-Column Family Memstore Flush Size</display-name> + <display-name>Memstore Flush Size</display-name> <value-attributes> <type>int</type> <minimum>33554432</minimum> http://git-wip-us.apache.org/repos/asf/ambari/blob/17e2bdcb/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml index f1bee10..b46ccaa 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml @@ -166,7 +166,7 @@ complete. Setting it larger means that more StoreFiles are included in a compaction. For most cases, the default value is appropriate. </description> - <display-name>Maximum Files in a Store before Compaction</display-name> + <display-name>Maximum Files for Compaction</display-name> <value-attributes> <type>int</type> <entries> http://git-wip-us.apache.org/repos/asf/ambari/blob/17e2bdcb/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml index ed14770..dd1434a 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml @@ -79,7 +79,7 @@ complete. Setting it larger means that more StoreFiles are included in a compaction. For most cases, the default value is appropriate. </description> - <display-name>Maximum Files in a Store before Compaction</display-name> + <display-name>Maximum Files for Compaction</display-name> <value-attributes> <type>int</type> <entries> http://git-wip-us.apache.org/repos/asf/ambari/blob/17e2bdcb/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs b/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs index 95be496..c92eb2f 100644 --- a/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs +++ b/ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs @@ -18,5 +18,5 @@ <div class="input-append"> {{view Em.TextField valueBinding="view.value" class="span9" placeholderBinding="view.placeholder" disabledBinding="view.disabled"}} - <span {{bindAttr class=":add-on view.unit::hidden"}}>{{view.unit}}</span> + <span {{bindAttr class=":add-on view.unit::hidden"}}>{{view.displayUnit}}</span> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/17e2bdcb/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js index ba62dee..f4d0bb6 100644 --- a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js +++ b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js @@ -29,10 +29,19 @@ App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, { valueBinding: 'serviceConfig.value', classNames: ['widget-config-plain-text-field'], placeholderBinding: 'serviceConfig.savedValue', + unit: function() { return Em.getWithDefault(this, 'serviceConfig.stackConfigProperty.valueAttributes.unit', false); }.property('serviceConfig.stackConfigProperty.valueAttributes.unit'), + displayUnit: function() { + var unit = this.get('unit'); + if ('milliseconds' == unit) { + unit = 'ms'; + } + return unit; + }.property('unit'), + focusOut: function () { this.sendRequestRorDependentConfigs(this.get('serviceConfig')); },
