Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E520F100F3 for ; Mon, 7 Oct 2013 21:11:59 +0000 (UTC) Received: (qmail 57870 invoked by uid 500); 7 Oct 2013 21:11:58 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 57839 invoked by uid 500); 7 Oct 2013 21:11:58 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 57832 invoked by uid 99); 7 Oct 2013 21:11:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 21:11:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 21:11:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5088B238890B; Mon, 7 Oct 2013 21:11:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530065 - /hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java Date: Mon, 07 Oct 2013 21:11:37 -0000 To: commits@hbase.apache.org From: sershe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131007211137.5088B238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sershe Date: Mon Oct 7 21:11:36 2013 New Revision: 1530065 URL: http://svn.apache.org/r1530065 Log: HBASE-9714 add scan logging to IntegrationTestLoadAndVerify Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java?rev=1530065&r1=1530064&r2=1530065&view=diff ============================================================================== --- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java (original) +++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java Mon Oct 7 21:11:36 2013 @@ -47,10 +47,12 @@ import org.apache.hadoop.hbase.client.HT import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.client.ScannerCallable; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.mapreduce.NMapInputFormat; import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; import org.apache.hadoop.hbase.mapreduce.TableMapper; +import org.apache.hadoop.hbase.mapreduce.TableRecordReaderImpl; import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.BytesWritable; @@ -316,6 +318,7 @@ public class IntegrationTestLoadAndVerif job.setMapperClass(LoadMapper.class); job.setInputFormatClass(NMapInputFormat.class); job.setNumReduceTasks(0); + setJobScannerConf(job); FileOutputFormat.setOutputPath(job, outputDir); TableMapReduceUtil.addDependencyJars(job); @@ -331,6 +334,7 @@ public class IntegrationTestLoadAndVerif Job job = new Job(conf); job.setJarByClass(this.getClass()); job.setJobName(TEST_NAME + " Verification for " + htd.getTableName()); + setJobScannerConf(job); Scan scan = new Scan(); @@ -350,6 +354,13 @@ public class IntegrationTestLoadAndVerif assertEquals(0, numOutputRecords); } + private static void setJobScannerConf(Job job) { + // Make sure scanners log something useful to make debugging possible. + job.getConfiguration().setBoolean(ScannerCallable.LOG_SCANNER_ACTIVITY, true); + long lpr = job.getConfiguration().getLong(NUM_TO_WRITE_KEY, NUM_TO_WRITE_DEFAULT) / 100; + job.getConfiguration().setInt(TableRecordReaderImpl.LOG_PER_ROW_COUNT, (int)lpr); + } + public Path getTestDir(String testName, String subdir) throws IOException { //HBaseTestingUtility.getDataTestDirOnTestFs() has not been backported. FileSystem fs = FileSystem.get(getConf());