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 8B5E210C12 for ; Tue, 1 Apr 2014 23:33:49 +0000 (UTC) Received: (qmail 75646 invoked by uid 500); 1 Apr 2014 23:33:48 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 75585 invoked by uid 500); 1 Apr 2014 23:33:48 -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 75554 invoked by uid 99); 1 Apr 2014 23:33:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 23:33:47 +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; Tue, 01 Apr 2014 23:33:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 38A0A2388868; Tue, 1 Apr 2014 23:33:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1583830 - in /hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase: mapreduce/IntegrationTestImportTsv.java test/IntegrationTestBigLinkedList.java test/IntegrationTestLoadAndVerify.java Date: Tue, 01 Apr 2014 23:33:26 -0000 To: commits@hbase.apache.org From: ndimiduk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140401233326.38A0A2388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ndimiduk Date: Tue Apr 1 23:33:25 2014 New Revision: 1583830 URL: http://svn.apache.org/r1583830 Log: HBASE-10830 Integration test MR jobs attempt to load htrace jars from the wrong location Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java?rev=1583830&r1=1583829&r2=1583830&view=diff ============================================================================== --- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java (original) +++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java Tue Apr 1 23:33:25 2014 @@ -123,11 +123,18 @@ public class IntegrationTestImportTsv im util = new IntegrationTestingUtility(); } util.initializeCluster(1); + if (!util.isDistributedCluster()) { + // also need MR when running without a real cluster + util.startMiniMapReduceCluster(); + } } @AfterClass public static void releaseCluster() throws Exception { util.restoreCluster(); + if (!util.isDistributedCluster()) { + util.shutdownMiniMapReduceCluster(); + } util = null; } Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1583830&r1=1583829&r2=1583830&view=diff ============================================================================== --- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java (original) +++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java Tue Apr 1 23:33:25 2014 @@ -1024,10 +1024,22 @@ public class IntegrationTestBigLinkedLis @Override public void setUpCluster() throws Exception { util = getTestingUtil(getConf()); - util.initializeCluster(util.isDistributedCluster() ? 1 : this.NUM_SLAVES_BASE); + boolean isDistributed = util.isDistributedCluster(); + util.initializeCluster(isDistributed ? 1 : this.NUM_SLAVES_BASE); + if (!isDistributed) { + util.startMiniMapReduceCluster(); + } this.setConf(util.getConfiguration()); } + @Override + public void cleanUpCluster() throws Exception { + super.cleanUpCluster(); + if (util.isDistributedCluster()) { + util.shutdownMiniMapReduceCluster(); + } + } + @Test public void testContinuousIngest() throws IOException, Exception { //Loop Modified: hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java?rev=1583830&r1=1583829&r2=1583830&view=diff ============================================================================== --- hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java (original) +++ hbase/branches/0.96/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java Tue Apr 1 23:33:25 2014 @@ -127,9 +127,18 @@ public class IntegrationTestLoadAndVerif getConf().setLong(NUM_TO_WRITE_KEY, NUM_TO_WRITE_DEFAULT / 100); getConf().setInt(NUM_MAP_TASKS_KEY, NUM_MAP_TASKS_DEFAULT / 100); getConf().setInt(NUM_REDUCE_TASKS_KEY, NUM_REDUCE_TASKS_DEFAULT / 10); + util.startMiniMapReduceCluster(); } } +@Override +public void cleanUpCluster() throws Exception { + super.cleanUpCluster(); + if (!util.isDistributedCluster()) { + util.shutdownMiniMapReduceCluster(); + } +} + /** * Converts a "long" value between endian systems. * Borrowed from Apache Commons IO