accumulo git commit: ACCUMULO-3423 Fix FindBugs issue
Repository: accumulo
Updated Branches:
refs/heads/master ee6bea790 -> 880e3386c
ACCUMULO-3423 Fix FindBugs issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/880e3386
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/880e3386
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/880e3386
Branch: refs/heads/master
Commit: 880e3386c355c2daac4a71ae6ec2775cf00a7e45
Parents: ee6bea7
Author: Josh Elser
Authored: Thu Jun 25 00:25:25 2015 -0400
Committer: Josh Elser
Committed: Thu Jun 25 00:25:25 2015 -0400
--
test/src/main/java/org/apache/accumulo/test/DumpConfigIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/880e3386/test/src/main/java/org/apache/accumulo/test/DumpConfigIT.java
--
diff --git a/test/src/main/java/org/apache/accumulo/test/DumpConfigIT.java
b/test/src/main/java/org/apache/accumulo/test/DumpConfigIT.java
index 01d873e..792e141 100644
--- a/test/src/main/java/org/apache/accumulo/test/DumpConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/DumpConfigIT.java
@@ -49,7 +49,7 @@ public class DumpConfigIT extends ConfigurableMacBase {
@Test
public void test() throws Exception {
File target = new File(System.getProperty("user.dir"), "target");
-target.mkdirs();
+assertTrue("target directory should exist", target.exists());
TemporaryFolder folder = new TemporaryFolder(target);
folder.create();
File siteFileBackup = new File(folder.getRoot(), "accumulo-site.xml.bak");
Git Push Summary
Repository: accumulo Updated Branches: refs/heads/ACCUMULO-COMMIT-TEST [deleted] e83089ce2
accumulo git commit: Simple file to test commiter status.
Repository: accumulo Updated Branches: refs/heads/ACCUMULO-COMMIT-TEST [created] e83089ce2 Simple file to test commiter status. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e83089ce Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e83089ce Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e83089ce Branch: refs/heads/ACCUMULO-COMMIT-TEST Commit: e83089ce2f08c49f4945c24aa3d91254cf4f1dec Parents: b7f88f9 Author: Edward Coleman Authored: Wed Jun 24 17:15:42 2015 -0400 Committer: Edward Coleman Committed: Wed Jun 24 17:15:42 2015 -0400 -- foo.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e83089ce/foo.txt -- diff --git a/foo.txt b/foo.txt new file mode 100644 index 000..257cc56 --- /dev/null +++ b/foo.txt @@ -0,0 +1 @@ +foo
accumulo git commit: ACCUMULO-3833 decrease the level of the relatively unhelpful message
Repository: accumulo
Updated Branches:
refs/heads/master 75ce6d4b5 -> ee6bea790
ACCUMULO-3833 decrease the level of the relatively unhelpful message
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ee6bea79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ee6bea79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ee6bea79
Branch: refs/heads/master
Commit: ee6bea7903fbf2d6389dca38698f9c5b0f5d8ba6
Parents: 75ce6d4
Author: Eric Newton
Authored: Wed Jun 24 16:13:48 2015 -0400
Committer: Eric Newton
Committed: Wed Jun 24 16:13:48 2015 -0400
--
.../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ee6bea79/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 6eb8e4e..cf01dd3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -203,12 +203,7 @@ public class NativeMap implements
Iterable> {
@Override
public void run() {
if (allocatedNativeMaps.size() > 0) {
-// print to system err in case log4j is shutdown...
-try {
- log.warn("There are " + allocatedNativeMaps.size() + " allocated
native maps");
-} catch (Throwable t) {
- log.error("There are " + allocatedNativeMaps.size() + "
allocated native maps");
-}
+log.info("There are " + allocatedNativeMaps.size() + " allocated
native maps");
}
log.debug(totalAllocations + " native maps were allocated");
[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/75ce6d4b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/75ce6d4b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/75ce6d4b Branch: refs/heads/master Commit: 75ce6d4b5747e7089585da1741c889af9f20a022 Parents: cf77832 6697ed5 Author: Eric Newton Authored: Wed Jun 24 16:05:20 2015 -0400 Committer: Eric Newton Committed: Wed Jun 24 16:05:20 2015 -0400 -- --
[1/2] accumulo git commit: ACCUMULO-3322 use a more sensible condition for printing memory usage
Repository: accumulo
Updated Branches:
refs/heads/master 6697ed5bd -> 75ce6d4b5
ACCUMULO-3322 use a more sensible condition for printing memory usage
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf778324
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf778324
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf778324
Branch: refs/heads/master
Commit: cf7783244ac0440cab847aada5f87e38fcbd7d5d
Parents: 245d724
Author: Eric Newton
Authored: Wed Jun 24 16:04:40 2015 -0400
Committer: Eric Newton
Committed: Wed Jun 24 16:04:40 2015 -0400
--
.../java/org/apache/accumulo/server/GarbageCollectionLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf778324/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
index 389a544..993f0ea 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -79,7 +79,7 @@ public class GarbageCollectionLogger {
}
}
-if (mem > lastMemorySize) {
+if (mem != lastMemorySize) {
sawChange = true;
}
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d63bf7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d63bf7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d63bf7e Branch: refs/heads/master Commit: 3d63bf7eb168296c9705a9815792985ae7ee5114 Parents: d0c1e9f 18d68fc Author: Josh Elser Authored: Wed Jun 24 13:58:53 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 13:58:53 2015 -0400 -- --
[6/6] accumulo git commit: Merge branch '1.7'
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/6697ed5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6697ed5b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6697ed5b Branch: refs/heads/master Commit: 6697ed5bd4dc3815d60ec236859b6f8a3e22daec Parents: a3af982 3d63bf7 Author: Josh Elser Authored: Wed Jun 24 14:02:14 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 14:02:14 2015 -0400 -- --
[2/6] accumulo git commit: ACCUMULO-3917 Remove unused import
ACCUMULO-3917 Remove unused import Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d68fcc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d68fcc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d68fcc Branch: refs/heads/1.7 Commit: 18d68fcce5ff54ceb8a47ec5cfd3156f6ac862ba Parents: af05876 Author: Josh Elser Authored: Wed Jun 24 13:58:21 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 13:58:21 2015 -0400 -- .../java/org/apache/accumulo/core/util/shell/ShellConfigTest.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d68fcc/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java -- diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java index 6292622..c61b6f0 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java @@ -24,7 +24,6 @@ import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.PrintStream; import java.io.PrintWriter; -import java.nio.file.Files; import java.util.HashMap; import java.util.Map;
[3/6] accumulo git commit: ACCUMULO-3917 Remove unused import
ACCUMULO-3917 Remove unused import Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d68fcc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d68fcc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d68fcc Branch: refs/heads/master Commit: 18d68fcce5ff54ceb8a47ec5cfd3156f6ac862ba Parents: af05876 Author: Josh Elser Authored: Wed Jun 24 13:58:21 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 13:58:21 2015 -0400 -- .../java/org/apache/accumulo/core/util/shell/ShellConfigTest.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d68fcc/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java -- diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java index 6292622..c61b6f0 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java @@ -24,7 +24,6 @@ import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.PrintStream; import java.io.PrintWriter; -import java.nio.file.Files; import java.util.HashMap; import java.util.Map;
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d63bf7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d63bf7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d63bf7e Branch: refs/heads/1.7 Commit: 3d63bf7eb168296c9705a9815792985ae7ee5114 Parents: d0c1e9f 18d68fc Author: Josh Elser Authored: Wed Jun 24 13:58:53 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 13:58:53 2015 -0400 -- --
[1/6] accumulo git commit: ACCUMULO-3917 Remove unused import
Repository: accumulo Updated Branches: refs/heads/1.6 af058765d -> 18d68fcce refs/heads/1.7 d0c1e9f17 -> 3d63bf7eb refs/heads/master a3af98261 -> 6697ed5bd ACCUMULO-3917 Remove unused import Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d68fcc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d68fcc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d68fcc Branch: refs/heads/1.6 Commit: 18d68fcce5ff54ceb8a47ec5cfd3156f6ac862ba Parents: af05876 Author: Josh Elser Authored: Wed Jun 24 13:58:21 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 13:58:21 2015 -0400 -- .../java/org/apache/accumulo/core/util/shell/ShellConfigTest.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d68fcc/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java -- diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java index 6292622..c61b6f0 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java @@ -24,7 +24,6 @@ import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.PrintStream; import java.io.PrintWriter; -import java.nio.file.Files; import java.util.HashMap; import java.util.Map;
[2/6] accumulo git commit: ACCUMULO-3779 Restore proper use zookeepers and add clientconf warning.
ACCUMULO-3779 Restore proper use zookeepers and add clientconf warning.
Warn when we don't find a client configuration file to use in
any of the normal locations and ensure that use of ZK goes from
shell option, to client conf to accumulo site.
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af058765
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af058765
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af058765
Branch: refs/heads/1.7
Commit: af058765d6286198719b0f2d9b6fcffbdb5a6add
Parents: e785da1
Author: Josh Elser
Authored: Thu May 7 16:01:45 2015 -0400
Committer: Josh Elser
Committed: Wed Jun 24 12:33:55 2015 -0400
--
.../core/client/ClientConfiguration.java| 8
.../apache/accumulo/core/util/shell/Shell.java | 40 +---
.../core/util/shell/ShellOptionsJC.java | 12 ++
.../core/util/shell/ShellConfigTest.java| 37 ++
.../core/util/shell/ShellSetInstanceTest.java | 15 +---
5 files changed, 93 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af058765/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index a71b7e1..2a7a48c 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -31,6 +31,8 @@ import
org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Contains a list of property keys recognized by the Accumulo client and
convenience methods for setting them.
@@ -38,6 +40,8 @@ import
org.apache.commons.configuration.PropertiesConfiguration;
* @since 1.6.0
*/
public class ClientConfiguration extends CompositeConfiguration {
+ private static final Logger log =
LoggerFactory.getLogger(ClientConfiguration.class);
+
public static final String USER_ACCUMULO_DIR_NAME = ".accumulo";
public static final String USER_CONF_FILENAME = "config";
public static final String GLOBAL_CONF_FILENAME = "client.conf";
@@ -146,6 +150,10 @@ public class ClientConfiguration extends
CompositeConfiguration {
configs.add(new PropertiesConfiguration(conf));
}
}
+ // We couldn't find the client configuration anywhere
+ if (configs.isEmpty()) {
+log.warn("Found no client.conf in default paths. Using default client
configuration values.");
+ }
return new ClientConfiguration(configs);
} catch (ConfigurationException e) {
throw new IllegalStateException("Error loading client configuration", e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af058765/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index 1f14b6f..8cfb689 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -431,27 +431,41 @@ public class Shell extends ShellOptions {
}
}
+ /**
+ * Get the ZooKeepers. Use the value passed in (if there was one), then fall
back to the ClientConf, finally trying the accumulo-site.xml.
+ *
+ * @param keepers
+ * ZooKeepers passed to the shell
+ * @param clientConfig
+ * ClientConfiguration instance
+ * @return The ZooKeepers to connect to
+ */
+ static String getZooKeepers(String keepers, ClientConfiguration
clientConfig, AccumuloConfiguration conf) {
+if (null != keepers) {
+ return keepers;
+}
+
+if (clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
+ return clientConfig.get(ClientProperty.INSTANCE_ZK_HOST);
+}
+
+return conf.get(Property.INSTANCE_ZK_HOST);
+ }
+
/*
* Takes instanceName and keepers as separate arguments, rather than just
packaged into the clientConfig, so that we c
[3/6] accumulo git commit: ACCUMULO-3779 Restore proper use zookeepers and add clientconf warning.
ACCUMULO-3779 Restore proper use zookeepers and add clientconf warning.
Warn when we don't find a client configuration file to use in
any of the normal locations and ensure that use of ZK goes from
shell option, to client conf to accumulo site.
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af058765
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af058765
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af058765
Branch: refs/heads/master
Commit: af058765d6286198719b0f2d9b6fcffbdb5a6add
Parents: e785da1
Author: Josh Elser
Authored: Thu May 7 16:01:45 2015 -0400
Committer: Josh Elser
Committed: Wed Jun 24 12:33:55 2015 -0400
--
.../core/client/ClientConfiguration.java| 8
.../apache/accumulo/core/util/shell/Shell.java | 40 +---
.../core/util/shell/ShellOptionsJC.java | 12 ++
.../core/util/shell/ShellConfigTest.java| 37 ++
.../core/util/shell/ShellSetInstanceTest.java | 15 +---
5 files changed, 93 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af058765/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index a71b7e1..2a7a48c 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -31,6 +31,8 @@ import
org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Contains a list of property keys recognized by the Accumulo client and
convenience methods for setting them.
@@ -38,6 +40,8 @@ import
org.apache.commons.configuration.PropertiesConfiguration;
* @since 1.6.0
*/
public class ClientConfiguration extends CompositeConfiguration {
+ private static final Logger log =
LoggerFactory.getLogger(ClientConfiguration.class);
+
public static final String USER_ACCUMULO_DIR_NAME = ".accumulo";
public static final String USER_CONF_FILENAME = "config";
public static final String GLOBAL_CONF_FILENAME = "client.conf";
@@ -146,6 +150,10 @@ public class ClientConfiguration extends
CompositeConfiguration {
configs.add(new PropertiesConfiguration(conf));
}
}
+ // We couldn't find the client configuration anywhere
+ if (configs.isEmpty()) {
+log.warn("Found no client.conf in default paths. Using default client
configuration values.");
+ }
return new ClientConfiguration(configs);
} catch (ConfigurationException e) {
throw new IllegalStateException("Error loading client configuration", e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af058765/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index 1f14b6f..8cfb689 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -431,27 +431,41 @@ public class Shell extends ShellOptions {
}
}
+ /**
+ * Get the ZooKeepers. Use the value passed in (if there was one), then fall
back to the ClientConf, finally trying the accumulo-site.xml.
+ *
+ * @param keepers
+ * ZooKeepers passed to the shell
+ * @param clientConfig
+ * ClientConfiguration instance
+ * @return The ZooKeepers to connect to
+ */
+ static String getZooKeepers(String keepers, ClientConfiguration
clientConfig, AccumuloConfiguration conf) {
+if (null != keepers) {
+ return keepers;
+}
+
+if (clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
+ return clientConfig.get(ClientProperty.INSTANCE_ZK_HOST);
+}
+
+return conf.get(Property.INSTANCE_ZK_HOST);
+ }
+
/*
* Takes instanceName and keepers as separate arguments, rather than just
packaged into the clientConfig, so that w
[6/6] accumulo git commit: Merge branch '1.7'
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/a3af9826 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3af9826 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3af9826 Branch: refs/heads/master Commit: a3af98261a8b3d99deaab9ec37aee53587676ec2 Parents: 245d724 d0c1e9f Author: Josh Elser Authored: Wed Jun 24 12:40:02 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 12:40:02 2015 -0400 -- --
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0c1e9f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0c1e9f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0c1e9f1 Branch: refs/heads/master Commit: d0c1e9f17a0908c1041cadd6fb90a44ffaf3db88 Parents: f1bc1dd af05876 Author: Josh Elser Authored: Wed Jun 24 12:39:53 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 12:39:53 2015 -0400 -- --
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0c1e9f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0c1e9f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0c1e9f1 Branch: refs/heads/1.7 Commit: d0c1e9f17a0908c1041cadd6fb90a44ffaf3db88 Parents: f1bc1dd af05876 Author: Josh Elser Authored: Wed Jun 24 12:39:53 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 12:39:53 2015 -0400 -- --
[1/6] accumulo git commit: ACCUMULO-3779 Restore proper use zookeepers and add clientconf warning.
Repository: accumulo
Updated Branches:
refs/heads/1.6 e785da148 -> af058765d
refs/heads/1.7 f1bc1dd8d -> d0c1e9f17
refs/heads/master 245d724ad -> a3af98261
ACCUMULO-3779 Restore proper use zookeepers and add clientconf warning.
Warn when we don't find a client configuration file to use in
any of the normal locations and ensure that use of ZK goes from
shell option, to client conf to accumulo site.
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af058765
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af058765
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af058765
Branch: refs/heads/1.6
Commit: af058765d6286198719b0f2d9b6fcffbdb5a6add
Parents: e785da1
Author: Josh Elser
Authored: Thu May 7 16:01:45 2015 -0400
Committer: Josh Elser
Committed: Wed Jun 24 12:33:55 2015 -0400
--
.../core/client/ClientConfiguration.java| 8
.../apache/accumulo/core/util/shell/Shell.java | 40 +---
.../core/util/shell/ShellOptionsJC.java | 12 ++
.../core/util/shell/ShellConfigTest.java| 37 ++
.../core/util/shell/ShellSetInstanceTest.java | 15 +---
5 files changed, 93 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af058765/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index a71b7e1..2a7a48c 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -31,6 +31,8 @@ import
org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Contains a list of property keys recognized by the Accumulo client and
convenience methods for setting them.
@@ -38,6 +40,8 @@ import
org.apache.commons.configuration.PropertiesConfiguration;
* @since 1.6.0
*/
public class ClientConfiguration extends CompositeConfiguration {
+ private static final Logger log =
LoggerFactory.getLogger(ClientConfiguration.class);
+
public static final String USER_ACCUMULO_DIR_NAME = ".accumulo";
public static final String USER_CONF_FILENAME = "config";
public static final String GLOBAL_CONF_FILENAME = "client.conf";
@@ -146,6 +150,10 @@ public class ClientConfiguration extends
CompositeConfiguration {
configs.add(new PropertiesConfiguration(conf));
}
}
+ // We couldn't find the client configuration anywhere
+ if (configs.isEmpty()) {
+log.warn("Found no client.conf in default paths. Using default client
configuration values.");
+ }
return new ClientConfiguration(configs);
} catch (ConfigurationException e) {
throw new IllegalStateException("Error loading client configuration", e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af058765/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index 1f14b6f..8cfb689 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -431,27 +431,41 @@ public class Shell extends ShellOptions {
}
}
+ /**
+ * Get the ZooKeepers. Use the value passed in (if there was one), then fall
back to the ClientConf, finally trying the accumulo-site.xml.
+ *
+ * @param keepers
+ * ZooKeepers passed to the shell
+ * @param clientConfig
+ * ClientConfiguration instance
+ * @return The ZooKeepers to connect to
+ */
+ static String getZooKeepers(String keepers, ClientConfiguration
clientConfig, AccumuloConfiguration conf) {
+if (null != keepers) {
+ return keepers;
+}
+
+if (clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
+ return clientConfig.get(ClientProperty.INSTANCE_ZK_HOST);
+}
+
+return conf.get
accumulo git commit: ACCUMULO-3911 change tests to be consistent with more knowledge about the state of the WALs
Repository: accumulo
Updated Branches:
refs/heads/master 29fdbfbb7 -> 245d724ad
ACCUMULO-3911 change tests to be consistent with more knowledge about the state
of the WALs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/245d724a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/245d724a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/245d724a
Branch: refs/heads/master
Commit: 245d724ad7e2ac7b12c243bb6f9718c656bc29bf
Parents: 29fdbfb
Author: Eric Newton
Authored: Wed Jun 24 12:15:44 2015 -0400
Committer: Eric Newton
Committed: Wed Jun 24 12:15:44 2015 -0400
--
.../gc/replication/CloseWriteAheadLogReferencesTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/245d724a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
--
diff --git
a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
index af8a9d0..7460b66 100644
---
a/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
+++
b/server/gc/src/test/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java
@@ -111,7 +111,7 @@ public class CloseWriteAheadLogReferencesTest {
}
@Test
- public void unusedWalsAreClosed() throws Exception {
+ public void unclosedWalsLeaveStatusOpen() throws Exception {
Set wals = Collections.emptySet();
Instance inst = new MockInstance(testName.getMethodName());
Connector conn = inst.getConnector("root", new PasswordToken(""));
@@ -127,11 +127,11 @@ public class CloseWriteAheadLogReferencesTest {
Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
Entry entry = Iterables.getOnlyElement(s);
Status status = Status.parseFrom(entry.getValue().get());
-Assert.assertTrue(status.getClosed());
+Assert.assertFalse(status.getClosed());
}
@Test
- public void usedWalsAreNotClosed() throws Exception {
+ public void closedWalsUpdateStatus() throws Exception {
String file = "file:/accumulo/wal/tserver+port/12345";
Set wals = Collections.singleton(file);
Instance inst = new MockInstance(testName.getMethodName());
@@ -148,7 +148,7 @@ public class CloseWriteAheadLogReferencesTest {
Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
Entry entry = Iterables.getOnlyElement(s);
Status status = Status.parseFrom(entry.getValue().get());
-Assert.assertFalse(status.getClosed());
+Assert.assertTrue(status.getClosed());
}
@Test
