accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
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 GMT
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);
   }



Mime
View raw message