You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/06/09 23:02:44 UTC
[1/4] git commit: Merge branch '1.6.1-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 9062c2559 -> 1a33f6df9
refs/heads/master ced3293b3 -> 1fe48e112
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/9062c255
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9062c255
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9062c255
Branch: refs/heads/master
Commit: 9062c2559a1464f196a4ba5bb0200818d1b5bf9c
Parents: 0038df1 ae1682d
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Jun 9 10:53:22 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Jun 9 10:53:22 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/Constants.java | 2 ++
.../client/mapred/AccumuloFileOutputFormat.java | 3 +-
.../mapreduce/lib/impl/ConfiguratorBase.java | 37 +++++++++++++++++++-
.../mapred/AccumuloFileOutputFormatTest.java | 3 ++
.../lib/impl/ConfiguratorBaseTest.java | 8 +++++
5 files changed, 51 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: ACCUMULO-2876 Use site config to configure default
VolumeManagerImpl
Posted by bh...@apache.org.
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/1.6.1-SNAPSHOT
Commit: 1a33f6df9c31d496f8260f785f85817ab6cb2b9c
Parents: 9062c25
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jun 9 16:40:29 2014 -0400
Committer: Bill Havanki <bh...@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);
}
[2/4] git commit: ACCUMULO-2876 Use site config to configure default
VolumeManagerImpl
Posted by bh...@apache.org.
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 <bh...@cloudera.com>
Authored: Mon Jun 9 16:40:29 2014 -0400
Committer: Bill Havanki <bh...@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);
}
[4/4] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by bh...@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/1fe48e11
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1fe48e11
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1fe48e11
Branch: refs/heads/master
Commit: 1fe48e11222e1923943fb274ea78fb27407ac326
Parents: ced3293 1a33f6d
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jun 9 17:02:21 2014 -0400
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jun 9 17:02:21 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------