accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1438341 - in /accumulo/branches/ACCUMULO-259: ./ assemble/ core/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ packages/ server/ server/src/main/java/org/apache/accumulo/server/gc/ src/
Date Fri, 25 Jan 2013 06:26:35 GMT
Author: vines
Date: Fri Jan 25 06:26:35 2013
New Revision: 1438341

URL: http://svn.apache.org/viewvc?rev=1438341&view=rev
Log:
ACCUMULO-259 - fixing some merge info


Modified:
    accumulo/branches/ACCUMULO-259/   (props changed)
    accumulo/branches/ACCUMULO-259/assemble/   (props changed)
    accumulo/branches/ACCUMULO-259/core/   (props changed)
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
  (props changed)
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
  (props changed)
    accumulo/branches/ACCUMULO-259/packages/   (props changed)
    accumulo/branches/ACCUMULO-259/server/   (props changed)
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/branches/ACCUMULO-259/src/   (props changed)

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340

Propchange: accumulo/branches/ACCUMULO-259/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/assemble:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340

Propchange: accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340

Propchange: accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340

Propchange: accumulo/branches/ACCUMULO-259/packages/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/packages:r1391625-1391754,1398537-1398539,1403335-1404662,1432175-1432270,1438337-1438340

Propchange: accumulo/branches/ACCUMULO-259/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/server:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1438341&r1=1438340&r2=1438341&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
Fri Jan 25 06:26:35 2013
@@ -318,6 +318,16 @@ public class SimpleGarbageCollector impl
     }
   }
   
+  private boolean moveToTrash(Path path) throws IOException {
+    if (trash == null)
+      return false;
+    try {
+      return trash.moveToTrash(path);
+    } catch (FileNotFoundException ex) {
+      return false;
+    }
+  }
+  
   /*
    * this method removes deleted table dirs that are empty
    */
@@ -350,12 +360,8 @@ public class SimpleGarbageCollector impl
       
       if (tabletDirs.length == 0) {
         Path p = new Path(ServerConstants.getTablesDir() + "/" + delTableId);
-        try {
-          trash.moveToTrash(p);
-        } catch (FileNotFoundException ex) {
-          log.debug("Ignoring error moving a directory " + p + " to the trash", ex);
+        if (!moveToTrash(p)) 
           fs.delete(p, false);
-        }
       }
     }
   }
@@ -605,15 +611,8 @@ public class SimpleGarbageCollector impl
           try {
             
             Path p = new Path(ServerConstants.getTablesDir() + delete);
-            boolean moved = false;
-            if (trash != null)
-              try {
-                moved = trash.moveToTrash(p);
-              } catch (FileNotFoundException ex) {
-                log.debug("Ignoring exception moving " + p + " to trash");
-              }
             
-            if (moved || fs.delete(p, true)) {
+            if (moveToTrash(p) || fs.delete(p, true)) {
               // delete succeeded, still want to delete
               removeFlag = true;
               synchronized (SimpleGarbageCollector.this) {

Propchange: accumulo/branches/ACCUMULO-259/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1391625-1391754,1398537-1398539,1404658-1404662,1432175-1432270,1438337-1438340



Mime
View raw message