You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sr...@apache.org on 2018/04/18 11:14:55 UTC

flink git commit: [FLINK-9011] Changed some verbose YarnResourceManager logging from INFO to DEBUG level

Repository: flink
Updated Branches:
  refs/heads/master 064db5367 -> d5ec911f5


[FLINK-9011] Changed some verbose YarnResourceManager logging from INFO to DEBUG level

This closes #5712.


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

Branch: refs/heads/master
Commit: d5ec911f55784de57ca9d6421a0b3c947f1530f2
Parents: 064db53
Author: yanghua <ya...@gmail.com>
Authored: Sat Mar 17 10:54:41 2018 +0800
Committer: Stefan Richter <s....@data-artisans.com>
Committed: Wed Apr 18 13:13:50 2018 +0200

----------------------------------------------------------------------
 .../YARNSessionCapacitySchedulerITCase.java     |  2 +-
 .../main/java/org/apache/flink/yarn/Utils.java  | 24 ++++++++++++--------
 .../apache/flink/yarn/YarnResourceManager.java  |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d5ec911f/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
index ac8eaa0..3c442b9 100644
--- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
+++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
@@ -551,7 +551,7 @@ public class YARNSessionCapacitySchedulerITCase extends YarnTestBase {
 			Assert.assertNotNull("Unable to locate JobManager log", jobmanagerLog);
 			content = FileUtils.readFileToString(jobmanagerLog);
 			// TM was started with 1024 but we cut off 70% (NOT THE DEFAULT VALUE)
-			String expected = "Starting TaskManagers with command: $JAVA_HOME/bin/java -Xms244m -Xmx244m -XX:MaxDirectMemorySize=780m";
+			String expected = "Starting TaskManagers";
 			Assert.assertTrue("Expected string '" + expected + "' not found in JobManager log: '" + jobmanagerLog + "'",
 				content.contains(expected));
 			expected = " (2/2) (attempt #0) to ";

http://git-wip-us.apache.org/repos/asf/flink/blob/d5ec911f/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
index b895784..2ca4cb6 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
@@ -156,7 +156,7 @@ public final class Utils {
 
 		Path dst = new Path(homedir, suffix);
 
-		LOG.info("Copying from " + localSrcPath + " to " + dst);
+		LOG.debug("Copying from " + localSrcPath + " to " + dst);
 
 		fs.copyFromLocalFile(false, true, localSrcPath, dst);
 
@@ -381,16 +381,16 @@ public final class Utils {
 		require(yarnClientUsername != null, "Environment variable %s not set", YarnConfigKeys.ENV_HADOOP_USER_NAME);
 
 		final String remoteKeytabPath = env.get(YarnConfigKeys.KEYTAB_PATH);
-		log.info("TM:remote keytab path obtained {}", remoteKeytabPath);
-
 		final String remoteKeytabPrincipal = env.get(YarnConfigKeys.KEYTAB_PRINCIPAL);
-		log.info("TM:remote keytab principal obtained {}", remoteKeytabPrincipal);
-
 		final String remoteYarnConfPath = env.get(YarnConfigKeys.ENV_YARN_SITE_XML_PATH);
-		log.info("TM:remote yarn conf path obtained {}", remoteYarnConfPath);
-
 		final String remoteKrb5Path = env.get(YarnConfigKeys.ENV_KRB5_PATH);
-		log.info("TM:remote krb5 path obtained {}", remoteKrb5Path);
+
+		if (log.isDebugEnabled()) {
+			log.debug("TM:remote keytab path obtained {}", remoteKeytabPath);
+			log.debug("TM:remote keytab principal obtained {}", remoteKeytabPrincipal);
+			log.debug("TM:remote yarn conf path obtained {}", remoteYarnConfPath);
+			log.debug("TM:remote krb5 path obtained {}", remoteKrb5Path);
+		}
 
 		String classPathString = env.get(ENV_FLINK_CLASSPATH);
 		require(classPathString != null, "Environment variable %s not set", YarnConfigKeys.ENV_FLINK_CLASSPATH);
@@ -450,7 +450,7 @@ public final class Utils {
 					homeDirPath,
 					"").f1;
 
-				log.info("Prepared local resource for modified yaml: {}", flinkConf);
+				log.debug("Prepared local resource for modified yaml: {}", flinkConf);
 			} finally {
 				try {
 					FileUtils.deleteFileOrDirectory(taskManagerConfigFile);
@@ -497,7 +497,11 @@ public final class Utils {
 				flinkConfig, tmParams, ".", ApplicationConstants.LOG_DIR_EXPANSION_VAR,
 				hasLogback, hasLog4j, hasKrb5, taskManagerMainClass);
 
-		log.info("Starting TaskManagers with command: " + launchCommand);
+		if (log.isDebugEnabled()) {
+			log.debug("Starting TaskManagers with command: " + launchCommand);
+		} else {
+			log.info("Starting TaskManagers");
+		}
 
 		ContainerLaunchContext ctx = Records.newRecord(ContainerLaunchContext.class);
 		ctx.setCommands(Collections.singletonList(launchCommand));

http://git-wip-us.apache.org/repos/asf/flink/blob/d5ec911f/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
index bfe7d65..4eb4fc9 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnResourceManager.java
@@ -461,7 +461,7 @@ public class YarnResourceManager extends ResourceManager<YarnWorkerNode> impleme
 		final ContaineredTaskManagerParameters taskManagerParameters =
 				ContaineredTaskManagerParameters.create(flinkConfig, resource.getMemory(), numSlots);
 
-		log.info("TaskExecutor {} will be started with container size {} MB, JVM heap size {} MB, " +
+		log.debug("TaskExecutor {} will be started with container size {} MB, JVM heap size {} MB, " +
 				"JVM direct memory limit {} MB",
 				containerId,
 				taskManagerParameters.taskManagerTotalMemoryMB(),