You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/10 22:03:59 UTC
[1/3] git commit: ACCUMULO-2162 Make better checks before warning the
user.
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 9372608b1 -> deae04f67
refs/heads/master 0b4211d5a -> 9f25d067e
ACCUMULO-2162 Make better checks before warning the user.
Currently, multiple processes share one temp directory, which
means that the tempDir being unable to be deleted is expected,
and thus shouldn't be WARN'ed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/deae04f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/deae04f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/deae04f6
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: deae04f670986ce7e465a89f61dd844d2d416903
Parents: 9372608
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 10 15:55:58 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 10 15:55:58 2014 -0500
----------------------------------------------------------------------
.../accumulo/start/classloader/vfs/UniqueFileReplicator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/deae04f6/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
index 328bb54..f60e165 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
@@ -93,7 +93,10 @@ public class UniqueFileReplicator implements VfsComponent, FileReplicator {
log.warn("File does not exist: " + tmpFile);
}
}
- if (!tempDir.delete())
- log.warn("Directory does not exists: " + tempDir);
+ if (tempDir.exists()) {
+ int numChildren = tempDir.list().length;
+ if (0 == numChildren && !tempDir.delete())
+ log.warn("Cannot delete empty directory: " + tempDir);
+ }
}
}
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9f25d067
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9f25d067
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9f25d067
Branch: refs/heads/master
Commit: 9f25d067e834c0bf266d1d27e2cd3f6df1096436
Parents: 0b4211d deae04f
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 10 16:03:46 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 10 16:03:46 2014 -0500
----------------------------------------------------------------------
.../accumulo/start/classloader/vfs/UniqueFileReplicator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2162 Make better checks before warning the
user.
Posted by el...@apache.org.
ACCUMULO-2162 Make better checks before warning the user.
Currently, multiple processes share one temp directory, which
means that the tempDir being unable to be deleted is expected,
and thus shouldn't be WARN'ed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/deae04f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/deae04f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/deae04f6
Branch: refs/heads/master
Commit: deae04f670986ce7e465a89f61dd844d2d416903
Parents: 9372608
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 10 15:55:58 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 10 15:55:58 2014 -0500
----------------------------------------------------------------------
.../accumulo/start/classloader/vfs/UniqueFileReplicator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/deae04f6/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
index 328bb54..f60e165 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
@@ -93,7 +93,10 @@ public class UniqueFileReplicator implements VfsComponent, FileReplicator {
log.warn("File does not exist: " + tmpFile);
}
}
- if (!tempDir.delete())
- log.warn("Directory does not exists: " + tempDir);
+ if (tempDir.exists()) {
+ int numChildren = tempDir.list().length;
+ if (0 == numChildren && !tempDir.delete())
+ log.warn("Cannot delete empty directory: " + tempDir);
+ }
}
}