Repository: accumulo Updated Branches: refs/heads/1.7 62821a03c -> 91b161a93
ACCUMULO-4025 canceling a FATE transaction should remove the arbitrator entry Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4deaf73c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4deaf73c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4deaf73c Branch: refs/heads/1.7 Commit: 4deaf73c03e0d166e321719bd9ff3cddc607b336 Parents: c869751 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Oct 13 16:50:05 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Oct 13 16:50:05 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/master/tableOps/BulkImport.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4deaf73c/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java index 8273421..e661968 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java @@ -284,6 +284,7 @@ public class BulkImport extends MasterRepo { Utils.unreserveHdfsDirectory(sourceDir, tid); Utils.unreserveHdfsDirectory(errorDir, tid); Utils.getReadLock(tableId, tid).unlock(); + ZooArbitrator.cleanup(Constants.BULK_ARBITRATOR_TYPE, tid); } }
