flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject flink git commit: [hotfix] Include Hadoop version into EnvironmentInformation
Date Sun, 30 Aug 2015 11:34:03 GMT
Repository: flink
Updated Branches:
  refs/heads/release-0.10.0-milestone-1 1b31265e2 -> 8d5656732


[hotfix] Include Hadoop version into EnvironmentInformation


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8d565673
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8d565673
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8d565673

Branch: refs/heads/release-0.10.0-milestone-1
Commit: 8d565673206dc1ff27df08a22b4afef7f6c75430
Parents: 1b31265
Author: Robert Metzger <rmetzger@apache.org>
Authored: Fri Aug 28 16:41:21 2015 +0200
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Sun Aug 30 13:30:16 2015 +0200

----------------------------------------------------------------------
 docs/setup/yarn_setup.md                              | 14 ++++++++++----
 .../flink/runtime/util/EnvironmentInformation.java    |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/8d565673/docs/setup/yarn_setup.md
----------------------------------------------------------------------
diff --git a/docs/setup/yarn_setup.md b/docs/setup/yarn_setup.md
index 8915c83..2b9cecc 100644
--- a/docs/setup/yarn_setup.md
+++ b/docs/setup/yarn_setup.md
@@ -57,7 +57,7 @@ Apache [Hadoop YARN](http://hadoop.apache.org/) is a cluster resource management
 
 **Requirements**
 
-- Apache Hadoop 2.2
+- at least Apache Hadoop 2.2
 - HDFS (Hadoop Distributed File System) (or another distributed file system supported by
Hadoop)
 
 If you have troubles using the Flink YARN client, have a look in the [FAQ section]({{ site.baseurl
}}/faq.html).
@@ -79,7 +79,8 @@ tar xvzf flink-{{ site.version }}-bin-hadoop2.tgz
 cd flink-{{site.version }}/
 ~~~
 
-If you want to build the YARN .tgz file from sources, follow the [build instructions](building.html).
You can find the result of the build in `flink-dist/target/flink-{{ site.version }}-bin/flink-{{
site.version }}/` (*Note: The version might be different for you* ).
+If you want to build the YARN .tgz file from sources, follow the [build instructions](building.html).

+You can find the result of the build in `flink-dist/target/flink-{{ site.version }}-bin/flink-{{
site.version }}/` (*Note: The version might be different for you* ).
 
 
 #### Start a Session
@@ -208,9 +209,14 @@ Please note that the client then expects the `-yn` value to be set (number
of Ta
 ./bin/flink run -m yarn-cluster -yn 2 ./examples/flink-java-examples-{{site.version }}-WordCount.jar

 ~~~
 
-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).
+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.
+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.
+
+Note: It is possible to combine `-m yarn-cluster` with a detached YARN submission (`-yd`)
to "fire and forget" a Flink job
+to the YARN cluster. In this case, your application will not get any accumulator results
or exceptions from the ExecutionEnvironment.execute() call!
 
 
 ## Recovery behavior of Flink on YARN

http://git-wip-us.apache.org/repos/asf/flink/blob/8d565673/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
index dde422b..f243027 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.hadoop.util.VersionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -280,6 +281,7 @@ public class EnvironmentInformation {
 			log.info(" JVM: " + jvmVersion);
 			log.info(" Maximum heap size: " + maxHeapMegabytes + " MiBytes");
 			log.info(" JAVA_HOME: " + (javaHome == null ? "(not set)" : javaHome));
+			log.info(" Hadoop version: " + VersionInfo.getVersion());
 
 			if (options.length == 0) {
 				log.info(" JVM Options: (none)");


Mime
View raw message