You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by mw...@apache.org on 2017/10/26 15:20:26 UTC
[fluo] branch master updated: Fixes #901 Adding empty lines on the
properties to make it easier to parse (#961)
This is an automated email from the ASF dual-hosted git repository.
mwalch 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 c6bdbe5 Fixes #901 Adding empty lines on the properties to make it easier to parse (#961)
c6bdbe5 is described below
commit c6bdbe5437c91df4560985128078688906f8d7a9
Author: Lucas Lima Vieira <li...@gmail.com>
AuthorDate: Thu Oct 26 13:20:24 2017 -0200
Fixes #901 Adding empty lines on the properties to make it easier to parse (#961)
---
.../java/org/apache/fluo/core/impl/VisibilityCache.java | 3 ++-
modules/distribution/src/main/config/fluo-app.properties | 15 ++++++++++++---
.../distribution/src/main/config/fluo-conn.properties | 13 ++++++++-----
.../src/main/config/fluo.properties.deprecated | 16 ++++++++++++++++
4 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java b/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
index eeb1693..4d75fbd 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
@@ -49,7 +49,8 @@ public class VisibilityCache {
VisibilityCache(FluoConfiguration conf) {
visCache = CacheBuilder.newBuilder()
- .expireAfterAccess(FluoConfigurationImpl.getVisibilityCacheTimeout(conf, TimeUnit.MILLISECONDS),
+ .expireAfterAccess(
+ FluoConfigurationImpl.getVisibilityCacheTimeout(conf, TimeUnit.MILLISECONDS),
TimeUnit.MILLISECONDS)
.maximumWeight(FluoConfigurationImpl.getVisibilityCacheSize(conf)).weigher(new VisWeigher())
.concurrencyLevel(10).build();
diff --git a/modules/distribution/src/main/config/fluo-app.properties b/modules/distribution/src/main/config/fluo-app.properties
index 54d41ee..8a1110a 100644
--- a/modules/distribution/src/main/config/fluo-app.properties
+++ b/modules/distribution/src/main/config/fluo-app.properties
@@ -22,14 +22,17 @@
## Application properties
## ----------------------
-## Specifies an observer provider. This should be the name of a class that
+## Specifies an observer provider. This should be the name of a class that
## implements org.apache.fluo.api.observer.ObserverProvider.
#fluo.observer.provider=com.foo.AppObserverProvider
+
## Observer jars in this directory are copied to the DFS (specified by fluo.dfs.root) during initialization.
## If this property is set, fluo.observer.jars.url should not be set.
#fluo.observer.init.dir=/path/to/observer/jars/
+
## Observer jars are retreived from this URL. If set, fluo.observer.init.dir should not be set.
#fluo.observer.jars.url=hdfs://localhost:8020/path/to/observer/jars/
+
## Properties with a prefix of fluo.app.* can easily be retrieved by a Fluo
## application running on any node in the cluster.
#fluo.app.key1=val1
@@ -43,14 +46,19 @@ fluo.dfs.root=hdfs://localhost:8020/fluo
## -------------------
## Accumulo instance to connect to
fluo.accumulo.instance=
+
## Accumulo table to initialize
fluo.accumulo.table=\${fluo.connection.application.name}
+
## Accumulo user
fluo.accumulo.user=
+
## Accumulo password
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.
#fluo.accumulo.jars=/path/to/a.jar,/path/to/b.jar
@@ -66,10 +74,11 @@ fluo.accumulo.password=
## Loader properties
## -----------------
-## Number of threads each loader runs. Can set to zero for no threads, thread
-## adding Loader will execute. Must also set fluo.loader.queue.size to zero
+## Number of threads each loader runs. Can set to zero for no threads, thread
+## adding Loader will execute. Must also set fluo.loader.queue.size to zero
## when setting this to zero.
#fluo.loader.num.threads=10
+
## Queue size of loader
#fluo.loader.queue.size=10
diff --git a/modules/distribution/src/main/config/fluo-conn.properties b/modules/distribution/src/main/config/fluo-conn.properties
index 36a39b4..3f98e4e 100644
--- a/modules/distribution/src/main/config/fluo-conn.properties
+++ b/modules/distribution/src/main/config/fluo-conn.properties
@@ -15,22 +15,25 @@
# Fluo Connection properties
############################
-# NOTE - All properties that have a default are set with it. Uncomment
+# NOTE - All properties that have a default are set with it. Uncomment
# a property if you want to use a value different than the default.
# Properties that have no default are uncommented and must be set by
# the user.
## Zookeeper connection string specifying host and chroot where Fluo stores data.
## A chroot directory suffix must be specified but doesn't need to be named
-## '/fluo'. If not specified, a Fluo application cannot be initialized.
+## '/fluo'. If not specified, a Fluo application cannot be initialized.
#fluo.connection.zookeepers=localhost/fluo
+
## Zookeeper timeout
#fluo.connection.zookeeper.timeout=30000
+
## Connection retry timeout (in milliseconds). Set to -1 to retry forever.
#fluo.connection.retry.timeout.ms=-1
+
## Set this property before initialization and Fluo will lock down all zookeeper
-## using this secret. After initialization, the same secret must always be
-## supplied for any connection or services. If not set, then all data in
-## zookeeper will be world readable. It's a good idea to set this property.
+## using this secret. After initialization, the same secret must always be
+## supplied for any connection or services. If not set, then all data in
+## zookeeper will be world readable. It's a good idea to set this property.
## Could use the command : head -c 9 /dev/random | base64
#fluo.connection.zookeeper.secret=
diff --git a/modules/distribution/src/main/config/fluo.properties.deprecated b/modules/distribution/src/main/config/fluo.properties.deprecated
index 4bec6aa..324f022 100644
--- a/modules/distribution/src/main/config/fluo.properties.deprecated
+++ b/modules/distribution/src/main/config/fluo.properties.deprecated
@@ -28,22 +28,29 @@
# -----------------
# Fluo application name
fluo.client.application.name=
+
# Zookeeper connection string specifying host and chroot where Fluo stores data.
# A chroot directory suffix must be specified but doesn't need to be named
# '/fluo'. If not specified, a Fluo application cannot be initialized.
# Interpolation (i.e \${fluo.client.accumulo.zookeepers}/fluo) can be used
# when setting this to reuse Accumulo's zookeeper connection string.
#fluo.client.zookeeper.connect=localhost/fluo
+
# Zookeeper timeout
#fluo.client.zookeeper.timeout=30000
+
# Accumulo instance to connect to
fluo.client.accumulo.instance=
+
# Accumulo user
fluo.client.accumulo.user=
+
# Accumulo password
fluo.client.accumulo.password=
+
# Accumulo zookeepers
#fluo.client.accumulo.zookeepers=localhost
+
# Client retry timeout (in milliseconds). Set to -1 to retry forever.
#fluo.client.retry.timeout.ms=-1
@@ -51,8 +58,10 @@ fluo.client.accumulo.password=
# ----------------
# Accumulo table to initialize
fluo.admin.accumulo.table=\${fluo.client.application.name}
+
# HDFS root path. Should match 'fs.defaultFS' property in Hadoop's core-site.xml
fluo.admin.hdfs.root=hdfs://localhost:10000
+
# Fluo uses iterators within Accumulo tablet servers, therefore Accumulo per
# table classpath need to be configured with a comma seperated list of uris
# where Accumulo can find Fluo jars. These jars should be reachable from
@@ -83,6 +92,7 @@ fluo.admin.accumulo.classpath=\${fluo.admin.hdfs.root}/fluo/lib/fluo-api-${proje
# adding Loader will execute. Must also set fluo.loader.queue.size to zero
# when setting this to zero.
#fluo.loader.num.threads=10
+
# Queue size of loader
#fluo.loader.queue.size=10
@@ -90,18 +100,23 @@ fluo.admin.accumulo.classpath=\${fluo.admin.hdfs.root}/fluo/lib/fluo-api-${proje
# ----------------
# Number of oracle yarn instances
#fluo.yarn.oracle.instances=1
+
# Max memory of Oracle yarn containers (in MB)
#fluo.yarn.oracle.max.memory.mb=512
+
# Number of oracle virtual cores
#fluo.yarn.oracle.num.cores=1
+
# Number of worker yarn instances
#fluo.yarn.worker.instances=1
+
# Max memory of worker YARN containers (in MB). If YARN is killing worker processes consider
# increasing twill.java.reserved.memory.mb (which defaults to 200 and is set in yarn-site.xml).
# The twill.java.reserved.memory.mb config determines the gap between the YARN memory limit set
# below and the java -Xmx setting. For example, if max memory is 1024 and twill reserved memory
# is 200, the java -Xmx setting will be 1024-200 = 824 MB.
#fluo.yarn.worker.max.memory.mb=1024
+
# Number of worker virtual cores
#fluo.yarn.worker.num.cores=1
@@ -142,6 +157,7 @@ fluo.admin.accumulo.classpath=\${fluo.admin.hdfs.root}/fluo/lib/fluo-api-${proje
# -------------------
# Path to directory where MiniFluo stores its data
#fluo.mini.data.dir=\${env:FLUO_HOME}/apps/\${fluo.client.application.name}/mini
+
# Indicates if MiniFluo should start a MiniAccumulo cluster
#fluo.mini.start.accumulo=true
--
To stop receiving notification emails like this one, please contact
['"commits@fluo.apache.org" <co...@fluo.apache.org>'].