You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 21:13:21 UTC

svn commit: r1182037 - in /hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics: SchemaConfigured.java SchemaMetrics.java

Author: nspiegelberg
Date: Tue Oct 11 19:13:20 2011
New Revision: 1182037

URL: http://svn.apache.org/viewvc?rev=1182037&view=rev
Log:
Disable show table metrics in bulk loader

Summary:
ODS team has run into this issue during build loader

Test Plan: going to run all the unit tests

Reviewers: mbautin, kannan, nspiegelberg

Reviewed By: nspiegelberg

CC: hbase@lists, hbase-eng@lists, ctaylor, vinodv, nspiegelberg

Differential Revision: 339634

Modified:
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java?rev=1182037&r1=1182036&r2=1182037&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java Tue Oct 11 19:13:20 2011
@@ -44,9 +44,7 @@ public class SchemaConfigured implements
 
   /** A helper constructor that configures the "use table name" flag. */
   private SchemaConfigured(Configuration conf) {
-    if (conf != null) {
       SchemaMetrics.configureGlobally(conf);
-    }
   }
 
   /**

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java?rev=1182037&r1=1182036&r2=1182037&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java Tue Oct 11 19:13:20 2011
@@ -473,9 +473,13 @@ public class SchemaMetrics {
    * instantiating HFile readers/writers.
    */
   public static void configureGlobally(Configuration conf) {
-    final boolean useTableNameNew =
-        conf.getBoolean(SHOW_TABLE_NAME_CONF_KEY, false);
-    setUseTableName(useTableNameNew);
+    if (conf != null) {
+      final boolean useTableNameNew =
+          conf.getBoolean(SHOW_TABLE_NAME_CONF_KEY, false);
+      setUseTableName(useTableNameNew);
+    } else {
+      setUseTableName(false);
+    }
   }
 
   /**