Sfoglia il codice sorgente

AMBARI-11354. Couple of HBase configs to be renamed and unit display corrected (srimanth)

Srimanth Gunturi 10 anni fa
parent
commit
17e2bdcb1c

+ 1 - 1
ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml

@@ -166,7 +166,7 @@
     <description>
     <description>
       The size of an individual memstore. Each column familiy within each region is allocated its own memstore.
       The size of an individual memstore. Each column familiy within each region is allocated its own memstore.
     </description>
     </description>
-    <display-name>Per-Column Family Memstore Flush Size</display-name>
+    <display-name>Memstore Flush Size</display-name>
     <value-attributes>
     <value-attributes>
       <type>int</type>
       <type>int</type>
       <minimum>33554432</minimum>
       <minimum>33554432</minimum>

+ 1 - 1
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
       complete. Setting it larger means that more StoreFiles are included in a compaction. For most
       cases, the default value is appropriate.
       cases, the default value is appropriate.
     </description>
     </description>
-    <display-name>Maximum Files in a Store before Compaction</display-name>
+    <display-name>Maximum Files for Compaction</display-name>
     <value-attributes>
     <value-attributes>
       <type>int</type>
       <type>int</type>
       <entries>
       <entries>

+ 1 - 1
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
       complete. Setting it larger means that more StoreFiles are included in a compaction. For most
       cases, the default value is appropriate.
       cases, the default value is appropriate.
     </description>
     </description>
-    <display-name>Maximum Files in a Store before Compaction</display-name>
+    <display-name>Maximum Files for Compaction</display-name>
     <value-attributes>
     <value-attributes>
       <type>int</type>
       <type>int</type>
       <entries>
       <entries>

+ 1 - 1
ambari-web/app/templates/common/configs/widgets/plain_config_text_field.hbs

@@ -18,5 +18,5 @@
 
 
 <div class="input-append">
 <div class="input-append">
   {{view Em.TextField valueBinding="view.value" class="span9" placeholderBinding="view.placeholder" disabledBinding="view.disabled"}}
   {{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>
 </div>

+ 9 - 0
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',
   valueBinding: 'serviceConfig.value',
   classNames: ['widget-config-plain-text-field'],
   classNames: ['widget-config-plain-text-field'],
   placeholderBinding: 'serviceConfig.savedValue',
   placeholderBinding: 'serviceConfig.savedValue',
+
   unit: function() {
   unit: function() {
     return Em.getWithDefault(this, 'serviceConfig.stackConfigProperty.valueAttributes.unit', false);
     return Em.getWithDefault(this, 'serviceConfig.stackConfigProperty.valueAttributes.unit', false);
   }.property('serviceConfig.stackConfigProperty.valueAttributes.unit'),
   }.property('serviceConfig.stackConfigProperty.valueAttributes.unit'),
 
 
+  displayUnit: function() {
+    var unit = this.get('unit');
+    if ('milliseconds' == unit) {
+      unit = 'ms';
+    }
+    return unit;
+  }.property('unit'),
+
   focusOut: function () {
   focusOut: function () {
     this.sendRequestRorDependentConfigs(this.get('serviceConfig'));
     this.sendRequestRorDependentConfigs(this.get('serviceConfig'));
   },
   },