ACCUMULO-2876 Use site config to configure default VolumeManagerImpl This changes VolumeManagerImpl.get() to use the site configuration instead of the ZooKeeper-based system configuration. This seems to align better with what is intended, and it also eliminates the risk of an infinite loop, where the system configuration requires an HdfsZooInstance instance ID, which requires a volume manager.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1a33f6df Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1a33f6df Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1a33f6df Branch: refs/heads/master Commit: 1a33f6df9c31d496f8260f785f85817ab6cb2b9c Parents: 9062c25 Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon Jun 9 16:40:29 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon Jun 9 16:40:29 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1a33f6df/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 8fe6579..5c1194a 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 @@ -393,7 +393,7 @@ public class VolumeManagerImpl implements VolumeManager { } public static VolumeManager get() throws IOException { - AccumuloConfiguration conf = ServerConfiguration.getSystemConfiguration(HdfsZooInstance.getInstance()); + AccumuloConfiguration conf = ServerConfiguration.getSiteConfiguration(); return get(conf); }
