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 5809C9B4E for ; Fri, 3 Feb 2012 19:58:59 +0000 (UTC) Received: (qmail 36485 invoked by uid 500); 3 Feb 2012 19:58:59 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 36464 invoked by uid 500); 3 Feb 2012 19:58:58 -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 36457 invoked by uid 99); 3 Feb 2012 19:58:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 19:58: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; Fri, 03 Feb 2012 19:58:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0499623888FE; Fri, 3 Feb 2012 19:58:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240319 - in /incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server: master/tableOps/BulkImport.java tabletserver/TabletServer.java test/randomwalk/bulk/BulkPlusOne.java Date: Fri, 03 Feb 2012 19:58:34 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120203195835.0499623888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Fri Feb 3 19:58:34 2012 New Revision: 1240319 URL: http://svn.apache.org/viewvc?rev=1240319&view=rev Log: ACCUMULO-369: add a small delay between retries (not really a fix), add some additional debugging Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.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/tableOps/BulkImport.java URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1240319&r1=1240318&r2=1240319&view=diff ============================================================================== --- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java (original) +++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java Fri Feb 3 19:58:34 2012 @@ -425,6 +425,7 @@ class LoadFiles extends MasterRepo { f.get(); if (filesToLoad.size() > 0) { log.debug("tid " + tid + " attempt " + (i + 1) + " " + filesToLoad + " failed"); + UtilWaitThread.sleep(100); } } // Copy/Create failed file markers Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1240319&r1=1240318&r2=1240319&view=diff ============================================================================== --- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original) +++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Fri Feb 3 19:58:34 2012 @@ -861,7 +861,7 @@ public class TabletServer extends Abstra try { importTablet.importMapFiles(tid, fileMap, setTime); } catch (IOException ioe) { - log.info("file not imported: " + ioe.getMessage()); + log.info("files " + fileMap.keySet() + " not imported to " + new KeyExtent(tke) + ": " + ioe.getMessage()); failures.add(tke); } } 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=1240319&r1=1240318&r2=1240319&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 Fri Feb 3 19:58:34 2012 @@ -17,7 +17,6 @@ package org.apache.accumulo.server.test.randomwalk.bulk; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Random; import java.util.TreeSet; @@ -100,8 +99,9 @@ public class BulkPlusOne extends BulkTes state.getConnector().tableOperations().importDirectory(Setup.getTableName(), dir.toString(), fail.toString(), true); fs.delete(dir, true); FileStatus[] failures = fs.listStatus(fail); - if (failures != null && failures.length > 0) - throw new Exception("Failures " + Arrays.asList(failures) + " found importing files from " + dir); + if (failures != null && failures.length > 0) { + throw new Exception(failures.length + " failure files 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); }