You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/08/05 16:03:53 UTC
[1/4] git commit: ACCUMULO-3026 UniqueFileReplicator was not being
closed
Repository: accumulo
Updated Branches:
refs/heads/master e06e8df82 -> cfe8ee548
ACCUMULO-3026 UniqueFileReplicator was not being closed
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c922a94a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c922a94a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c922a94a
Branch: refs/heads/master
Commit: c922a94aeaa576a79cb950d7abbbeb9c47c79ae1
Parents: 444a889
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Aug 5 09:58:33 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Aug 5 09:58:33 2014 -0400
----------------------------------------------------------------------
.../start/classloader/vfs/AccumuloVFSClassLoader.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c922a94a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index d4044a5..9f0f650 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@ -38,6 +38,7 @@ import org.apache.commons.vfs2.cache.SoftRefFilesCache;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.impl.FileContentInfoFilenameFactory;
import org.apache.commons.vfs2.impl.VFSClassLoader;
+import org.apache.commons.vfs2.provider.FileReplicator;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
@@ -385,8 +386,18 @@ public class AccumuloVFSClassLoader {
public static void close() {
for (WeakReference<DefaultFileSystemManager> vfsInstance : vfsInstances) {
DefaultFileSystemManager ref = vfsInstance.get();
- if (ref != null)
+ if (ref != null) {
+ FileReplicator replicator;
+ try {
+ replicator = ref.getReplicator();
+ if (replicator instanceof UniqueFileReplicator) {
+ ((UniqueFileReplicator) replicator).close();
+ }
+ } catch (FileSystemException e) {
+ log.error(e, e);
+ }
ref.close();
+ }
}
}
}
[2/4] git commit: ACCUMULO-3025 check for null pointer
Posted by ec...@apache.org.
ACCUMULO-3025 check for null pointer
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2bbef48e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2bbef48e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2bbef48e
Branch: refs/heads/master
Commit: 2bbef48e70a24025266d6a1c8bb6b9df1eeb3e72
Parents: c922a94
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Aug 5 09:59:05 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Aug 5 09:59:05 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/start/classloader/vfs/ContextManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2bbef48e/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
index e1ff55e..f23494a 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
@@ -51,7 +51,9 @@ public class ContextManager {
synchronized void close() {
closed = true;
- loader.close();
+ if (loader != null) {
+ loader.close();
+ }
loader = null;
}
}
[4/4] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cfe8ee54
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfe8ee54
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfe8ee54
Branch: refs/heads/master
Commit: cfe8ee5487195420b689b6837bdc02536cbc90c0
Parents: e06e8df d647204
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Aug 5 10:03:28 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Aug 5 10:03:28 2014 -0400
----------------------------------------------------------------------
.../accumulo/server/fs/VolumeManagerImpl.java | 23 +++-----------------
.../server/fs/VolumeManagerImplTest.java | 10 +++++++++
.../classloader/vfs/AccumuloVFSClassLoader.java | 13 ++++++++++-
.../start/classloader/vfs/ContextManager.java | 4 +++-
4 files changed, 28 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfe8ee54/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfe8ee54/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
----------------------------------------------------------------------
[3/4] git commit: ACCUMULO-3006 check for viewfs
Posted by ec...@apache.org.
ACCUMULO-3006 check for viewfs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d6472040
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d6472040
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d6472040
Branch: refs/heads/master
Commit: d6472040a9873bcc160199b8da57078118ee3e4a
Parents: 2bbef48
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Aug 5 10:02:36 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Aug 5 10:02:36 2014 -0400
----------------------------------------------------------------------
.../accumulo/server/fs/VolumeManagerImpl.java | 23 +++-----------------
.../server/fs/VolumeManagerImplTest.java | 10 +++++++++
2 files changed, 13 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d6472040/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 0cfb457..877b9a6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -219,16 +219,6 @@ public class VolumeManagerImpl implements VolumeManager {
final String volumeName = entry.getKey();
FileSystem fs = entry.getValue().getFileSystem();
- if (ViewFSUtils.isViewFS(fs)) {
- try {
- FileSystem resolvedFs = ViewFSUtils.resolvePath(fs, new Path("/")).getFileSystem(fs.getConf());
- log.debug("resolved " + fs.getUri() + " to " + resolvedFs.getUri() + " for sync check");
- fs = resolvedFs;
- } catch (IOException e) {
- log.warn("Failed to resolve " + fs.getUri(), e);
- }
- }
-
if (fs instanceof DistributedFileSystem) {
final String DFS_DURABLE_SYNC = "dfs.durable.sync", DFS_SUPPORT_APPEND = "dfs.support.append";
final String ticketMessage = "See ACCUMULO-623 and ACCUMULO-1637 for more details.";
@@ -410,6 +400,9 @@ public class VolumeManagerImpl implements VolumeManager {
// Cannot re-define the default volume
throw new IllegalArgumentException();
+ if (volumeUriOrDir.startsWith("viewfs"))
+ throw new IllegalArgumentException();
+
// We require a URI here, fail if it doesn't look like one
if (volumeUriOrDir.contains(":")) {
volumes.put(volumeUriOrDir, VolumeConfiguration.create(new Path(volumeUriOrDir), hadoopConf));
@@ -426,16 +419,6 @@ public class VolumeManagerImpl implements VolumeManager {
for (Volume volume : getFileSystems().values()) {
FileSystem fs = volume.getFileSystem();
- if (ViewFSUtils.isViewFS(fs)) {
- try {
- FileSystem resolvedFs = ViewFSUtils.resolvePath(fs, new Path("/")).getFileSystem(fs.getConf());
- log.debug("resolved " + fs.getUri() + " to " + resolvedFs.getUri() + " for ready check");
- fs = resolvedFs;
- } catch (IOException e) {
- log.warn("Failed to resolve " + fs.getUri(), e);
- }
- }
-
if (!(fs instanceof DistributedFileSystem))
continue;
DistributedFileSystem dfs = (DistributedFileSystem) fs;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d6472040/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
index f29d220..5f97bf6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
@@ -19,6 +19,9 @@ package org.apache.accumulo.server.fs;
import java.util.Arrays;
import java.util.List;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.ConfigurationCopy;
+import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.fs.VolumeManager.FileType;
import org.apache.hadoop.fs.Path;
import org.junit.Assert;
@@ -82,4 +85,11 @@ public class VolumeManagerImplTest {
Assert.assertEquals(new Path(expectedBase, pathToTest), fullPath);
}
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void noViewFS() throws Exception {
+ ConfigurationCopy conf = new ConfigurationCopy();
+ conf.set(Property.INSTANCE_VOLUMES, "viewfs://dummy");
+ VolumeManagerImpl.get(conf);
+ }
}