Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4802 Disable show table metrics in bulk loader 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1391206 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-09-27 20:45:00 +00:00
parent dd10bfe8a7
commit 58af0ecb42
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java
View File

@ -76,12 +76,10 @@ public class SchemaConfigured implements HeapSize, SchemaAware {
/** A helper constructor that configures the "use table name" flag. */
private SchemaConfigured(Configuration conf) {
if (conf != null) {
SchemaMetrics.configureGlobally(conf);
// Even though we now know if table-level metrics are used, we can't
// initialize schemaMetrics yet, because CF and table name are only known
// to the calling constructor.
}
SchemaMetrics.configureGlobally(conf);
// Even though we now know if table-level metrics are used, we can't
// initialize schemaMetrics yet, because CF and table name are only known
// to the calling constructor.
}
/**

10
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
View File

@ -522,9 +522,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);
}
}
/**