You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ma...@apache.org on 2016/06/02 00:28:46 UTC
incubator-gearpump git commit: refine the deploy config doc
Repository: incubator-gearpump
Updated Branches:
refs/heads/master 04c3975d6 -> e78d6cca5
refine the deploy config doc
rebased on the last master.
Author: yghan <yg...@cupdata.com>
Closes #32 from PipsqueakH/GEARPUMP-143.
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/e78d6cca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/e78d6cca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/e78d6cca
Branch: refs/heads/master
Commit: e78d6cca584b43232493aeee40687411eed04fea
Parents: 04c3975
Author: yghan <yg...@cupdata.com>
Authored: Thu Jun 2 08:28:41 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Thu Jun 2 08:28:41 2016 +0800
----------------------------------------------------------------------
docs/deployment-configuration.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/e78d6cca/docs/deployment-configuration.md
----------------------------------------------------------------------
diff --git a/docs/deployment-configuration.md b/docs/deployment-configuration.md
index c08900e..5799f82 100644
--- a/docs/deployment-configuration.md
+++ b/docs/deployment-configuration.md
@@ -7,10 +7,10 @@ description: Gearpump Configuration
## Master and Worker configuration
-Master and Worker daemons will only read configuration from conf/gear.conf.
+Master and Worker daemons will only read configuration from conf/gear.conf.
Master reads configuration from section master and gearpump:
-
+
```bash
master {
}
@@ -18,7 +18,7 @@ gearpump{
}
```
-Worker reads configuration from section worker and gearpump:
+Worker reads configuration from section worker and gearpump:
```bash
worker {
@@ -29,17 +29,17 @@ gearpump{
## Configuration for user submitted application job
-For user application job, it will read configuration file `gear.conf` and `application.conf` from classpath, while `application.conf` has higher priority.
+For user application job, it will read configuration file `gear.conf` and `application.conf` from classpath, while `application.conf` has higher priority.
The default classpath contains:
1. `conf/`
-2. current working directory.
+2. current working directory.
For example, you can put a `application.conf` on your working directory, and then it will be effective when you submit a new job application.
## Logging
-To change the log level, you need to change both `gear.conf`, and `log4j.properties`.
+To change the log level, you need to change both `gear.conf`, and `log4j.properties`.
### To change the log level for master and worker daemon
@@ -89,4 +89,4 @@ This is the default configuration for `gear.conf`.
| gearpump.shared-thread-pool-dispatcher | default Dispatcher with "fork-join-executor" | default shared thread pool dispatcher |
| gearpump.single-thread-dispatcher | PinnedDispatcher | default single thread dispatcher |
| gearpump.serialization-framework | "org.apache.gearpump.serializer.FastKryoSerializationFramework" | Gearpump has built-in serialization framework using Kryo. Users are allowed to use a different serialization framework, like Protobuf. See `org.apache.gearpump.serializer.FastKryoSerializationFramework` to find how a custom serialization framework can be defined |
-| worker.executor-share-same-jvm-as-worker | false | whether the executor actor is started in the same jvm(process) from which running the worker actor |
\ No newline at end of file
+| worker.executor-share-same-jvm-as-worker | false | whether the executor actor is started in the same jvm(process) from which running the worker actor, the intention of this setting is for the convenience of single machine debugging, however, the app jar need to be added to the worker's classpath when you set it true and have a 'real' worker in the cluster |
\ No newline at end of file