You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/02/02 17:26:37 UTC
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
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);
}