accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/2] git commit: Merge branch '1.5.1-SNAPSHOT'
Date Mon, 09 Sep 2013 16:07:56 GMT
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
	server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a2f4246
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a2f4246
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2a2f4246

Branch: refs/heads/master
Commit: 2a2f42464c46e9e56ee9ce3fbd0da70ecd974661
Parents: a028e76 368fe1c
Author: John Vines <jvines@gmail.com>
Authored: Mon Sep 9 12:07:42 2013 -0400
Committer: John Vines <jvines@gmail.com>
Committed: Mon Sep 9 12:07:42 2013 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/server/tabletserver/Tablet.java  | 2 +-
 .../java/org/apache/accumulo/server/tabletserver/TabletServer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2a2f4246/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------
diff --cc server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
index 427fd33,6162105..02af9a0
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
@@@ -1004,11 -1039,11 +1004,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) {
 +          for (FileRef ref : oldDatafiles) {
 +            Path path = ref.path();
              Path deleteFile = new Path(location + "/delete+" + compactName + "+" + path.getName());
-             if (!fs.moveToTrash(deleteFile))
 -            if (acuTableConf.getBoolean(Property.GC_TRASH_IGNORE) || !trash.moveToTrash(deleteFile))
 -              fs.delete(deleteFile, true);
++            if (acuTableConf.getBoolean(Property.GC_TRASH_IGNORE) || !fs.moveToTrash(deleteFile))
 +              fs.deleteRecursively(deleteFile);
            }
          }
          

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2a2f4246/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --cc server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index be2b7a8,3c936f9..7f50746
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@@ -2407,18 -2093,18 +2407,18 @@@ public class TabletServer extends Abstr
                log.error("rename is unsuccessful");
            } else {
              log.info("Deleting walog " + filename);
 -            Trash trash = new Trash(fs, fs.getConf());
 -            Path sourcePath = new Path(source);
 -            if (!(!acuConf.getBoolean(Property.GC_TRASH_IGNORE) && trash.moveToTrash(sourcePath))
&& !fs.delete(sourcePath, true))
 +            Path sourcePath = new Path(filename);
-             if (!fs.moveToTrash(sourcePath) && !fs.deleteRecursively(sourcePath))
++            if (!(!acuConf.getBoolean(Property.GC_TRASH_IGNORE) && fs.moveToTrash(sourcePath))
&& !fs.deleteRecursively(sourcePath))
                log.warn("Failed to delete walog " + source);
 -            Path recoveryPath = new Path(Constants.getRecoveryDir(acuConf), filename);
 -            try {
 -              if (trash.moveToTrash(recoveryPath) || fs.delete(recoveryPath, true))
 -                log.info("Deleted any recovery log " + filename);
 -            } catch (FileNotFoundException ex) {
 -              // ignore
 +            for (String recovery : ServerConstants.getRecoveryDirs()) {
 +              Path recoveryPath = new Path(recovery, source.getName());
 +              try {
 +                if (fs.moveToTrash(recoveryPath) || fs.deleteRecursively(recoveryPath))
 +                  log.info("Deleted any recovery log " + filename);
 +              } catch (FileNotFoundException ex) {
 +                // ignore
 +              }
              }
 -            
            }
          } catch (IOException e) {
            log.warn("Error attempting to delete write-ahead log " + filename + ": " + e);


Mime
View raw message