Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D44AC9BFB for ; Thu, 2 Feb 2012 16:26:59 +0000 (UTC) Received: (qmail 49715 invoked by uid 500); 2 Feb 2012 16:26:59 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 49679 invoked by uid 500); 2 Feb 2012 16:26:59 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 49670 invoked by uid 99); 2 Feb 2012 16:26:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 16:26:59 +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; Thu, 02 Feb 2012 16:26:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1D6A523888E7; Thu, 2 Feb 2012 16:26:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239709 - in /incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server: master/state/MergeStats.java test/randomwalk/bulk/BulkPlusOne.java Date: Thu, 02 Feb 2012 16:26:37 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120202162638.1D6A523888E7@eris.apache.org> Author: ecn Date: Thu Feb 2 16:26:37 2012 New Revision: 1239709 URL: http://svn.apache.org/viewvc?rev=1239709&view=rev Log: ACCUMULO-365 - fix abusive master logging; fix bulk import test for import failures Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java?rev=1239709&r1=1239708&r2=1239709&view=diff ============================================================================== --- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java (original) +++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java Thu Feb 2 16:26:37 2012 @@ -90,7 +90,9 @@ public class MergeStats { public MergeState nextMergeState() throws Exception { MergeState state = info.getState(); - log.info("Computing next merge state for " + this.info.getRange() + " which is presently " + state); + if (state == MergeState.NONE) + return state; + log.info("Computing next merge state for " + info.getRange() + " which is presently " + state); if (state == MergeState.STARTED) { state = MergeState.SPLITTING; } Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java?rev=1239709&r1=1239708&r2=1239709&view=diff ============================================================================== --- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java (original) +++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java Thu Feb 2 16:26:37 2012 @@ -99,10 +99,10 @@ public class BulkPlusOne extends BulkTes } state.getConnector().tableOperations().importDirectory(Setup.getTableName(), dir.toString(), fail.toString(), true); fs.delete(dir, true); - fs.delete(fail, true); FileStatus[] failures = fs.listStatus(fail); if (failures != null && failures.length > 0) throw new Exception("Failures " + Arrays.asList(failures) + " found importing files from " + dir); + fs.delete(fail, true); log.debug("Finished bulk import, start rows " + printRows + " last row " + String.format(FMT, LOTS - 1) + " marker " + markerColumnQualifier); }