You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2015/08/26 12:40:43 UTC
[1/4] flink git commit: [FLINK-2270] [docs] Fix typo in docs
(enableMonitoring => enableCheckpointing)
Repository: flink
Updated Branches:
refs/heads/release-0.9 11a1cf45c -> d445a3318
[FLINK-2270] [docs] Fix typo in docs (enableMonitoring => enableCheckpointing)
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3f2cf5ac
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3f2cf5ac
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3f2cf5ac
Branch: refs/heads/release-0.9
Commit: 3f2cf5acf0c8a3bed6a34cefa07ee4cd3655b089
Parents: 11a1cf4
Author: Ufuk Celebi <uc...@apache.org>
Authored: Wed Aug 26 10:55:20 2015 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Wed Aug 26 12:39:38 2015 +0200
----------------------------------------------------------------------
docs/apis/streaming_guide.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3f2cf5ac/docs/apis/streaming_guide.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming_guide.md b/docs/apis/streaming_guide.md
index e9fc264..159d019 100644
--- a/docs/apis/streaming_guide.md
+++ b/docs/apis/streaming_guide.md
@@ -1431,7 +1431,7 @@ To use fault tolerant Kafka Sources, monitoring of the topology needs to be enab
<div data-lang="java" markdown="1">
{% highlight java %}
final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-env.enableMonitoring(5000);
+env.enableCheckpointing(5000);
{% endhighlight %}
</div>
</div>
[4/4] flink git commit: [hotfix] Allow setting FLINK_CONF_DIR by hand
Posted by uc...@apache.org.
[hotfix] Allow setting FLINK_CONF_DIR by hand
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/594f4f7c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/594f4f7c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/594f4f7c
Branch: refs/heads/release-0.9
Commit: 594f4f7ce8ca22168bf3879e913923817edd2278
Parents: 7e44712
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Tue Aug 25 19:26:29 2015 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Wed Aug 26 12:39:39 2015 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/config.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/594f4f7c/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 341144c..2c63cb8 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -125,7 +125,7 @@ FLINK_LIB_DIR=$FLINK_ROOT_DIR/lib
# The above lib path is used by the shell script to retrieve jars in a
# directory, so it needs to be unmangled.
FLINK_ROOT_DIR_MANGLED=`manglePath "$FLINK_ROOT_DIR"`
-FLINK_CONF_DIR=$FLINK_ROOT_DIR_MANGLED/conf
+if [ -z "$FLINK_CONF_DIR" ]; then FLINK_CONF_DIR=$FLINK_ROOT_DIR_MANGLED/conf; fi
FLINK_BIN_DIR=$FLINK_ROOT_DIR_MANGLED/bin
FLINK_LOG_DIR=$FLINK_ROOT_DIR_MANGLED/log
YAML_CONF=${FLINK_CONF_DIR}/flink-conf.yaml
[2/4] flink git commit: [hotfix] Fixes auto type registration
settings in ExecutionConfig
Posted by uc...@apache.org.
[hotfix] Fixes auto type registration settings in ExecutionConfig
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7e447120
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7e447120
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7e447120
Branch: refs/heads/release-0.9
Commit: 7e447120eab3700d788a3a968392007f27773429
Parents: 3f2cf5a
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed Aug 26 10:56:27 2015 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Wed Aug 26 12:39:39 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flink/api/common/ExecutionConfig.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7e447120/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
index 4974295..c4b5874 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
@@ -78,7 +78,7 @@ public class ExecutionConfig implements Serializable {
private boolean objectReuse = false;
- private boolean disableAutoTypeRegistration = false;
+ private boolean autoTypeRegistrationEnabled = true;
private boolean forceAvro = false;
@@ -558,7 +558,7 @@ public class ExecutionConfig implements Serializable {
public boolean isAutoTypeRegistrationDisabled() {
- return disableAutoTypeRegistration;
+ return !autoTypeRegistrationEnabled;
}
/**
@@ -567,7 +567,7 @@ public class ExecutionConfig implements Serializable {
*
*/
public void disableAutoTypeRegistration() {
- this.disableAutoTypeRegistration = false;
+ this.autoTypeRegistrationEnabled = false;
}
[3/4] flink git commit: [hotfix] Add notice about using
FLINK_CONF_DIR in Yarn Setup
Posted by uc...@apache.org.
[hotfix] Add notice about using FLINK_CONF_DIR in Yarn Setup
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d445a331
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d445a331
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d445a331
Branch: refs/heads/release-0.9
Commit: d445a33184bcf3b25cab3599f04efb5a9b50af6f
Parents: 594f4f7
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Wed Aug 26 12:26:56 2015 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Wed Aug 26 12:39:39 2015 +0200
----------------------------------------------------------------------
docs/setup/yarn_setup.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d445a331/docs/setup/yarn_setup.md
----------------------------------------------------------------------
diff --git a/docs/setup/yarn_setup.md b/docs/setup/yarn_setup.md
index 6fcaec0..1d9fa09 100644
--- a/docs/setup/yarn_setup.md
+++ b/docs/setup/yarn_setup.md
@@ -208,6 +208,8 @@ Please note that the client then expects the `-yn` value to be set (number of Ta
The command line options of the YARN session are also available with the `./bin/flink` tool. They are prefixed with a `y` or `yarn` (for the long argument options).
+Note: You can use a different configuration directory per job by setting the environment variable `FLINK_CONF_DIR`. To use this copy the `conf` directory from the Flink distribution and modify, for example, the logging settings on a per-job basis.
+
## Recovery behavior of Flink on YARN