Repository: hbase Updated Branches: refs/heads/branch-1 61e2566c1 -> 17fd03ea8
HBASE-14781 Turn per cf flushing on for ITBLL by default Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/17fd03ea Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/17fd03ea Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/17fd03ea Branch: refs/heads/branch-1 Commit: 17fd03ea8dfa74c181ec5ba47aece501a562b862 Parents: 61e2566 Author: Elliott Clark <[email protected]> Authored: Fri Nov 6 12:11:47 2015 -0800 Committer: Elliott Clark <[email protected]> Committed: Sat Nov 7 11:50:09 2015 -0800 ---------------------------------------------------------------------- .../test/IntegrationTestBigLinkedList.java | 24 ++++++-------------- 1 file changed, 7 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/17fd03ea/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java index d23da64..7f0f732 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java @@ -405,8 +405,7 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { if (this.numNodes < this.wrap) { this.wrap = this.numNodes; } - this.multipleUnevenColumnFamilies = - context.getConfiguration().getBoolean(MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY, false); + this.multipleUnevenColumnFamilies = isMultiUnevenColumnFamilies(context.getConfiguration()); } protected void instantiateHTable() throws IOException { @@ -605,11 +604,6 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { job.setOutputFormatClass(NullOutputFormat.class); job.getConfiguration().setBoolean("mapreduce.map.speculative", false); - String multipleUnevenColumnFamiliesStr = System.getProperty(MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY); - if (multipleUnevenColumnFamiliesStr != null) { - job.getConfiguration().setBoolean(MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY, - Boolean.parseBoolean(multipleUnevenColumnFamiliesStr)); - } TableMapReduceUtil.addDependencyJars(job); TableMapReduceUtil.addDependencyJars(job.getConfiguration(), AbstractHBaseTool.class); TableMapReduceUtil.initCredentials(job); @@ -820,9 +814,7 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { protected void setup( Mapper<ImmutableBytesWritable, Result, BytesWritable, BytesWritable>.Context context) throws IOException, InterruptedException { - this.multipleUnevenColumnFamilies = - context.getConfiguration().getBoolean(Generator.MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY, - false); + this.multipleUnevenColumnFamilies = isMultiUnevenColumnFamilies(context.getConfiguration()); } @Override @@ -1091,10 +1083,9 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { scan.addColumn(FAMILY_NAME, COLUMN_PREV); scan.setCaching(10000); scan.setCacheBlocks(false); - if (isMultiUnevenColumnFamilies()) { + if (isMultiUnevenColumnFamilies(getConf())) { scan.addColumn(BIG_FAMILY_NAME, BIG_FAMILY_NAME); scan.addColumn(TINY_FAMILY_NAME, TINY_FAMILY_NAME); - job.getConfiguration().setBoolean(Generator.MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY, true); } TableMapReduceUtil.initTableMapperJob(getTableName(getConf()).getName(), scan, @@ -1571,16 +1562,15 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { } } - private static boolean isMultiUnevenColumnFamilies() { - return Boolean.TRUE.toString().equalsIgnoreCase( - System.getProperty(Generator.MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY)); + private static boolean isMultiUnevenColumnFamilies(Configuration conf) { + return conf.getBoolean(Generator.MULTIPLE_UNEVEN_COLUMNFAMILIES_KEY,true); } @Test public void testContinuousIngest() throws IOException, Exception { //Loop <num iterations> <num mappers> <num nodes per mapper> <output dir> <num reducers> Configuration conf = getTestingUtil(getConf()).getConfiguration(); - if (isMultiUnevenColumnFamilies()) { + if (isMultiUnevenColumnFamilies(getConf())) { // make sure per CF flush is on conf.set(FlushPolicyFactory.HBASE_FLUSH_POLICY_KEY, FlushLargeStoresPolicy.class.getName()); } @@ -1665,7 +1655,7 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase { @Override protected Set<String> getColumnFamilies() { - if (isMultiUnevenColumnFamilies()) { + if (isMultiUnevenColumnFamilies(getConf())) { return Sets.newHashSet(Bytes.toString(FAMILY_NAME), Bytes.toString(BIG_FAMILY_NAME), Bytes.toString(TINY_FAMILY_NAME)); } else {
