Added AKKA_LOG_LEVEL config constant.

johntiger2000 · Dec 18, 2014 · f96bca0 · f96bca0
1 parent fda5366
commit f96bca0
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -354,6 +354,11 @@ public final class ConfigConstants {
 	 * Log lifecycle events
 	 */
 	public static final String AKKA_LOG_LIFECYCLE_EVENTS = "akka.log.lifecycle.events";
+
+	/**
+	 * Log level for akka
+	 */
+	public static final String AKKA_LOG_LEVEL = "akka.loglevel";
 
 	// ----------------------------- Miscellaneous ----------------------------
 
@@ -619,6 +624,8 @@ public final class ConfigConstants {
 	public static boolean DEFAULT_AKKA_LOG_LIFECYCLE_EVENTS = false;
 
 	public static String DEFAULT_AKKA_FRAMESIZE = "10485760b";
+
+	public static String DEFAULT_AKKA_LOG_LEVEL = "OFF";
 
 
 	// ----------------------------- LocalExecution ----------------------------

diff --git a/...cala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery10.scala b/...cala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery10.scala
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/...scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala b/...scala-examples/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala
@@ -77,6 +77,9 @@ object AkkaUtils {
 
     val logLifecycleEvents = if (lifecycleEvents) "on" else "off"
 
+    val logLevel = configuration.getString(ConfigConstants.AKKA_LOG_LEVEL,
+      ConfigConstants.DEFAULT_AKKA_LOG_LEVEL)
+
     val configString = s"""akka.remote.transport-failure-detector.heartbeat-interval =
                        $transportHeartbeatInterval
        |akka.remote.transport-failure-detector.acceptable-heartbeat-pause = $transportHeartbeatPause
@@ -92,6 +95,8 @@ object AkkaUtils {
        |akka.remote.log-remote-lifecycle-events = $logLifecycleEvents
        |akka.log-dead-letters = $logLifecycleEvents
        |akka.log-dead-letters-during-shutdown = $logLifecycleEvents
+       |akka.loglevel = "$logLevel"
+       |akka.stdout-loglevel = "$logLevel"
      """.stripMargin
 
     getDefaultActorSystemConfigString + configString

diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/client/JobClient.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/client/JobClient.scala
@@ -49,7 +49,6 @@ class JobClient(jobManagerURL: String) extends Actor with ActorLogMessages with
     case cancelJob: CancelJob =>
       jobManager forward cancelJob
     case SubmitJobAndWait(jobGraph, listen) =>
-      println("Submit job and wait.")
       val listener = context.actorOf(Props(classOf[JobClientListener], sender()))
       jobManager.tell(SubmitJob(jobGraph, listenToEvents = listen, detach = false), listener)
     case RequestBlobManagerPort =>
@@ -62,6 +61,7 @@ class JobClientListener(client: ActorRef) extends Actor with ActorLogMessages wi
     case SubmissionFailure(_, t) =>
       client ! Failure(t)
       self ! PoisonPill
+    case SubmissionSuccess(_) =>
     case JobResultSuccess(_, duration, accumulatorResults) =>
       client ! new JobExecutionResult(duration, accumulatorResults)
       self ! PoisonPill

diff --git a/flink-runtime/src/test/resources/log4j-test.properties b/flink-runtime/src/test/resources/log4j-test.properties
@@ -17,7 +17,7 @@
 ################################################################################
 
 # Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=WARN, A1
+log4j.rootLogger=OFF, A1
 
 # A1 is set to be a ConsoleAppender.
 log4j.appender.A1=org.apache.log4j.ConsoleAppender

diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingUtils.scala
@@ -43,9 +43,9 @@ object TestingUtils {
 
     s"""akka.daemonic = on
       |akka.loggers = ["akka.event.slf4j.Slf4jLogger"]
-      |akka.loglevel = "WARNING"
+      |akka.loglevel = "OFF"
       |akka.logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
-      |akka.stdout-loglevel = "WARNING"
+      |akka.stdout-loglevel = "OFF"
       |akka.jvm-exit-on-fata-error = off
       |akka.log-config-on-start = off
       |akka.actor.serializers {

diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/AggregateITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/AggregateITCase.scala
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/FirstNOperatorTest.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/FirstNOperatorTest.scala
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/PartitionITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/operators/PartitionITCase.scala
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/pom.xml b/pom.xml
@@ -441,18 +441,6 @@ under the License.
 		</profile>
 	</profiles>
 
-				<exclusions>
-					<exclusion>
-						<groupId>io.netty</groupId>
-						<artifactId>netty</artifactId>
-					</exclusion>
-				</exclusions>
-				<exclusions>
-					<exclusion>
-						<groupId>io.netty</groupId>
-						<artifactId>netty</artifactId>
-					</exclusion>
-				</exclusions>
 	<reporting>
 		<plugins>
 			<!-- execution of Unit Tests -->