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

HBASE-12899 HBase should prefix htrace configuration keys with "hbase.htrace" rather than just "hbase." (Colin Patrick McCabe)

Browse Source
This commit is contained in:
Enis Soztutar 2015-01-22 19:04:35 -08:00
parent 71ab4ddb19
commit 38701ea8ec
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hbase-common/src/main/java/org/apache/hadoop/hbase/trace/HBaseHTraceConfiguration.java
View File

@ -21,15 +21,46 @@ package org.apache.hadoop.hbase.trace;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.htrace.HTraceConfiguration; import org.apache.htrace.HTraceConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@InterfaceAudience.Private @InterfaceAudience.Private
public class HBaseHTraceConfiguration extends HTraceConfiguration { public class HBaseHTraceConfiguration extends HTraceConfiguration {
private static final Log LOG =
LogFactory.getLog(HBaseHTraceConfiguration.class);
public static final String KEY_PREFIX = "hbase.htrace.";
public static final String KEY_PREFIX = "hbase.";
private Configuration conf; private Configuration conf;
private void handleDeprecation(String key) {
String oldKey = "hbase." + key;
String newKey = KEY_PREFIX + key;
String oldValue = conf.get(oldKey);
if (oldValue != null) {
LOG.warn("Warning: using deprecated configuration key " + oldKey +
". Please use " + newKey + " instead.");
String newValue = conf.get(newKey);
if (newValue == null) {
conf.set(newKey, oldValue);
} else {
LOG.warn("Conflicting values for " + newKey + " and " + oldKey +
". Using " + newValue);
}
}
}
public HBaseHTraceConfiguration(Configuration conf) { public HBaseHTraceConfiguration(Configuration conf) {
this.conf = conf; this.conf = conf;
handleDeprecation("local-file-span-receiver.path");
handleDeprecation("local-file-span-receiver.capacity");
handleDeprecation("sampler.frequency");
handleDeprecation("sampler.fraction");
handleDeprecation("zipkin.collector-hostname");
handleDeprecation("zipkin.collector-port");
handleDeprecation("zipkin.num-threads");
handleDeprecation("zipkin.traced-service-hostname");
handleDeprecation("zipkin.traced-service-port");
} }
@Override @Override