You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/06/09 19:52:50 UTC
[1/6] accumulo git commit: ACCUMULO-3865 Throw better exception with
miniDFS
Repository: accumulo
Updated Branches:
refs/heads/1.6 b754d1212 -> 8c0d881c3
refs/heads/1.7 e16a6faef -> e0c72f250
refs/heads/master f93803ff6 -> f7777839d
ACCUMULO-3865 Throw better exception with miniDFS
* Throw IllegalStateException with informative message when attempting to
restart mini when using miniDFS, since that feature is not supported.
* Add javadoc to explain the restriction.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c0d881c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c0d881c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8c0d881c
Branch: refs/heads/1.6
Commit: 8c0d881c32c107039f29a4f43df230e2a098804f
Parents: b754d12
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 9 13:12:38 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 9 13:12:38 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c0d881c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 6e67c9f..e512936 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -473,6 +473,10 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
*/
@Override
public synchronized void start() throws IOException, InterruptedException {
+ if (config.useMiniDFS() && miniDFS == null) {
+ throw new IllegalStateException("Cannot restart mini when using miniDFS");
+ }
+
MiniAccumuloClusterControl control = getClusterControl();
if (config.useExistingInstance()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c0d881c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 10d5a9c..8feef61 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -29,8 +29,10 @@ import org.apache.accumulo.core.conf.CredentialProviderFactoryShim;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.MemoryUnit;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
/**
@@ -484,6 +486,11 @@ public class MiniAccumuloConfigImpl {
return useMiniDFS;
}
+ /**
+ * Configures this cluster to use miniDFS instead of the local {@link FileSystem}. Using this feature will not allow you to re-start
+ * {@link MiniAccumuloCluster} by calling {@link MiniAccumuloCluster#start()} after {@link MiniAccumuloCluster#stop()}, because the underlying miniDFS cannot
+ * be restarted.
+ */
public void useMiniDFS(boolean useMiniDFS) {
this.useMiniDFS = useMiniDFS;
}
[3/6] accumulo git commit: ACCUMULO-3865 Throw better exception with
miniDFS
Posted by ct...@apache.org.
ACCUMULO-3865 Throw better exception with miniDFS
* Throw IllegalStateException with informative message when attempting to
restart mini when using miniDFS, since that feature is not supported.
* Add javadoc to explain the restriction.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c0d881c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c0d881c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8c0d881c
Branch: refs/heads/master
Commit: 8c0d881c32c107039f29a4f43df230e2a098804f
Parents: b754d12
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 9 13:12:38 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 9 13:12:38 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c0d881c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 6e67c9f..e512936 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -473,6 +473,10 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
*/
@Override
public synchronized void start() throws IOException, InterruptedException {
+ if (config.useMiniDFS() && miniDFS == null) {
+ throw new IllegalStateException("Cannot restart mini when using miniDFS");
+ }
+
MiniAccumuloClusterControl control = getClusterControl();
if (config.useExistingInstance()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c0d881c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 10d5a9c..8feef61 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -29,8 +29,10 @@ import org.apache.accumulo.core.conf.CredentialProviderFactoryShim;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.MemoryUnit;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
/**
@@ -484,6 +486,11 @@ public class MiniAccumuloConfigImpl {
return useMiniDFS;
}
+ /**
+ * Configures this cluster to use miniDFS instead of the local {@link FileSystem}. Using this feature will not allow you to re-start
+ * {@link MiniAccumuloCluster} by calling {@link MiniAccumuloCluster#start()} after {@link MiniAccumuloCluster#stop()}, because the underlying miniDFS cannot
+ * be restarted.
+ */
public void useMiniDFS(boolean useMiniDFS) {
this.useMiniDFS = useMiniDFS;
}
[2/6] accumulo git commit: ACCUMULO-3865 Throw better exception with
miniDFS
Posted by ct...@apache.org.
ACCUMULO-3865 Throw better exception with miniDFS
* Throw IllegalStateException with informative message when attempting to
restart mini when using miniDFS, since that feature is not supported.
* Add javadoc to explain the restriction.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c0d881c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c0d881c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8c0d881c
Branch: refs/heads/1.7
Commit: 8c0d881c32c107039f29a4f43df230e2a098804f
Parents: b754d12
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 9 13:12:38 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 9 13:12:38 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c0d881c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 6e67c9f..e512936 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -473,6 +473,10 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
*/
@Override
public synchronized void start() throws IOException, InterruptedException {
+ if (config.useMiniDFS() && miniDFS == null) {
+ throw new IllegalStateException("Cannot restart mini when using miniDFS");
+ }
+
MiniAccumuloClusterControl control = getClusterControl();
if (config.useExistingInstance()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c0d881c/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 10d5a9c..8feef61 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -29,8 +29,10 @@ import org.apache.accumulo.core.conf.CredentialProviderFactoryShim;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.MemoryUnit;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.log4j.Logger;
/**
@@ -484,6 +486,11 @@ public class MiniAccumuloConfigImpl {
return useMiniDFS;
}
+ /**
+ * Configures this cluster to use miniDFS instead of the local {@link FileSystem}. Using this feature will not allow you to re-start
+ * {@link MiniAccumuloCluster} by calling {@link MiniAccumuloCluster#start()} after {@link MiniAccumuloCluster#stop()}, because the underlying miniDFS cannot
+ * be restarted.
+ */
public void useMiniDFS(boolean useMiniDFS) {
this.useMiniDFS = useMiniDFS;
}
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0c72f25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0c72f25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0c72f25
Branch: refs/heads/master
Commit: e0c72f25064990d1e6d5f6f14dfda944a54d4371
Parents: e16a6fa 8c0d881
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 9 13:52:01 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 9 13:52:01 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0c72f25/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0c72f25/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index ef498bf,8feef61..c8f65d2
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@@ -28,11 -29,11 +28,13 @@@ import org.apache.accumulo.core.conf.Cr
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.MemoryUnit;
+ import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Holds configuration for {@link MiniAccumuloClusterImpl}. Required configurations must be passed to constructor(s) and all other configurations are optional.
[6/6] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7777839
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7777839
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7777839
Branch: refs/heads/master
Commit: f7777839d7b95a5f66b94a17f560ede38d27d45b
Parents: f93803f e0c72f2
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 9 13:52:27 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 9 13:52:27 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7777839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7777839/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0c72f25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0c72f25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0c72f25
Branch: refs/heads/1.7
Commit: e0c72f25064990d1e6d5f6f14dfda944a54d4371
Parents: e16a6fa 8c0d881
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 9 13:52:01 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 9 13:52:01 2015 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++++
.../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 7 +++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0c72f25/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0c72f25/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index ef498bf,8feef61..c8f65d2
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@@ -28,11 -29,11 +28,13 @@@ import org.apache.accumulo.core.conf.Cr
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.minicluster.MemoryUnit;
+ import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Holds configuration for {@link MiniAccumuloClusterImpl}. Required configurations must be passed to constructor(s) and all other configurations are optional.