You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2020/05/19 12:59:52 UTC
[flink] branch release-1.11 updated (91a4c2a -> 39a6fc0)
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a change to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 91a4c2a [FLINK-17520] [doc] Use new resolveOuterSchemaCompatibility in custom serialization docs
new 32e8230 [FLINK-17527][flink-dist] Rename yarn log4j/logback configuration files so that they could be reused
new 39a6fc0 [FLINK-17527][flink-dist] Make kubernetes-session.sh use session log4j/logback configuration files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/monitoring/logging.md | 2 +-
docs/monitoring/logging.zh.md | 2 +-
.../conf/{log4j-yarn-session.properties => log4j-session.properties} | 0
.../src/main/flink-bin/conf/{logback-yarn.xml => logback-session.xml} | 0
flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh | 2 +-
flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh | 2 +-
flink-scala-shell/start-script/start-scala-shell.sh | 4 ++--
7 files changed, 6 insertions(+), 6 deletions(-)
rename flink-dist/src/main/flink-bin/conf/{log4j-yarn-session.properties => log4j-session.properties} (100%)
rename flink-dist/src/main/flink-bin/conf/{logback-yarn.xml => logback-session.xml} (100%)
[flink] 01/02: [FLINK-17527][flink-dist] Rename yarn log4j/logback
configuration files so that they could be reused
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 32e82306193d16d78f949a1fb9d791131ff63457
Author: wangyang0918 <da...@alibaba-inc.com>
AuthorDate: Mon May 18 15:52:31 2020 +0800
[FLINK-17527][flink-dist] Rename yarn log4j/logback configuration files so that they could be reused
---
docs/monitoring/logging.md | 2 +-
docs/monitoring/logging.zh.md | 2 +-
.../conf/{log4j-yarn-session.properties => log4j-session.properties} | 0
.../src/main/flink-bin/conf/{logback-yarn.xml => logback-session.xml} | 0
flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh | 2 +-
flink-scala-shell/start-script/start-scala-shell.sh | 4 ++--
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/monitoring/logging.md b/docs/monitoring/logging.md
index 842a0af..5debe09 100644
--- a/docs/monitoring/logging.md
+++ b/docs/monitoring/logging.md
@@ -35,7 +35,7 @@ Log4j2 is controlled using property files. In Flink's case, the file is usually
Flink ships with the following default properties files:
- `log4j-cli.properties`: Used by the Flink command line client (e.g. `flink run`) (not code executed on the cluster)
-- `log4j-yarn-session.properties`: Used by the Flink command line client when starting a YARN session (`yarn-session.sh`)
+- `log4j-session.properties`: Used by the Flink command line client when starting a YARN session (`yarn-session.sh`)
- `log4j.properties`: JobManager/Taskmanager logs (both standalone and YARN)
### Compatibility with Log4j1
diff --git a/docs/monitoring/logging.zh.md b/docs/monitoring/logging.zh.md
index ec0b85b..c2b2d42 100644
--- a/docs/monitoring/logging.zh.md
+++ b/docs/monitoring/logging.zh.md
@@ -35,7 +35,7 @@ Log4j2 is controlled using property files. In Flink's case, the file is usually
Flink ships with the following default properties files:
- `log4j-cli.properties`: Used by the Flink command line client (e.g. `flink run`) (not code executed on the cluster)
-- `log4j-yarn-session.properties`: Used by the Flink command line client when starting a YARN session (`yarn-session.sh`)
+- `log4j-session.properties`: Used by the Flink command line client when starting a YARN session (`yarn-session.sh`)
- `log4j.properties`: JobManager/Taskmanager logs (both standalone and YARN)
### Compatibility with Log4j1
diff --git a/flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties b/flink-dist/src/main/flink-bin/conf/log4j-session.properties
similarity index 100%
rename from flink-dist/src/main/flink-bin/conf/log4j-yarn-session.properties
rename to flink-dist/src/main/flink-bin/conf/log4j-session.properties
diff --git a/flink-dist/src/main/flink-bin/conf/logback-yarn.xml b/flink-dist/src/main/flink-bin/conf/logback-session.xml
similarity index 100%
rename from flink-dist/src/main/flink-bin/conf/logback-yarn.xml
rename to flink-dist/src/main/flink-bin/conf/logback-session.xml
diff --git a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
index 766d5a4..8d6dcc3 100755
--- a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
+++ b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
@@ -32,7 +32,7 @@ JVM_ARGS="$JVM_ARGS -Xmx512m"
CC_CLASSPATH=`manglePathList $(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPATHS`
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-yarn-session-$HOSTNAME.log
-log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-yarn-session.properties -Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j-yarn-session.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-yarn.xml"
+log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-session.properties -Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j-session.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-session.xml"
$JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.yarn.cli.FlinkYarnSessionCli -j "$FLINK_LIB_DIR"/flink-dist*.jar "$@"
diff --git a/flink-scala-shell/start-script/start-scala-shell.sh b/flink-scala-shell/start-script/start-scala-shell.sh
index 86e24d2..e083008 100644
--- a/flink-scala-shell/start-script/start-scala-shell.sh
+++ b/flink-scala-shell/start-script/start-scala-shell.sh
@@ -88,8 +88,8 @@ then
LOGBACK_CONFIG=logback.xml
elif [[ $1 = "yarn" ]]
then
- LOG4J_CONFIG=log4j-yarn-session.properties
- LOGBACK_CONFIG=logback-yarn.xml
+ LOG4J_CONFIG=log4j-session.properties
+ LOGBACK_CONFIG=logback-session.xml
FLINK_CLASSPATH=$FLINK_CLASSPATH:$HADOOP_CLASSPATH:$HADOOP_CONF_DIR:$YARN_CONF_DIR
fi
[flink] 02/02: [FLINK-17527][flink-dist] Make kubernetes-session.sh
use session log4j/logback configuration files
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 39a6fc03f03b4feb9970bf5d21777180e43faed3
Author: wangyang0918 <da...@alibaba-inc.com>
AuthorDate: Mon May 18 15:53:55 2020 +0800
[FLINK-17527][flink-dist] Make kubernetes-session.sh use session log4j/logback configuration files
This closes #12236.
---
docs/monitoring/logging.md | 2 +-
docs/monitoring/logging.zh.md | 2 +-
flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/monitoring/logging.md b/docs/monitoring/logging.md
index 5debe09..4fbfb59 100644
--- a/docs/monitoring/logging.md
+++ b/docs/monitoring/logging.md
@@ -35,7 +35,7 @@ Log4j2 is controlled using property files. In Flink's case, the file is usually
Flink ships with the following default properties files:
- `log4j-cli.properties`: Used by the Flink command line client (e.g. `flink run`) (not code executed on the cluster)
-- `log4j-session.properties`: Used by the Flink command line client when starting a YARN session (`yarn-session.sh`)
+- `log4j-session.properties`: Used by the Flink command line client when starting a YARN or Kubernetes session (`yarn-session.sh`, `kubernetes-session.sh`)
- `log4j.properties`: JobManager/Taskmanager logs (both standalone and YARN)
### Compatibility with Log4j1
diff --git a/docs/monitoring/logging.zh.md b/docs/monitoring/logging.zh.md
index c2b2d42..a690e11 100644
--- a/docs/monitoring/logging.zh.md
+++ b/docs/monitoring/logging.zh.md
@@ -35,7 +35,7 @@ Log4j2 is controlled using property files. In Flink's case, the file is usually
Flink ships with the following default properties files:
- `log4j-cli.properties`: Used by the Flink command line client (e.g. `flink run`) (not code executed on the cluster)
-- `log4j-session.properties`: Used by the Flink command line client when starting a YARN session (`yarn-session.sh`)
+- `log4j-session.properties`: Used by the Flink command line client when starting a YARN or Kubernetes session (`yarn-session.sh`, `kubernetes-session.sh`)
- `log4j.properties`: JobManager/Taskmanager logs (both standalone and YARN)
### Compatibility with Log4j1
diff --git a/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh b/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh
index a2cb456..dfe4895 100644
--- a/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh
+++ b/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh
@@ -32,7 +32,7 @@ JVM_ARGS="$JVM_ARGS -Xmx512m"
CC_CLASSPATH=`manglePathList $(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPATHS`
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-k8s-session-$HOSTNAME.log
-log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-console.properties -Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j-console.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-console.xml"
+log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-session.properties -Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j-session.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-session.xml"
export FLINK_CONF_DIR