Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 03CECE29E for ; Wed, 27 Feb 2013 18:44:05 +0000 (UTC) Received: (qmail 89909 invoked by uid 500); 27 Feb 2013 18:44:04 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 89881 invoked by uid 500); 27 Feb 2013 18:44:04 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 89874 invoked by uid 99); 27 Feb 2013 18:44:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2013 18:44:04 +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; Wed, 27 Feb 2013 18:44:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1F71823888E7; Wed, 27 Feb 2013 18:43:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1450909 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/ src/server/src/main/java/org/apache/accumulo/server/master/ src/server/src/main/java/org/apache/accumulo/server/tabletserver/ src/server/src/main/java/org/a... Date: Wed, 27 Feb 2013 18:43:38 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130227184339.1F71823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Wed Feb 27 18:43:38 2013 New Revision: 1450909 URL: http://svn.apache.org/r1450909 Log: ACCUMULO-919 port the Trash updates back to 1.4 Modified: accumulo/branches/1.4/ (props changed) accumulo/branches/1.4/src/ (props changed) accumulo/branches/1.4/src/core/ (props changed) accumulo/branches/1.4/src/server/ (props changed) accumulo/branches/1.4/src/server/src/ (props changed) accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java Propchange: accumulo/branches/1.4/ ------------------------------------------------------------------------------ Merged /accumulo/trunk:r1446314 Propchange: accumulo/branches/1.4/src/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src:r1446314 Merged /accumulo/trunk:r1446314 Propchange: accumulo/branches/1.4/src/core/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src/core:r1446314 Merged /accumulo/trunk/core:r1446314 Propchange: accumulo/branches/1.4/src/server/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src/server:r1446314 Merged /accumulo/trunk/server:r1446314 Propchange: accumulo/branches/1.4/src/server/src/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/server/src:r1446314 Merged /accumulo/trunk/src/server/src:r1446314 Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java?rev=1450909&r1=1450908&r2=1450909&view=diff ============================================================================== --- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java (original) +++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java Wed Feb 27 18:43:38 2013 @@ -46,6 +46,7 @@ import org.apache.hadoop.fs.ContentSumma import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.Trash; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobStatus; import org.apache.hadoop.mapred.RunningJob; @@ -61,6 +62,8 @@ public class CoordinateRecoveryTask impl private boolean stop = false; private ZooCache zcache; + + private Trash trash; private static String fullName(String name) { return ServerConstants.getRecoveryDir() + "/" + name; @@ -259,8 +262,9 @@ public class CoordinateRecoveryTask impl } } - public CoordinateRecoveryTask(FileSystem fs) { + public CoordinateRecoveryTask(FileSystem fs) throws IOException { this.fs = fs; + this.trash = new Trash(fs, fs.getConf()); zcache = new ZooCache(); } @@ -345,7 +349,8 @@ public class CoordinateRecoveryTask impl if (children != null) { for (FileStatus child : children) { log.info("Deleting recovery directory " + child); - fs.delete(child.getPath(), true); + if (!trash.moveToTrash(child.getPath())) + fs.delete(child.getPath(), true); } } } catch (IOException e) { Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1450909&r1=1450908&r2=1450909&view=diff ============================================================================== --- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original) +++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Wed Feb 27 18:43:38 2013 @@ -124,6 +124,7 @@ import org.apache.hadoop.conf.Configurat import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.Trash; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; import org.apache.zookeeper.KeeperException; @@ -1024,8 +1025,11 @@ public class Tablet { // start deleting files, if we do not finish they will be cleaned // up later + Trash trash = new Trash(fs, fs.getConf()); for (Path path : oldDatafiles) { - fs.delete(new Path(location + "/delete+" + compactName + "+" + path.getName()), true); + Path deleteFile = new Path(location + "/delete+" + compactName + "+" + path.getName()); + if (!trash.moveToTrash(deleteFile)) + fs.delete(deleteFile, true); } } Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java?rev=1450909&r1=1450908&r2=1450909&view=diff ============================================================================== --- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java (original) +++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java Wed Feb 27 18:43:38 2013 @@ -27,7 +27,6 @@ import org.apache.accumulo.server.test.C import org.apache.accumulo.server.test.VerifyIngest; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.log4j.Logger; /** * This test verifies that when a lot of files are bulk imported into a table with one tablet and then splits that not all map files go to the children tablets.