This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo.git
The following commit(s) were added to refs/heads/master by this push:
new 185a1cb fixes #973 default fluo.dfs.root to empty string (#974)
185a1cb is described below
commit 185a1cbfa57ba53896afcc5b1d685aea453e9404
Author: Keith Turner <[email protected]>
AuthorDate: Thu Nov 30 16:04:59 2017 -0500
fixes #973 default fluo.dfs.root to empty string (#974)
---
.../main/java/org/apache/fluo/api/config/FluoConfiguration.java | 4 ++--
.../src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java | 9 ++++++++-
modules/distribution/src/main/config/fluo-app.properties | 6 +++++-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
b/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
index 9d3ea6e..cf416c0 100644
---
a/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
+++
b/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
@@ -170,7 +170,7 @@ public class FluoConfiguration extends SimpleConfiguration {
*/
public static final String DFS_ROOT_PROP = DFS_PREFIX + ".root";
// DFS defaults
- public static final String DFS_ROOT_DEFAULT = "hdfs://localhost:8020/fluo";
+ public static final String DFS_ROOT_DEFAULT = "";
// Administration properties
private static final String ADMIN_PREFIX = FLUO_PREFIX + ".admin";
@@ -605,7 +605,7 @@ public class FluoConfiguration extends SimpleConfiguration {
* @since 1.2.0
*/
public String getDfsRoot() {
- return getNonEmptyString(DFS_ROOT_PROP, DFS_ROOT_DEFAULT);
+ return getString(DFS_ROOT_PROP, DFS_ROOT_DEFAULT);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
index 158b7d1..e711705 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
@@ -151,9 +151,16 @@ public class FluoAdminImpl implements FluoAdmin {
String accumuloJars;
if (!config.getAccumuloJars().trim().isEmpty()) {
+ if (config.getDfsRoot().trim().isEmpty()) {
+ throw new IllegalStateException("The property " +
FluoConfiguration.ACCUMULO_JARS_PROP
+ + " is set and " + FluoConfiguration.DFS_ROOT_PROP
+ + " is not set. So there is no where to copy the jars.");
+ }
accumuloJars = config.getAccumuloJars().trim();
- } else {
+ } else if (!config.getDfsRoot().trim().isEmpty()) {
accumuloJars = getJarsFromClasspath();
+ } else {
+ accumuloJars = "";
}
String accumuloClasspath;
diff --git a/modules/distribution/src/main/config/fluo-app.properties
b/modules/distribution/src/main/config/fluo-app.properties
index 8a1110a..bdddd5e 100644
--- a/modules/distribution/src/main/config/fluo-app.properties
+++ b/modules/distribution/src/main/config/fluo-app.properties
@@ -59,7 +59,11 @@ fluo.accumulo.password=
## Accumulo zookeepers
#fluo.accumulo.zookeepers=localhost
-## Optional - List of jars to provide to Accumulo. If not set, Fluo will find
jars on classpath.
+## Optional - List of jars to provide to Accumulo. The jars specified at
+## this location are copied to DFS (specified by fluo.dfs.root). Fluo runs
+## code inside Accumulo tablet servers. This property provides a way to
specify
+## where to find Fluo's server side Accumulo code. If not set, Fluo will
attempt
+## to find jars on classpath. This property is only used at initialization.
#fluo.accumulo.jars=/path/to/a.jar,/path/to/b.jar
# Transaction properties
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
