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 2014/09/05 11:57:54 UTC
[1/5] [FLINK-1086] Replace JCL with SLF4J and Log4j with LOGBack
Repository: incubator-flink
Updated Branches:
refs/heads/master 3aa5511dd -> 08188508d
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
index 5609128..070097c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java
@@ -32,7 +32,6 @@ import org.apache.flink.runtime.operators.DriverStrategy;
import org.apache.flink.runtime.operators.RegularPactTask;
import org.apache.flink.runtime.operators.MapTaskTest.MockMapStub;
import org.apache.flink.runtime.operators.ReduceTaskTest.MockReduceStub;
-import org.apache.flink.runtime.operators.chaining.SynchronousChainedCombineDriver;
import org.apache.flink.runtime.operators.shipping.ShipStrategyType;
import org.apache.flink.runtime.operators.testutils.TaskTestBase;
import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator;
@@ -40,8 +39,6 @@ import org.apache.flink.runtime.operators.util.TaskConfig;
import org.apache.flink.types.IntValue;
import org.apache.flink.types.Record;
import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.Test;
@@ -59,14 +56,6 @@ public class ChainTaskTest extends TaskTestBase {
private final RecordComparatorFactory compFact = new RecordComparatorFactory(new int[]{0}, new Class[]{IntValue.class}, new boolean[] {true});
private final RecordSerializerFactory serFact = RecordSerializerFactory.get();
-
-
- public ChainTaskTest() {
- // suppress log output, as this class produces errors on purpose to test exception handling
- LogUtils.initializeDefaultConsoleLogger(Level.OFF);
- }
-
-
@Test
public void testMapTask() {
final int keyCnt = 100;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
index 6c8c8f4..8cff293 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashFunctionCollisionBenchmark.java
@@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.operators.hash.MutableHashTable;
import org.apache.flink.runtime.operators.hash.MultiLevelHashTester.BucketBoundaries;
import org.apache.flink.runtime.operators.hash.util.LastBitsToRange;
@@ -45,7 +45,7 @@ import org.junit.Test;
*/
public class HashFunctionCollisionBenchmark {
- private static final Log LOG = LogFactory.getLog(HashFunctionCollisionBenchmark.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HashFunctionCollisionBenchmark.class);
private static final long SEED = 561349061987311L;
@@ -155,7 +155,7 @@ public class HashFunctionCollisionBenchmark {
class MultiLevelHashTester {
- private static final Log LOG = LogFactory.getLog(MultiLevelHashTester.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MultiLevelHashTester.class);
private final int maxLevel;
private final Iterator<Integer> importIterator;
@@ -304,10 +304,10 @@ class MultiLevelHashTester {
formatter.format(" %10d | %10d", bucketSize, countForBucketSize);
if (levelMap.size() < 20 || i < 3 || i >= (levelMap.size() - 3)) {
- LOG.debug(formatter.out());
+ LOG.debug(formatter.out().toString());
} else if (levelMap.size() / 2 == i) {
LOG.debug(" .. | ..");
- LOG.debug(formatter.out());
+ LOG.debug(formatter.out().toString());
LOG.debug(" .. | ..");
}
i++;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
index 6df8d2c..7ae3d40 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
@@ -39,7 +39,6 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
import org.apache.flink.runtime.memorymanager.MemoryAllocationException;
import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.hash.MutableHashTable;
import org.apache.flink.runtime.operators.hash.MutableHashTable.HashBucketIterator;
import org.apache.flink.runtime.operators.testutils.DummyInvokable;
import org.apache.flink.runtime.operators.testutils.UniformIntPairGenerator;
@@ -57,6 +56,7 @@ import org.apache.flink.util.MutableObjectIterator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
public class HashTableITCase {
@@ -77,7 +77,7 @@ public class HashTableITCase {
private TypeComparator<IntPair> pairBuildSideComparator;
private TypeComparator<IntPair> pairProbeSideComparator;
private TypePairComparator<IntPair, IntPair> pairComparator;
-
+
@Before
public void setup()
{
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
index e0c3a83..84225fb 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
@@ -42,8 +42,6 @@ import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
import org.apache.flink.runtime.memorymanager.MemoryAllocationException;
import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.hash.BuildFirstReOpenableHashMatchIterator;
-import org.apache.flink.runtime.operators.hash.ReOpenableMutableHashTable;
import org.apache.flink.runtime.operators.hash.HashMatchIteratorITCase.RecordMatch;
import org.apache.flink.runtime.operators.hash.HashMatchIteratorITCase.RecordMatchRemovingJoin;
import org.apache.flink.runtime.operators.hash.HashTableITCase.ConstantsKeyValuePairsIterator;
@@ -100,7 +98,6 @@ public class ReOpenableHashTableITCase {
private TypeComparator<Record> recordBuildSideComparator;
private TypeComparator<Record> recordProbeSideComparator;
private TypePairComparator<Record, Record> pactRecordComparator;
-
@SuppressWarnings("unchecked")
@Before
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
index 4b3c197..9a18742 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
@@ -38,8 +38,6 @@ import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.sort.CombiningUnilateralSortMerger;
-import org.apache.flink.runtime.operators.sort.Sorter;
import org.apache.flink.runtime.operators.testutils.DummyInvokable;
import org.apache.flink.runtime.operators.testutils.TestData;
import org.apache.flink.runtime.operators.testutils.TestData.Key;
@@ -49,7 +47,6 @@ import org.apache.flink.runtime.util.KeyGroupedIterator;
import org.apache.flink.types.IntValue;
import org.apache.flink.types.Record;
import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
import org.apache.flink.util.MutableObjectIterator;
import org.junit.After;
import org.junit.Before;
@@ -59,7 +56,7 @@ import org.junit.Test;
public class CombiningUnilateralSortMergerITCase {
- private static final Log LOG = LogFactory.getLog(CombiningUnilateralSortMergerITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CombiningUnilateralSortMergerITCase.class);
private static final long SEED = 649180756312423613L;
@@ -81,12 +78,6 @@ public class CombiningUnilateralSortMergerITCase {
private TypeComparator<Record> comparator;
-
- @BeforeClass
- public static void setup() {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
-
@SuppressWarnings("unchecked")
@Before
public void beforeTest() {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
index 1ac2c04..5c6bb5a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortITCase.java
@@ -23,8 +23,8 @@ import java.util.Comparator;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
@@ -33,8 +33,6 @@ import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
import org.apache.flink.runtime.memorymanager.MemoryManager;
-import org.apache.flink.runtime.operators.sort.Sorter;
-import org.apache.flink.runtime.operators.sort.UnilateralSortMerger;
import org.apache.flink.runtime.operators.testutils.DummyInvokable;
import org.apache.flink.runtime.operators.testutils.RandomIntPairGenerator;
import org.apache.flink.runtime.operators.testutils.TestData;
@@ -54,7 +52,7 @@ import org.junit.Test;
public class ExternalSortITCase {
- private static final Log LOG = LogFactory.getLog(ExternalSortITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExternalSortITCase.class);
private static final long SEED = 649180756312423613L;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
index 48a4b91..4b3f638 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/SortMergeCoGroupIteratorITCase.java
@@ -34,7 +34,6 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
import org.apache.flink.api.java.typeutils.runtime.record.RecordPairComparator;
import org.apache.flink.api.java.typeutils.runtime.record.RecordSerializer;
-import org.apache.flink.runtime.operators.sort.SortMergeCoGroupIterator;
import org.apache.flink.runtime.operators.testutils.TestData;
import org.apache.flink.runtime.operators.testutils.TestData.Generator;
import org.apache.flink.runtime.operators.testutils.TestData.Generator.KeyMode;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
index e6661ec..ccb5215 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.junit.Assert;
import org.apache.flink.api.common.functions.Function;
-import org.apache.flink.api.common.functions.RichFunction;
import org.apache.flink.api.common.functions.util.FunctionUtils;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
@@ -43,11 +42,8 @@ import org.apache.flink.runtime.operators.sort.UnilateralSortMerger;
import org.apache.flink.runtime.operators.util.TaskConfig;
import org.apache.flink.types.Record;
import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
import org.apache.flink.util.MutableObjectIterator;
-import org.apache.log4j.Level;
import org.junit.After;
-import org.junit.BeforeClass;
public class DriverTestBase<S extends Function> implements PactTaskContext<S, Record> {
@@ -85,14 +81,6 @@ public class DriverTestBase<S extends Function> implements PactTaskContext<S, Re
private volatile boolean running;
-
- @BeforeClass
- public static void setupLog() {
- /// suppress log output, as this class produces errors on purpose to test exception handling
- LogUtils.initializeDefaultConsoleLogger(Level.OFF);
- }
-
-
protected DriverTestBase(long memory, int maxNumSorters) {
this(memory, maxNumSorters, DEFAULT_PER_SORT_MEM);
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/resources/logback-test.xml b/flink-runtime/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..cb2f164
--- /dev/null
+++ b/flink-runtime/src/test/resources/logback-test.xml
@@ -0,0 +1,36 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+ <logger name="org.apache.flink.runtime.operators.DataSinkTask" level="OFF"/>
+ <logger name="org.apache.flink.runtime.operators.RegularPactTask" level="OFF"/>
+ <logger name="org.apache.flink.runtime.client.JobClient" level="OFF"/>
+ <logger name="org.apache.flink.runtime.taskmanager.Task" level="OFF"/>
+ <logger name="org.apache.flink.runtime.jobmanager.JobManager" level="OFF"/>
+ <logger name="org.apache.flink.runtime.taskmanager.TaskManager" level="OFF"/>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
----------------------------------------------------------------------
diff --git a/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
index ccdd52e..e71f982 100644
--- a/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
+++ b/flink-test-utils/src/main/java/org/apache/flink/test/compiler/util/CompilerTestBase.java
@@ -66,7 +66,7 @@ public abstract class CompilerTestBase {
// ------------------------------------------------------------------------
@Before
- public void setup() {
+ public void setup() {
this.dataStats = new DataStatistics();
this.withStatsCompiler = new PactCompiler(this.dataStats, new DefaultCostEstimator());
this.withStatsCompiler.setDefaultDegreeOfParallelism(DEFAULT_PARALLELISM);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
----------------------------------------------------------------------
diff --git a/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java b/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
index 22138c2..3ef137e 100644
--- a/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
+++ b/flink-test-utils/src/main/java/org/apache/flink/test/util/AbstractTestBase.java
@@ -40,9 +40,7 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.util.LogUtils;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -73,8 +71,6 @@ public abstract class AbstractTestBase {
verifyJvmOptions();
this.config = config;
this.tempFiles = new ArrayList<File>();
-
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
}
private void verifyJvmOptions() {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
index 2217679..77d68f8 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/broadcastvars/KMeansIterativeNepheleITCase.java
@@ -54,9 +54,6 @@ import org.apache.flink.test.testdata.KMeansData;
import org.apache.flink.test.util.RecordAPITestBase;
import org.apache.flink.types.DoubleValue;
import org.apache.flink.types.IntValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-
public class KMeansIterativeNepheleITCase extends RecordAPITestBase {
@@ -74,7 +71,6 @@ public class KMeansIterativeNepheleITCase extends RecordAPITestBase {
public KMeansIterativeNepheleITCase() {
- LogUtils.initializeDefaultConsoleLogger(Level.ERROR);
setTaskManagerNumSlots(DOP);
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
index ccd5804..c512525 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/cancelling/CancellingTestBase.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.Plan;
import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.compiler.DataStatistics;
@@ -40,20 +40,17 @@ import org.apache.flink.runtime.event.job.AbstractEvent;
import org.apache.flink.runtime.event.job.JobEvent;
import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobgraph.JobStatus;
-import org.apache.flink.util.LogUtils;
import org.apache.flink.util.StringUtils;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
/**
*
*/
public abstract class CancellingTestBase {
- private static final Log LOG = LogFactory.getLog(CancellingTestBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CancellingTestBase.class);
private static final int MINIMUM_HEAP_SIZE_MB = 192;
@@ -79,12 +76,6 @@ public abstract class CancellingTestBase {
+ "m", heap > MINIMUM_HEAP_SIZE_MB - 50);
}
- @BeforeClass
- public static void initLogging() {
- // suppress warnings because this test prints cancel warnings
- LogUtils.initializeDefaultConsoleLogger(Level.ERROR);
- }
-
@Before
public void startCluster() throws Exception {
verifyJvmOptions();
@@ -226,7 +217,7 @@ public abstract class CancellingTestBase {
}
} catch (Exception e) {
- LOG.error(e);
+ LOG.error("Exception while running runAndCancelJob.", e);
Assert.fail(StringUtils.stringifyException(e));
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
index 7fff4d3..44be7d7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
@@ -24,7 +24,6 @@ import java.io.FileWriter;
import org.apache.flink.client.LocalExecutor;
import org.apache.flink.test.recordJobs.wordcount.WordCount;
import org.apache.flink.test.testdata.WordCountData;
-import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.Test;
@@ -50,7 +49,6 @@ public class LocalExecutorITCase {
WordCount wc = new WordCount();
LocalExecutor executor = new LocalExecutor();
- LocalExecutor.setLoggingLevel(Level.WARN);
executor.setDefaultOverwriteFiles(true);
executor.setTaskManagerNumSlots(DOP);
executor.start();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java b/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
index e272de9..039ada9 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/compiler/plandump/PreviewPlanDumpTest.java
@@ -47,7 +47,7 @@ public class PreviewPlanDumpTest {
protected static final String OUT_FILE = OperatingSystem.isWindows() ? "file:/c:/test/output" : "file:///test/output";
protected static final String[] NO_ARGS = new String[0];
-
+
@Test
public void dumpWordCount() {
dump(new WordCount().getPlan("4", IN_FILE, OUT_FILE));
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
index 5371d10..422df7b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/danglingpagerank/DiffL1NormConvergenceCriterion.java
@@ -19,8 +19,8 @@
package org.apache.flink.test.iterative.nephele.danglingpagerank;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
@SuppressWarnings("serial")
@@ -28,7 +28,7 @@ public class DiffL1NormConvergenceCriterion implements ConvergenceCriterion<Page
private static final double EPSILON = 0.00005;
- private static final Log log = LogFactory.getLog(DiffL1NormConvergenceCriterion.class);
+ private static final Logger log = LoggerFactory.getLogger(DiffL1NormConvergenceCriterion.class);
@Override
public boolean isConverged(int iteration, PageRankStats pageRankStats) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java b/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
index 353f474..d77c653 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/localDistributed/PackagedProgramEndToEndITCase.java
@@ -24,7 +24,6 @@ import java.io.FileWriter;
import org.apache.flink.client.RemoteExecutor;
import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.test.testdata.KMeansData;
-import org.apache.flink.util.LogUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -33,10 +32,6 @@ import org.junit.Test;
public class PackagedProgramEndToEndITCase {
- static {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
-
@Test
public void testEverything() {
NepheleMiniCluster cluster = new NepheleMiniCluster();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
index 814bad0..3df60ff 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/JoinITCase.java
@@ -19,8 +19,8 @@
package org.apache.flink.test.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.Plan;
import org.apache.flink.api.java.record.functions.JoinFunction;
import org.apache.flink.api.java.record.io.DelimitedInputFormat;
@@ -49,7 +49,7 @@ import java.util.LinkedList;
@RunWith(Parameterized.class)
public class JoinITCase extends RecordAPITestBase {
- private static final Log LOG = LogFactory.getLog(JoinITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JoinITCase.class);
String leftInPath = null;
String rightInPath = null;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
index ee2f132..cbb546b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/MapITCase.java
@@ -19,8 +19,8 @@
package org.apache.flink.test.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.Plan;
import org.apache.flink.api.java.record.functions.MapFunction;
import org.apache.flink.api.java.record.io.DelimitedInputFormat;
@@ -48,7 +48,7 @@ import java.util.LinkedList;
@RunWith(Parameterized.class)
public class MapITCase extends RecordAPITestBase {
- private static final Log LOG = LogFactory.getLog(MapITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MapITCase.class);
String inPath = null;
String resultPath = null;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
index b62892a..7a1957c 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/UnionITCase.java
@@ -19,8 +19,8 @@
package org.apache.flink.test.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.Plan;
import org.apache.flink.api.java.record.functions.MapFunction;
import org.apache.flink.api.java.record.io.DelimitedInputFormat;
@@ -47,7 +47,7 @@ import java.util.LinkedList;
@RunWith(Parameterized.class)
public class UnionITCase extends RecordAPITestBase {
- private static final Log LOG = LogFactory.getLog(UnionITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UnionITCase.class);
String inPath = null;
String emptyInPath = null;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java b/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
index bbb7ded..1e0fc7e 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/io/ContractITCaseIOFormats.java
@@ -21,8 +21,8 @@ package org.apache.flink.test.operators.io;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.record.io.DelimitedInputFormat;
import org.apache.flink.api.java.record.io.FileOutputFormat;
import org.apache.flink.core.fs.FileSystem.WriteMode;
@@ -32,7 +32,7 @@ import org.apache.flink.types.StringValue;
public class ContractITCaseIOFormats {
- private static final Log LOG = LogFactory.getLog(ContractITCaseIOFormats.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ContractITCaseIOFormats.class);
public static class ContractITCaseInputFormat extends DelimitedInputFormat {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
index e4df56a..a94d1c3 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/graph/pageRankUtil/DiffL1NormConvergenceCriterion.java
@@ -19,8 +19,8 @@
package org.apache.flink.test.recordJobs.graph.pageRankUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
@SuppressWarnings("serial")
@@ -28,7 +28,7 @@ public class DiffL1NormConvergenceCriterion implements ConvergenceCriterion<Page
private static final double EPSILON = 0.00005;
- private static final Log log = LogFactory.getLog(DiffL1NormConvergenceCriterion.class);
+ private static final Logger log = LoggerFactory.getLogger(DiffL1NormConvergenceCriterion.class);
@Override
public boolean isConverged(int iteration, PageRankStats pageRankStats) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
index 0db22cb..86b27f9 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery4.java
@@ -45,7 +45,8 @@ import org.apache.flink.types.IntValue;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
import org.apache.flink.util.Collector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of the TPC-H Query 4 as a Flink program.
@@ -53,7 +54,7 @@ import org.apache.log4j.Logger;
@SuppressWarnings("serial")
public class TPCHQuery4 implements Program, ProgramDescription {
- private static Logger LOGGER = Logger.getLogger(TPCHQuery4.class);
+ private static Logger LOG = LoggerFactory.getLogger(TPCHQuery4.class);
private int degreeOfParallelism = 1;
private String ordersInputPath;
@@ -206,7 +207,7 @@ public class TPCHQuery4 implements Program, ProgramDescription {
if(args == null || args.length != 4)
{
- LOGGER.warn("number of arguments do not match!");
+ LOG.warn("number of arguments do not match!");
this.ordersInputPath = "";
this.lineItemInputPath = "";
this.outputPath = "";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
index 2d84ea8..21a0ac1 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/TPCHQuery9.java
@@ -43,7 +43,8 @@ import org.apache.flink.test.recordJobs.relational.query9Util.SupplierMap;
import org.apache.flink.test.recordJobs.relational.query9Util.SuppliersJoin;
import org.apache.flink.test.recordJobs.util.IntTupleDataInFormat;
import org.apache.flink.types.IntValue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Quote from the TPC-H homepage:
@@ -83,7 +84,7 @@ import org.apache.log4j.Logger;
public class TPCHQuery9 implements Program, ProgramDescription {
public final String ARGUMENTS = "dop partInputPath partSuppInputPath ordersInputPath lineItemInputPath supplierInputPath nationInputPath outputPath";
- private static Logger LOGGER = Logger.getLogger(TPCHQuery9.class);
+ private static Logger LOG = LoggerFactory.getLogger(TPCHQuery9.class);
private int degreeOfParallelism = 1;
@@ -98,7 +99,7 @@ public class TPCHQuery9 implements Program, ProgramDescription {
if (args.length != 8)
{
- LOGGER.warn("number of arguments do not match!");
+ LOG.warn("number of arguments do not match!");
this.degreeOfParallelism = 1;
this.partInputPath = "";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
index b8f191a..262c92d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilter.java
@@ -29,7 +29,8 @@ import org.apache.flink.test.recordJobs.util.Tuple;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
import org.apache.flink.util.Collector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Filters the line item tuples according to the filter condition
@@ -43,7 +44,7 @@ public class LineItemFilter extends MapFunction {
private static final long serialVersionUID = 1L;
- private static final Logger LOGGER = Logger.getLogger(LineItemFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LineItemFilter.class);
private static final String DATE_CONSTANT = "1998-09-03";
private static final DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -57,7 +58,7 @@ public class LineItemFilter extends MapFunction {
this.constantDate = format.parse(DATE_CONSTANT);
}
catch (ParseException e) {
- LOGGER.error("Date constant could not be parsed.", e);
+ LOG.error("Date constant could not be parsed.", e);
throw new RuntimeException("Date constant could not be parsed.");
}
}
@@ -80,7 +81,7 @@ public class LineItemFilter extends MapFunction {
}
}
catch (ParseException e) {
- LOGGER.error(e);
+ LOG.warn("ParseException while parsing the shipping date.", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
index e5249c7..f7a08aa 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobs/relational/query1Util/LineItemFilterTest.java
@@ -47,7 +47,7 @@ public class LineItemFilterTest {
RecordWriter<Record> recordWriterMock;
private List<RecordWriter<Record>> writerList = new ArrayList<RecordWriter<Record>>();
-
+
@Before
public void setUp()
{
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
index c13fa24..953b5b7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughput.java
@@ -21,8 +21,8 @@ package org.apache.flink.test.runtime;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.core.memory.DataInputView;
@@ -38,12 +38,11 @@ import org.apache.flink.runtime.jobgraph.JobOutputVertex;
import org.apache.flink.runtime.jobgraph.JobTaskVertex;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.test.util.RecordAPITestBase;
-import org.apache.flink.util.LogUtils;
import org.junit.After;
public class NetworkStackThroughput {
- private static final Log LOG = LogFactory.getLog(NetworkStackThroughput.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NetworkStackThroughput.class);
private static final String DATA_VOLUME_GB_CONFIG_KEY = "data.volume.gb";
@@ -89,8 +88,6 @@ public class NetworkStackThroughput {
setNumTaskTracker(parallelism / numSlots);
setTaskManagerNumSlots(numSlots);
-
- LogUtils.initializeDefaultConsoleLogger();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
index cc45ec5..f012791 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/util/FailingTestBase.java
@@ -25,20 +25,11 @@ import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.runtime.client.JobClient;
import org.apache.flink.runtime.client.JobExecutionException;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.test.util.AbstractTestBase;
-import org.apache.flink.test.util.RecordAPITestBase;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
/**
* Base class for integration tests which test whether the system recovers from failed executions.
*/
public abstract class FailingTestBase extends RecordAPITestBase {
-
- public FailingTestBase() {
- LogUtils.initializeDefaultConsoleLogger(Level.OFF);
- }
-
/**
* Returns the {@link JobGraph} of the failing job.
*
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-tests/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/logback-test.xml b/flink-tests/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..7c47e0b
--- /dev/null
+++ b/flink-tests/src/test/resources/logback-test.xml
@@ -0,0 +1,34 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+ <logger name="org.apache.flink.test.recordJobs.relational.query1Util.LineItemFilter" level="ERROR"/>
+ <logger name="org.apache.flink.runtime.operators.RegularPactTask" level="OFF"/>
+ <logger name="org.apache.flink.runtime.taskmanager.Task" level="OFF"/>
+ <logger name="org.apache.flink.runtime.jobmanager.JobManager" level="OFF"/>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c28e9f..6e9edc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,21 +85,18 @@ under the License.
<version>3.1</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.7</version>
+ </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.13</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -388,16 +385,6 @@ under the License.
</dependency>
<!-- Managed dependency required for HBase in pact-hbase -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.1-GA</version>
[5/5] git commit: [FLINK-1086] Replace JCL with SLF4J and Log4j with
LOGBack
Posted by uc...@apache.org.
[FLINK-1086] Replace JCL with SLF4J and Log4j with LOGBack
- Excluded Kafka's transitive dependencies: jmxtools and jmxri
- Corrected encoder pattern in logback.xml
- Removed explicit logging access. Loggers are now configured by
configuration files. Fixed Yarn issue with multiple logging
bindings.
This closes #111.
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/08188508
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/08188508
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/08188508
Branch: refs/heads/master
Commit: 08188508d528c1072a746aacbf2a5c712d4f8467
Parents: 3aa5511
Author: Till Rohrmann <tr...@apache.org>
Authored: Thu Aug 28 12:36:53 2014 +0200
Committer: uce <u....@fu-berlin.de>
Committed: Fri Sep 5 11:57:02 2014 +0200
----------------------------------------------------------------------
DEPENDENCIES | 18 ++++--
docs/internal_logging.md | 61 ++++++++++++++++++++
docs/internal_overview.md | 1 +
.../flink/api/java/io/AvroInputFormat.java | 6 +-
.../java/record/io/avro/AvroInputFormat.java | 6 +-
.../record/io/avro/AvroRecordInputFormat.java | 6 +-
.../api/avro/AvroExternalJarProgramITCase.java | 5 --
.../flink/api/avro/EncoderDecoderTest.java | 4 --
.../io/avro/AvroRecordInputFormatTest.java | 4 +-
.../src/test/resources/logback-test.xml | 29 ++++++++++
.../mapred/HadoopInputFormat.java | 6 +-
.../mapreduce/HadoopInputFormat.java | 6 +-
.../src/test/resources/logback-test.xml | 29 ++++++++++
.../flink/addons/hbase/TableInputFormat.java | 6 +-
.../flink/api/java/io/jdbc/JDBCInputFormat.java | 6 +-
.../api/java/io/jdbc/JDBCOutputFormat.java | 6 +-
.../java/record/io/jdbc/JDBCInputFormat.java | 6 +-
.../api/java/io/jdbc/JDBCInputFormatTest.java | 1 -
.../api/java/io/jdbc/JDBCOutputFormatTest.java | 2 -
.../record/io/jdbc/JDBCOutputFormatTest.java | 2 -
.../src/test/resources/logback-test.xml | 29 ++++++++++
.../src/test/resources/logback-test.xml | 29 ++++++++++
.../flink-streaming-connectors/pom.xml | 10 ++++
.../streaming/connectors/flume/FlumeSink.java | 6 +-
.../streaming/connectors/rabbitmq/RMQSink.java | 6 +-
.../connectors/rabbitmq/RMQSource.java | 14 ++---
.../connectors/twitter/TwitterSource.java | 6 +-
.../src/test/resources/logback-test.xml | 30 ++++++++++
.../flink/streaming/api/JobGraphBuilder.java | 6 +-
.../api/collector/DirectedStreamCollector.java | 26 ++++-----
.../api/collector/StreamCollector.java | 10 ++--
.../environment/RemoteStreamEnvironment.java | 6 +-
.../api/invokable/StreamOperatorInvokable.java | 6 +-
.../streamcomponent/StreamIterationSink.java | 6 +-
.../streamcomponent/StreamIterationSource.java | 6 +-
.../api/streamcomponent/StreamSink.java | 6 +-
.../flink/streaming/util/ClusterUtil.java | 6 +-
.../apache/flink/streaming/util/LogUtils.java | 48 ---------------
.../flink/streaming/util/TestDataUtil.java | 6 +-
.../apache/flink/streaming/api/IterateTest.java | 3 -
.../apache/flink/streaming/api/PrintTest.java | 3 -
.../flink/streaming/api/WriteAsCsvTest.java | 4 --
.../flink/streaming/api/WriteAsTextTest.java | 4 --
.../api/collector/DirectedOutputTest.java | 3 -
.../api/invokable/operator/CoFlatMapTest.java | 4 --
.../streamcomponent/StreamComponentTest.java | 11 ----
.../src/test/resources/logback-test.xml | 30 ++++++++++
.../main/java/org/apache/flink/yarn/Client.java | 59 +++++++------------
.../apache/flink/yarn/ClientMasterControl.java | 6 +-
.../main/java/org/apache/flink/yarn/Utils.java | 12 ++--
.../flink/yarn/appMaster/ApplicationMaster.java | 23 ++++----
.../yarn/appMaster/YarnTaskManagerRunner.java | 8 +--
.../org/apache/flink/client/LocalExecutor.java | 15 +----
.../org/apache/flink/client/WebFrontend.java | 6 +-
.../client/minicluster/NepheleMiniCluster.java | 6 +-
.../org/apache/flink/client/program/Client.java | 6 +-
.../flink/client/web/JobSubmissionServlet.java | 8 +--
.../flink/client/web/PactJobJSONServlet.java | 6 +-
.../flink/client/web/WebInterfaceServer.java | 6 +-
.../org/apache/flink/compiler/PactCompiler.java | 6 +-
.../plantranslate/NepheleJobGraphGenerator.java | 2 +-
.../apache/flink/compiler/CompilerTestBase.java | 7 ---
.../src/test/resources/logback-test.xml | 29 ++++++++++
flink-core/pom.xml | 2 +-
.../flink/api/common/io/BinaryInputFormat.java | 6 +-
.../api/common/io/DelimitedInputFormat.java | 6 +-
.../flink/api/common/io/FileInputFormat.java | 6 +-
.../flink/api/common/io/FileOutputFormat.java | 6 +-
.../operators/base/BulkIterationBase.java | 6 +-
.../configuration/GlobalConfiguration.java | 10 +---
.../flink/core/fs/local/LocalFileSystem.java | 8 +--
.../java/org/apache/flink/util/LogUtils.java | 45 ---------------
.../api/common/io/BinaryInputFormatTest.java | 10 ----
.../io/DelimitedInputFormatSamplingTest.java | 5 --
.../api/common/io/DelimitedInputFormatTest.java | 11 +---
.../api/common/io/FileInputFormatTest.java | 8 ---
.../api/common/io/FileOutputFormatTest.java | 8 ---
.../common/io/GenericCsvInputFormatTest.java | 10 ----
.../api/common/io/SequentialFormatTest.java | 14 -----
.../typeutils/SerializerTestInstance.java | 3 +-
.../configuration/GlobalConfigurationTest.java | 10 ----
flink-core/src/test/resources/logback-test.xml | 29 ++++++++++
flink-dist/src/main/assemblies/yarn.xml | 2 +-
flink-dist/src/main/flink-bin/LICENSE | 14 ++++-
flink-dist/src/main/flink-bin/NOTICE | 15 +++--
flink-dist/src/main/flink-bin/bin/flink | 2 +-
flink-dist/src/main/flink-bin/bin/jobmanager.sh | 2 +-
.../src/main/flink-bin/bin/start-local.bat | 24 ++++----
.../src/main/flink-bin/bin/taskmanager.sh | 2 +-
flink-dist/src/main/flink-bin/bin/webclient.sh | 2 +-
.../src/main/flink-bin/conf/log4j.properties | 27 ---------
.../main/flink-bin/conf/log4jconsole.properties | 25 --------
flink-dist/src/main/flink-bin/conf/logback.xml | 31 ++++++++++
.../src/main/flink-bin/conf/logbackConsole.xml | 30 ++++++++++
.../src/main/flink-bin/yarn-bin/yarn-session.sh | 2 +-
.../apache/flink/api/java/LocalEnvironment.java | 40 -------------
.../flink/api/java/io/CsvOutputFormat.java | 6 +-
.../api/java/record/io/CsvOutputFormat.java | 6 +-
.../api/java/record/io/TextInputFormat.java | 6 +-
.../flink/api/java/io/CsvInputFormatTest.java | 11 +---
.../flink/api/java/io/TextInputFormatTest.java | 9 ---
.../api/java/record/io/CsvInputFormatTest.java | 10 ----
.../record/io/FixedLenghtInputFormatTest.java | 11 +---
.../api/java/record/io/TextInputFormatTest.java | 10 ----
.../apache/flink/runtime/client/JobClient.java | 6 +-
.../execution/ExecutionStateTransition.java | 6 +-
.../runtime/execution/RuntimeEnvironment.java | 8 +--
.../runtime/executiongraph/ExecutionGraph.java | 6 +-
.../executiongraph/ExecutionGraphIterator.java | 6 +-
.../executiongraph/ExecutionSignature.java | 6 +-
.../runtime/executiongraph/ExecutionVertex.java | 6 +-
.../runtime/fs/hdfs/DistributedFileSystem.java | 6 +-
.../flink/runtime/fs/maprfs/MapRFileSystem.java | 8 +--
.../flink/runtime/fs/s3/S3FileSystem.java | 6 +-
.../instance/DefaultInstanceManager.java | 6 +-
.../instance/HardwareDescriptionFactory.java | 8 +--
.../runtime/io/disk/iomanager/IOManager.java | 8 +--
.../runtime/io/network/ChannelManager.java | 6 +-
.../bufferprovider/GlobalBufferPool.java | 6 +-
.../io/network/channels/InputChannel.java | 6 +-
.../io/network/channels/OutputChannel.java | 6 +-
.../runtime/io/network/gates/InputGate.java | 6 +-
.../network/netty/InboundEnvelopeDecoder.java | 6 +-
.../network/netty/NettyConnectionManager.java | 6 +-
.../network/netty/OutboundConnectionQueue.java | 6 +-
.../org/apache/flink/runtime/ipc/Client.java | 12 ++--
.../java/org/apache/flink/runtime/ipc/RPC.java | 6 +-
.../org/apache/flink/runtime/ipc/Server.java | 8 +--
.../WorksetEmptyConvergenceCriterion.java | 6 +-
.../task/AbstractIterativePactTask.java | 6 +-
.../iterative/task/IterationHeadPactTask.java | 6 +-
.../task/IterationIntermediatePactTask.java | 6 +-
.../task/IterationSynchronizationSinkTask.java | 6 +-
.../iterative/task/IterationTailPactTask.java | 6 +-
.../iterative/task/SyncEventHandler.java | 2 +-
.../flink/runtime/jobmanager/JobManager.java | 30 +++-------
.../runtime/jobmanager/JobManagerUtils.java | 6 +-
.../jobmanager/scheduler/DefaultScheduler.java | 10 ++--
.../DefaultInputSplitAssigner.java | 6 +-
.../splitassigner/InputSplitManager.java | 6 +-
.../splitassigner/InputSplitTracker.java | 6 +-
.../LocatableInputSplitAssigner.java | 6 +-
.../splitassigner/LocatableInputSplitList.java | 6 +-
.../file/FileInputSplitAssigner.java | 6 +-
.../splitassigner/file/FileInputSplitList.java | 6 +-
.../jobmanager/web/JobmanagerInfoServlet.java | 6 +-
.../jobmanager/web/LogfileInfoServlet.java | 17 +++---
.../runtime/jobmanager/web/MenuServlet.java | 8 +--
.../jobmanager/web/SetupInfoServlet.java | 6 +-
.../runtime/jobmanager/web/WebInfoServer.java | 6 +-
.../ManagementGraphIterator.java | 6 +-
.../memorymanager/DefaultMemoryManager.java | 8 +--
.../org/apache/flink/runtime/net/NetUtils.java | 8 +--
.../flink/runtime/net/SocketIOWithTimeout.java | 6 +-
.../runtime/operators/AllGroupReduceDriver.java | 8 +--
.../runtime/operators/AllReduceDriver.java | 8 +--
.../flink/runtime/operators/CoGroupDriver.java | 6 +-
.../flink/runtime/operators/CrossDriver.java | 6 +-
.../flink/runtime/operators/DataSinkTask.java | 6 +-
.../flink/runtime/operators/DataSourceTask.java | 6 +-
.../operators/GroupReduceCombineDriver.java | 6 +-
.../runtime/operators/GroupReduceDriver.java | 8 +--
.../flink/runtime/operators/MatchDriver.java | 6 +-
.../runtime/operators/ReduceCombineDriver.java | 6 +-
.../flink/runtime/operators/ReduceDriver.java | 6 +-
.../runtime/operators/RegularPactTask.java | 6 +-
.../operators/hash/CompactingHashTable.java | 6 +-
.../operators/hash/MutableHashTable.java | 6 +-
.../AbstractBlockResettableIterator.java | 6 +-
.../resettable/BlockResettableIterator.java | 6 +-
.../BlockResettableMutableObjectIterator.java | 6 +-
.../resettable/SpillingResettableIterator.java | 6 +-
...SpillingResettableMutableObjectIterator.java | 6 +-
.../sort/CombiningUnilateralSortMerger.java | 6 +-
.../operators/sort/MergeMatchIterator.java | 6 +-
.../operators/sort/UnilateralSortMerger.java | 6 +-
.../flink/runtime/profiling/ProfilingUtils.java | 23 +++++---
.../profiling/impl/EnvironmentListenerImpl.java | 6 +-
.../profiling/impl/JobManagerProfilerImpl.java | 6 +-
.../profiling/impl/TaskManagerProfilerImpl.java | 8 +--
.../apache/flink/runtime/taskmanager/Task.java | 6 +-
.../flink/runtime/taskmanager/TaskManager.java | 26 ++++-----
.../runtime/util/EnvironmentInformation.java | 17 ++----
.../org/apache/flink/runtime/util/IOUtils.java | 4 +-
.../apache/flink/runtime/AbstractIDTest.java | 1 -
.../flink/runtime/client/JobResultTest.java | 5 +-
.../ChannelDeploymentDescriptorTest.java | 1 -
.../GateDeploymentDescriptorTest.java | 2 -
.../TaskDeploymentDescriptorTest.java | 3 -
.../flink/runtime/event/job/JobEventTest.java | 3 -
.../runtime/event/job/ManagementEventTest.java | 4 --
.../task/EventNotificationManagerTest.java | 6 --
.../flink/runtime/event/task/TaskEventTest.java | 6 +-
.../executiongraph/ExecutionGraphTest.java | 16 -----
.../FileCacheDeleteValidationTest.java | 1 -
.../apache/flink/runtime/fs/LineReaderTest.java | 2 +-
.../instance/DefaultInstanceManagerTest.java | 8 ---
.../io/disk/iomanager/IOManagerITCase.java | 14 ++---
.../IOManagerPerformanceBenchmark.java | 6 +-
.../bufferprovider/LocalBufferPoolTest.java | 8 ---
.../runtime/jobmanager/JobManagerITCase.java | 44 --------------
.../runtime/operators/DataSinkTaskTest.java | 19 +++---
.../runtime/operators/DataSourceTaskTest.java | 4 +-
.../flink/runtime/operators/MapTaskTest.java | 8 +--
.../operators/ReduceTaskExternalITCase.java | 14 ++---
.../flink/runtime/operators/ReduceTaskTest.java | 14 ++---
.../operators/chaining/ChainTaskTest.java | 11 ----
.../hash/HashFunctionCollisionBenchmark.java | 12 ++--
.../runtime/operators/hash/HashTableITCase.java | 4 +-
.../hash/ReOpenableHashTableITCase.java | 3 -
.../CombiningUnilateralSortMergerITCase.java | 15 +----
.../operators/sort/ExternalSortITCase.java | 8 +--
.../sort/SortMergeCoGroupIteratorITCase.java | 1 -
.../operators/testutils/DriverTestBase.java | 12 ----
.../src/test/resources/logback-test.xml | 36 ++++++++++++
.../test/compiler/util/CompilerTestBase.java | 2 +-
.../flink/test/util/AbstractTestBase.java | 4 --
.../KMeansIterativeNepheleITCase.java | 4 --
.../test/cancelling/CancellingTestBase.java | 17 ++----
.../clients/examples/LocalExecutorITCase.java | 2 -
.../compiler/plandump/PreviewPlanDumpTest.java | 2 +-
.../DiffL1NormConvergenceCriterion.java | 6 +-
.../PackagedProgramEndToEndITCase.java | 5 --
.../apache/flink/test/operators/JoinITCase.java | 6 +-
.../apache/flink/test/operators/MapITCase.java | 6 +-
.../flink/test/operators/UnionITCase.java | 6 +-
.../operators/io/ContractITCaseIOFormats.java | 6 +-
.../DiffL1NormConvergenceCriterion.java | 6 +-
.../test/recordJobs/relational/TPCHQuery4.java | 7 ++-
.../test/recordJobs/relational/TPCHQuery9.java | 7 ++-
.../relational/query1Util/LineItemFilter.java | 9 +--
.../query1Util/LineItemFilterTest.java | 2 +-
.../test/runtime/NetworkStackThroughput.java | 9 +--
.../apache/flink/test/util/FailingTestBase.java | 9 ---
flink-tests/src/test/resources/logback-test.xml | 34 +++++++++++
pom.xml | 35 ++++-------
236 files changed, 1068 insertions(+), 1227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 118a48e..5cf024e 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -17,7 +17,6 @@ under the Apache License (v 2.0):
- Apache Commons FileUpload (http://commons.apache.org/fileupload/)
- Apache Commons IO (http://commons.apache.org/io/)
- Apache Commons Math (http://commons.apache.org/proper/commons-math/)
- - Apache Log4J (http://logging.apache.org/log4j/1.2/)
- Apache Avro (http://avro.apache.org)
- Apache Hadoop (http://hadoop.apache.org)
- Apache Derby (http://db.apache.org/derby/)
@@ -43,6 +42,8 @@ The Apache Flink project depends on and/or bundles the following components
under the Eclipse Public License (v 1.0)
- JUnit (http://junit.org/)
+ - LOGback (http://logback.qos.ch)
+ Copyright (C) 1999-2012, QOS.ch. All rights reserved.
You may obtain a copy of the Eclipse Public License (v 1.0) at
https://www.eclipse.org/legal/epl-v10.html
@@ -188,14 +189,19 @@ Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-----------------------------------------------------------------------
- Apache Log4J
+ LOGBack
-----------------------------------------------------------------------
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
+Copyright (C) 1999-2012, QOS.ch
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
+This program and the accompanying materials are dual-licensed under
+either the terms of the Eclipse Public License v1.0 as published by
+the Eclipse Foundation
+
+ or (per the licensee's choosing)
+
+under the terms of the GNU Lesser General Public License version 2.1
+as published by the Free Software Foundation.
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/docs/internal_logging.md
----------------------------------------------------------------------
diff --git a/docs/internal_logging.md b/docs/internal_logging.md
new file mode 100644
index 0000000..6d95360
--- /dev/null
+++ b/docs/internal_logging.md
@@ -0,0 +1,61 @@
+---
+title: "How to use logging"
+---
+
+The logging in Flink is implemented using the slf4j logging interface. As underlying logging framework, logback is used.
+
+## Configuring logback
+
+For users and developers alike it is important to control the logging framework.
+The configuration of the logging framework is exclusively done by configuration files.
+The configuration file either has to be specified by setting the environment property `-Dlogback.configurationFile=<file>` or by putting `logback.xml` in the classpath.
+The `conf` directory contains a `logback.xml` file which can be modified and is used if Flink is started outside of an IDE and with the provided starting scripts.
+The provided `logback.xml` has the following form:
+
+``` xml
+<configuration>
+ <appender name="file" class="ch.qos.logback.core.FileAppender">
+ <file>${log.file}</file>
+ <append>false</append>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="file"/>
+ </root>
+</configuration>
+```
+
+In order to control the logging level of `org.apache.flink.runtime.jobgraph.JobGraph`, for example, one would have to add the following line to the configuration file.
+``` xml
+<logger name="org.apache.flink.runtime.jobgraph.JobGraph" level="DEBUG"/>
+```
+
+For further information on configuring logback see [LOGback's manual](http://logback.qos.ch/manual/configuration.html).
+
+## Best practices for developers
+
+The loggers using slf4j are created by calling
+``` java
+import org.slf4j.LoggerFactory
+import org.slf4j.Logger
+
+Logger LOG = LoggerFactory.getLogger(Foobar.class)
+```
+
+In order to benefit most from slf4j, it is recommended to use its placeholder mechanism.
+Using placeholders allows to avoid unnecessary string constructions in case that the logging level is set so high that the message would not be logged.
+The syntax of placeholders is the following:
+``` java
+LOG.info("This message contains {} placeholders. {}", 2, "Yippie");
+```
+
+Placeholders can also be used in conjunction with exceptions which shall be logged.
+
+``` java
+catch(Exception exception){
+ LOG.error("An {} occurred.", "error", exception);
+}
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/docs/internal_overview.md
----------------------------------------------------------------------
diff --git a/docs/internal_overview.md b/docs/internal_overview.md
index f3090d0..4c71c6e 100644
--- a/docs/internal_overview.md
+++ b/docs/internal_overview.md
@@ -39,3 +39,4 @@ or pull request that updates these documents as well.*
- [RPC and JobManager Communication](rpc_transfer.html)
-->
+- [How-to: Using logging in Flink](internal_logging.html)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
index 1031d81..a85eb22 100644
--- a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
+++ b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/io/AvroInputFormat.java
@@ -27,8 +27,8 @@ import org.apache.avro.file.SeekableInput;
import org.apache.avro.io.DatumReader;
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.specific.SpecificDatumReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.avro.FSDataInputStreamWrapper;
import org.apache.flink.api.common.io.FileInputFormat;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
@@ -43,7 +43,7 @@ public class AvroInputFormat<E> extends FileInputFormat<E> implements ResultType
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(AvroInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AvroInputFormat.class);
private final Class<E> avroValueType;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java
index ab96895..2f31837 100644
--- a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java
+++ b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroInputFormat.java
@@ -27,8 +27,8 @@ import org.apache.avro.file.SeekableInput;
import org.apache.avro.io.DatumReader;
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.specific.SpecificDatumReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.avro.AvroBaseValue;
import org.apache.flink.api.avro.FSDataInputStreamWrapper;
import org.apache.flink.api.java.record.io.FileInputFormat;
@@ -42,7 +42,7 @@ public class AvroInputFormat<E> extends FileInputFormat {
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(AvroInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AvroInputFormat.class);
private final Class<? extends AvroBaseValue<E>> avroWrapperTypeClass;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java
index 1464ca9..be13114 100644
--- a/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java
+++ b/flink-addons/flink-avro/src/main/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormat.java
@@ -32,8 +32,8 @@ import org.apache.avro.file.SeekableInput;
import org.apache.avro.generic.GenericDatumReader;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.io.DatumReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.avro.FSDataInputStreamWrapper;
import org.apache.flink.api.java.record.io.FileInputFormat;
import org.apache.flink.core.fs.FileInputSplit;
@@ -64,7 +64,7 @@ import org.apache.flink.types.Value;
public class AvroRecordInputFormat extends FileInputFormat {
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(AvroRecordInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AvroRecordInputFormat.class);
private FileReader<GenericRecord> dataFileReader;
private GenericRecord reuseAvroRecord = null;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
index 74a1e15..2e4b141 100644
--- a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
+++ b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
@@ -25,7 +25,6 @@ import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.client.program.Client;
import org.apache.flink.client.program.PackagedProgram;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.util.LogUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -36,10 +35,6 @@ public class AvroExternalJarProgramITCase {
private static final String TEST_DATA_FILE = "/testdata.avro";
- static {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
-
@Test
public void testExternalProgram() {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
index 76b23ef..05ad284 100644
--- a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
+++ b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
@@ -31,8 +31,6 @@ import java.util.Random;
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.flink.api.avro.DataInputDecoder;
-import org.apache.flink.api.avro.DataOutputEncoder;
import org.apache.flink.api.java.record.io.avro.generated.Colors;
import org.apache.flink.api.java.record.io.avro.generated.User;
import org.apache.flink.util.StringUtils;
@@ -40,12 +38,10 @@ import org.junit.Test;
import static org.junit.Assert.*;
-
/**
* Tests the {@link DataOutputEncoder} and {@link DataInputDecoder} classes for Avro serialization.
*/
public class EncoderDecoderTest {
-
@Test
public void testComplexStringsDirecty() {
try {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
index 64fae94..e0610f0 100644
--- a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
+++ b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/java/record/io/avro/AvroRecordInputFormatTest.java
@@ -29,7 +29,6 @@ import org.junit.Assert;
import org.apache.avro.file.DataFileWriter;
import org.apache.avro.io.DatumWriter;
import org.apache.avro.specific.SpecificDatumWriter;
-import org.apache.flink.api.java.record.io.avro.AvroRecordInputFormat;
import org.apache.flink.api.java.record.io.avro.AvroRecordInputFormat.BooleanListValue;
import org.apache.flink.api.java.record.io.avro.AvroRecordInputFormat.LongMapValue;
import org.apache.flink.api.java.record.io.avro.AvroRecordInputFormat.StringListValue;
@@ -68,8 +67,7 @@ public class AvroRecordInputFormatTest {
final static long TEST_MAP_VALUE1 = 8546456L;
final static CharSequence TEST_MAP_KEY2 = "KEY 2";
final static long TEST_MAP_VALUE2 = 17554L;
-
-
+
@Before
public void createFiles() throws IOException {
testFile = File.createTempFile("AvroInputFormatTest", null);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-avro/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/resources/logback-test.xml b/flink-addons/flink-avro/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8b3bb27
--- /dev/null
+++ b/flink-addons/flink-avro/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java b/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java
index 030d7f2..c224d64 100644
--- a/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java
+++ b/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopInputFormat.java
@@ -24,8 +24,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.InputFormat;
import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
@@ -51,7 +51,7 @@ public class HadoopInputFormat<K extends Writable, V extends Writable> implement
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(HadoopInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HadoopInputFormat.class);
private org.apache.hadoop.mapred.InputFormat<K, V> mapredInputFormat;
private Class<K> keyClass;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java b/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java
index cf12cae..de443c1 100644
--- a/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java
+++ b/flink-addons/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/HadoopInputFormat.java
@@ -25,8 +25,8 @@ import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.InputFormat;
import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
@@ -54,7 +54,7 @@ public class HadoopInputFormat<K extends Writable, V extends Writable> implement
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(HadoopInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HadoopInputFormat.class);
private org.apache.hadoop.mapreduce.InputFormat<K, V> mapreduceInputFormat;
private Class<K> keyClass;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-hadoop-compatibility/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hadoop-compatibility/src/test/resources/logback-test.xml b/flink-addons/flink-hadoop-compatibility/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8b3bb27
--- /dev/null
+++ b/flink-addons/flink-hadoop-compatibility/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java b/flink-addons/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
index 9ff5af7..fdf3c6c 100644
--- a/flink-addons/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
+++ b/flink-addons/flink-hbase/src/main/java/org/apache/flink/addons/hbase/TableInputFormat.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.addons.hbase.common.HBaseKey;
import org.apache.flink.addons.hbase.common.HBaseResult;
import org.apache.flink.addons.hbase.common.HBaseUtil;
@@ -51,7 +51,7 @@ public class TableInputFormat implements InputFormat<Record, TableInputSplit> {
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(TableInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TableInputFormat.class);
/** A handle on an HBase table */
private HTable table;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java b/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
index ac8bc07..b17f658 100644
--- a/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
+++ b/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormat.java
@@ -26,8 +26,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.InputFormat;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.java.tuple.Tuple;
@@ -48,7 +48,7 @@ public class JDBCInputFormat<OUT extends Tuple> implements InputFormat<OUT, Inpu
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(JDBCInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JDBCInputFormat.class);
private String username;
private String password;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java b/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
index 3a75480..9e08206 100644
--- a/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
+++ b/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormat.java
@@ -24,8 +24,8 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.OutputFormat;
import org.apache.flink.api.java.tuple.Tuple;
import org.apache.flink.configuration.Configuration;
@@ -42,7 +42,7 @@ public class JDBCOutputFormat<OUT extends Tuple> implements OutputFormat<OUT> {
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(JDBCOutputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JDBCOutputFormat.class);
private String username;
private String password;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java b/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java
index f2930f2..9a4d927 100644
--- a/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java
+++ b/flink-addons/flink-jdbc/src/main/java/org/apache/flink/api/java/record/io/jdbc/JDBCInputFormat.java
@@ -25,8 +25,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.NonParallelInput;
import org.apache.flink.api.java.record.io.GenericInputFormat;
import org.apache.flink.configuration.Configuration;
@@ -56,7 +56,7 @@ public class JDBCInputFormat extends GenericInputFormat implements NonParallelIn
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(JDBCInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JDBCInputFormat.class);
public final String DRIVER_KEY = "driver";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
index 41e9c5a..84895bf 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCInputFormatTest.java
@@ -26,7 +26,6 @@ import java.sql.Statement;
import org.junit.Assert;
-import org.apache.flink.api.java.io.jdbc.JDBCInputFormat;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.api.java.tuple.Tuple5;
import org.junit.After;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
index a101a74..904c6d8 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/JDBCOutputFormatTest.java
@@ -26,8 +26,6 @@ import java.sql.Statement;
import org.junit.Assert;
-import org.apache.flink.api.java.io.jdbc.JDBCInputFormat;
-import org.apache.flink.api.java.io.jdbc.JDBCOutputFormat;
import org.apache.flink.api.java.tuple.Tuple3;
import org.apache.flink.api.java.tuple.Tuple5;
import org.junit.After;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
index 994eaf5..fd0764e 100644
--- a/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
+++ b/flink-addons/flink-jdbc/src/test/java/org/apache/flink/api/java/record/io/jdbc/JDBCOutputFormatTest.java
@@ -26,8 +26,6 @@ import java.sql.Statement;
import org.junit.Assert;
-import org.apache.flink.api.java.record.io.jdbc.JDBCInputFormat;
-import org.apache.flink.api.java.record.io.jdbc.JDBCOutputFormat;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.types.DoubleValue;
import org.apache.flink.types.FloatValue;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-jdbc/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-jdbc/src/test/resources/logback-test.xml b/flink-addons/flink-jdbc/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8b3bb27
--- /dev/null
+++ b/flink-addons/flink-jdbc/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-spargel/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-spargel/src/test/resources/logback-test.xml b/flink-addons/flink-spargel/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8b3bb27
--- /dev/null
+++ b/flink-addons/flink-spargel/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index 2c61fc9..3974720 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -52,6 +52,16 @@ under the License.
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.10</artifactId>
<version>0.8.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/flume/FlumeSink.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/flume/FlumeSink.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/flume/FlumeSink.java
index 5282704..c4618a7 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/flume/FlumeSink.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/flume/FlumeSink.java
@@ -17,8 +17,8 @@
package org.apache.flink.streaming.connectors.flume;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.function.sink.SinkFunction;
import org.apache.flume.Event;
@@ -31,7 +31,7 @@ import org.apache.flume.event.EventBuilder;
public abstract class FlumeSink<IN> implements SinkFunction<IN> {
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(FlumeSink.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FlumeSink.class);
private transient FlinkRpcClientFacade client;
boolean initDone = false;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
index a809c7a..ae04298 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSink.java
@@ -19,8 +19,8 @@ package org.apache.flink.streaming.connectors.rabbitmq;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.streaming.api.function.sink.SinkFunction;
import com.rabbitmq.client.Channel;
@@ -30,7 +30,7 @@ import com.rabbitmq.client.ConnectionFactory;
public abstract class RMQSink<IN> implements SinkFunction<IN> {
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(RMQSink.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RMQSink.class);
private boolean sendAndClose = false;
private boolean closeWithoutSend = false;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
index 30c9097..1fcd57b 100755
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/rabbitmq/RMQSource.java
@@ -1,4 +1,4 @@
-/**
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -12,15 +12,15 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
*/
package org.apache.flink.streaming.connectors.rabbitmq;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import net.spy.memcached.compat.log.Logger;
+import net.spy.memcached.compat.log.LoggerFactory;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.function.source.RichSourceFunction;
import org.apache.flink.util.Collector;
@@ -33,7 +33,7 @@ import com.rabbitmq.client.QueueingConsumer;
public abstract class RMQSource<OUT> extends RichSourceFunction<OUT> {
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(RMQSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RMQSource.class);
private final String QUEUE_NAME;
private final String HOST_NAME;
@@ -86,9 +86,7 @@ public abstract class RMQSource<OUT> extends RichSourceFunction<OUT> {
try {
delivery = consumer.nextDelivery();
} catch (Exception e) {
- if (LOG.isErrorEnabled()) {
- LOG.error("Cannot receive RMQ message " + QUEUE_NAME + " at " + HOST_NAME);
- }
+ LOG.error("Cannot receive RMQ message " + QUEUE_NAME + " at " + HOST_NAME);
}
outTuple = deserialize(delivery.getBody());
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
index 8a1e29e..4aa7a43 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterSource.java
@@ -25,10 +25,10 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.function.source.RichSourceFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.streaming.api.function.source.SourceFunction;
import org.apache.flink.util.Collector;
@@ -46,7 +46,7 @@ import com.twitter.hbc.httpclient.auth.OAuth1;
*/
public class TwitterSource extends RichSourceFunction<String> {
- private static final Log LOG = LogFactory.getLog(TwitterSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TwitterSource.class);
private static final long serialVersionUID = 1L;
private String authPath;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/logback-test.xml b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..45b3b92
--- /dev/null
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/resources/logback-test.xml
@@ -0,0 +1,30 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+ <logger name="org.apache.flink.streaming" level="WARN"/>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
index 77c860b..aaa7161 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/JobGraphBuilder.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.io.network.channels.ChannelType;
import org.apache.flink.runtime.jobgraph.AbstractJobVertex;
import org.apache.flink.runtime.jobgraph.DistributionPattern;
@@ -54,7 +54,7 @@ import org.apache.flink.streaming.util.serialization.TypeSerializerWrapper;
*/
public class JobGraphBuilder {
- private static final Log LOG = LogFactory.getLog(JobGraphBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobGraphBuilder.class);
private final JobGraph jobGraph;
// Graph attributes
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollector.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollector.java
index 162c5df..54b1a98 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollector.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/DirectedStreamCollector.java
@@ -1,4 +1,4 @@
-/**
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -12,21 +12,21 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
*/
package org.apache.flink.streaming.api.collector;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.flink.runtime.io.network.api.RecordWriter;
-import org.apache.flink.runtime.plugable.SerializationDelegate;
-import org.apache.flink.streaming.api.streamrecord.StreamRecord;
-import org.apache.flink.util.StringUtils;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.flink.runtime.io.network.api.RecordWriter;
+import org.apache.flink.runtime.plugable.SerializationDelegate;
+import org.apache.flink.streaming.api.streamrecord.StreamRecord;
+import org.apache.flink.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A StreamCollector that uses user defined output names and a user defined
@@ -38,7 +38,7 @@ import org.apache.flink.util.StringUtils;
public class DirectedStreamCollector<OUT> extends StreamCollector<OUT> {
OutputSelector<OUT> outputSelector;
- private static final Log LOG = LogFactory.getLog(DirectedStreamCollector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DirectedStreamCollector.class);
private Set<RecordWriter<SerializationDelegate<StreamRecord<OUT>>>> emitted;
/**
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
index 65098d4..c6ba1ef 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/collector/StreamCollector.java
@@ -1,4 +1,4 @@
-/**
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -12,7 +12,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
*/
package org.apache.flink.streaming.api.collector;
@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.flink.runtime.io.network.api.RecordWriter;
import org.apache.flink.runtime.plugable.SerializationDelegate;
import org.apache.flink.streaming.api.streamrecord.StreamRecord;
import org.apache.flink.util.Collector;
import org.apache.flink.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Collector for tuples in Apache Flink stream processing. The collected values
@@ -40,7 +40,7 @@ import org.apache.flink.util.StringUtils;
*/
public class StreamCollector<OUT> implements Collector<OUT> {
- private static final Log LOG = LogFactory.getLog(StreamCollector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StreamCollector.class);
protected StreamRecord<OUT> streamRecord;
protected int channelID;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
index 9169d65..b2fcf89 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
@@ -21,8 +21,8 @@ import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.client.program.Client;
import org.apache.flink.client.program.JobWithJars;
@@ -32,7 +32,7 @@ import org.apache.flink.core.fs.Path;
import org.apache.flink.runtime.jobgraph.JobGraph;
public class RemoteStreamEnvironment extends StreamExecutionEnvironment {
- private static final Log LOG = LogFactory.getLog(RemoteStreamEnvironment.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RemoteStreamEnvironment.class);
private String host;
private int port;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamOperatorInvokable.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamOperatorInvokable.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamOperatorInvokable.java
index d92d1f0..799f647 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamOperatorInvokable.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/invokable/StreamOperatorInvokable.java
@@ -17,14 +17,14 @@
package org.apache.flink.streaming.api.invokable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.streaming.api.streamrecord.StreamRecord;
import org.apache.flink.streaming.api.streamrecord.StreamRecordSerializer;
import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
import org.apache.flink.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The StreamOperatorInvokable represents the base class for all operators in
@@ -42,7 +42,7 @@ public abstract class StreamOperatorInvokable<IN, OUT> extends StreamInvokable<O
}
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(StreamInvokable.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StreamOperatorInvokable.class);
protected MutableObjectIterator<StreamRecord<IN>> recordIterator;
protected StreamRecordSerializer<IN> serializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
index 7b4f3ff..8a1a637 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSink.java
@@ -20,8 +20,8 @@ package org.apache.flink.streaming.api.streamcomponent;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.tuple.Tuple;
import org.apache.flink.streaming.api.streamrecord.StreamRecord;
import org.apache.flink.streaming.io.BlockingQueueBroker;
@@ -30,7 +30,7 @@ import org.apache.flink.util.StringUtils;
public class StreamIterationSink<IN extends Tuple> extends
AbstractStreamComponent {
- private static final Log LOG = LogFactory.getLog(StreamIterationSink.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StreamIterationSink.class);
private InputHandler<IN> inputHandler;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
index 7de80b2..ab02d84 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamIterationSource.java
@@ -21,8 +21,8 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.tuple.Tuple;
import org.apache.flink.runtime.io.network.api.RecordWriter;
import org.apache.flink.runtime.plugable.SerializationDelegate;
@@ -31,7 +31,7 @@ import org.apache.flink.streaming.io.BlockingQueueBroker;
public class StreamIterationSource<OUT extends Tuple> extends AbstractStreamComponent {
- private static final Log LOG = LogFactory.getLog(StreamIterationSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StreamIterationSource.class);
private OutputHandler<OUT> outputHandler;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
index 145b709..0797cc1 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamSink.java
@@ -17,13 +17,13 @@
package org.apache.flink.streaming.api.streamcomponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.flink.streaming.api.invokable.StreamOperatorInvokable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class StreamSink<IN> extends AbstractStreamComponent {
- private static final Log LOG = LogFactory.getLog(StreamSink.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StreamSink.class);
private InputHandler<IN> inputHandler;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
index 50a78b3..0853ec7 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
@@ -19,17 +19,17 @@ package org.apache.flink.streaming.util;
import java.net.InetSocketAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.client.program.Client;
import org.apache.flink.client.program.ProgramInvocationException;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.jobgraph.JobGraph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ClusterUtil {
- private static final Log LOG = LogFactory.getLog(ClusterUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClusterUtil.class);
public static final String CANNOT_EXECUTE_EMPTY_JOB = "Cannot execute empty job";
/**
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java
deleted file mode 100644
index 82a6119..0000000
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/LogUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.streaming.util;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
-public class LogUtils {
-
- public static void initializeDefaultConsoleLogger() {
- initializeDefaultConsoleLogger(Level.DEBUG, Level.INFO);
- }
-
- public static void initializeDefaultConsoleLogger(Level logLevel, Level rootLevel) {
- Logger logger = Logger.getLogger("org.apache.flink.streaming");
- logger.removeAllAppenders();
- logger.setAdditivity(false);
- PatternLayout layout = new PatternLayout();
- // layout.setConversionPattern("%highlight{%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n}");
- // TODO Add highlight
- layout.setConversionPattern("%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n");
- ConsoleAppender appender = new ConsoleAppender(layout, "System.err");
- logger.addAppender(appender);
- logger.setLevel(logLevel);
-
- Logger root = Logger.getRootLogger();
- root.removeAllAppenders();
- root.addAppender(appender);
- root.setLevel(rootLevel);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
index 9a19256..53eafaa 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/TestDataUtil.java
@@ -30,14 +30,14 @@ import java.net.URL;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestDataUtil {
// TODO: Exception handling
// TODO: check checksum after download
- private static final Log LOG = LogFactory.getLog(TestDataUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestDataUtil.class);
public static final String testDataDir = "src/test/resources/testdata/";
public static final String testRepoUrl = "http://info.ilab.sztaki.hu/~mbalassi/flink-streaming/testdata/";
public static final String testChekSumDir = "src/test/resources/testdata_checksum/";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
index da9de05..83f7e8e 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/IterateTest.java
@@ -26,7 +26,6 @@ import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.function.sink.SinkFunction;
import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
import org.junit.Test;
public class IterateTest {
@@ -74,8 +73,6 @@ public class IterateTest {
@Test
public void test() throws Exception {
- LogUtils.initializeDefaultTestConsoleLogger();
-
LocalStreamEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
env.setBufferTimeout(10);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
index 43c36a0..8baa99f 100755
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/PrintTest.java
@@ -21,7 +21,6 @@ import org.apache.flink.api.common.functions.FilterFunction;
import org.apache.flink.api.common.functions.MapFunction;
import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
-import org.apache.flink.util.LogUtils;
import org.junit.Test;
public class PrintTest{
@@ -48,8 +47,6 @@ public class PrintTest{
@Test
public void test() throws Exception {
- LogUtils.initializeDefaultTestConsoleLogger();
-
LocalStreamEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
env.generateSequence(1, 10).map(new IdentityMap()).filter(new FilterAll()).print();
env.executeTest(MEMORYSIZE);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsCsvTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsCsvTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsCsvTest.java
index 417ed85..7e87537 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsCsvTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsCsvTest.java
@@ -32,7 +32,6 @@ import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.function.source.SourceFunction;
import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -133,9 +132,6 @@ public class WriteAsCsvTest {
@Test
public void test() throws Exception {
-
- LogUtils.initializeDefaultTestConsoleLogger();
-
LocalStreamEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsTextTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsTextTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsTextTest.java
index eea97ec..df970ae 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsTextTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/WriteAsTextTest.java
@@ -31,7 +31,6 @@ import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.function.source.SourceFunction;
-import org.apache.flink.util.LogUtils;
import org.apache.flink.util.Collector;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -133,9 +132,6 @@ public class WriteAsTextTest {
@Test
public void test() throws Exception {
-
- LogUtils.initializeDefaultTestConsoleLogger();
-
LocalStreamEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/DirectedOutputTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/DirectedOutputTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/DirectedOutputTest.java
index 1580235..1608b7b 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/DirectedOutputTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/collector/DirectedOutputTest.java
@@ -29,8 +29,6 @@ import org.apache.flink.streaming.api.datastream.SplitDataStream;
import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.function.sink.SinkFunction;
-import org.apache.flink.streaming.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.Test;
public class DirectedOutputTest {
@@ -90,7 +88,6 @@ public class DirectedOutputTest {
@SuppressWarnings("unused")
@Test
public void directOutputTest() throws Exception {
- LogUtils.initializeDefaultConsoleLogger(Level.OFF, Level.OFF);
LocalStreamEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
SplitDataStream<Long> s = env.generateSequence(1, 6).split(new MySelector(),
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/CoFlatMapTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/CoFlatMapTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/CoFlatMapTest.java
index b31b39c..e7f12bd 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/CoFlatMapTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/CoFlatMapTest.java
@@ -29,10 +29,8 @@ import org.apache.flink.streaming.api.environment.LocalStreamEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.function.co.CoFlatMapFunction;
import org.apache.flink.streaming.api.invokable.operator.co.CoFlatMapInvokable;
-import org.apache.flink.streaming.util.LogUtils;
import org.apache.flink.streaming.util.MockCoInvokable;
import org.apache.flink.util.Collector;
-import org.apache.log4j.Level;
import org.junit.Test;
public class CoFlatMapTest implements Serializable {
@@ -70,8 +68,6 @@ public class CoFlatMapTest implements Serializable {
@SuppressWarnings("unchecked")
@Test
public void multipleInputTest() {
- LogUtils.initializeDefaultConsoleLogger(Level.OFF, Level.OFF);
-
LocalStreamEnvironment env = StreamExecutionEnvironment.createLocalEnvironment(1);
DataStream<Integer> ds1 = env.fromElements(1, 3, 5);
[4/5] [FLINK-1086] Replace JCL with SLF4J and Log4j with LOGBack
Posted by uc...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
index b0799cd..efb1e94 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/streamcomponent/StreamComponentTest.java
@@ -36,9 +36,6 @@ import org.apache.flink.streaming.api.function.sink.SinkFunction;
import org.apache.flink.streaming.api.function.source.SourceFunction;
import org.apache.flink.streaming.util.ClusterUtil;
import org.apache.flink.util.Collector;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -86,11 +83,6 @@ public class StreamComponentTest {
private static final int SOURCE_PARALELISM = 1;
private static final long MEMORYSIZE = 32;
- @Before
- public void before() {
- LogUtils.initializeDefaultConsoleLogger(Level.OFF);
- }
-
@Ignore
@Test
public void wrongJobGraph() {
@@ -193,9 +185,6 @@ public class StreamComponentTest {
@Test
public void runStream() {
-
- LogUtils.initializeDefaultTestConsoleLogger();
-
LocalStreamEnvironment env = StreamExecutionEnvironment
.createLocalEnvironment(SOURCE_PARALELISM);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-streaming/flink-streaming-core/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/resources/logback-test.xml b/flink-addons/flink-streaming/flink-streaming-core/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..45b3b92
--- /dev/null
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/resources/logback-test.xml
@@ -0,0 +1,30 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+ <logger name="org.apache.flink.streaming" level="WARN"/>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Client.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Client.java b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Client.java
index 292d59a..adced76 100644
--- a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Client.java
+++ b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Client.java
@@ -44,8 +44,8 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.client.CliFrontend;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.GlobalConfiguration;
@@ -74,11 +74,6 @@ import org.apache.hadoop.yarn.client.api.YarnClient;
import org.apache.hadoop.yarn.client.api.YarnClientApplication;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.util.Records;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
/**
* All classes in this package contain code taken from
@@ -94,7 +89,7 @@ import org.apache.log4j.PatternLayout;
*
*/
public class Client {
- private static final Log LOG = LogFactory.getLog(Client.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Client.class);
/**
* Command Line argument options
@@ -202,21 +197,6 @@ public class Client {
System.exit(1);
}
- if (System.getProperty("log4j.configuration") == null) {
- Logger root = Logger.getRootLogger();
- root.removeAllAppenders();
- PatternLayout layout = new PatternLayout("%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n");
- ConsoleAppender appender = new ConsoleAppender(layout, "System.err");
- root.addAppender(appender);
- if(cmd.hasOption(VERBOSE.getOpt())) {
- root.setLevel(Level.DEBUG);
- LOG.debug("CLASSPATH: "+System.getProperty("java.class.path"));
- } else {
- root.setLevel(Level.INFO);
- }
- }
-
-
// Jar Path
Path localJarPath;
if(cmd.hasOption(FLINK_JAR.getOpt())) {
@@ -243,7 +223,7 @@ public class Client {
confDirPath = cmd.getOptionValue(FLINK_CONF_DIR.getOpt())+"/";
File confFile = new File(confDirPath+CONFIG_FILE_NAME);
if(!confFile.exists()) {
- LOG.fatal("Unable to locate configuration file in "+confFile);
+ LOG.error("Unable to locate configuration file in "+confFile);
System.exit(1);
}
confPath = new Path(confFile.getAbsolutePath());
@@ -290,13 +270,13 @@ public class Client {
LOG.warn("Ship directory is not a directory!");
}
}
- boolean hasLog4j = false;
- //check if there is a log4j file
+ boolean hasLogback = false;
+ //check if there is a logback file
if(confDirPath.length() > 0) {
- File l4j = new File(confDirPath+"/log4j.properties");
- if(l4j.exists()) {
- shipFiles.add(l4j);
- hasLog4j = true;
+ File logback = new File(confDirPath+"/logback.xml");
+ if(logback.exists()) {
+ shipFiles.add(logback);
+ hasLogback = true;
}
}
@@ -373,7 +353,7 @@ public class Client {
showClusterMetrics(yarnClient);
}
if(!cmd.hasOption(CONTAINER.getOpt())) {
- LOG.fatal("Missing required argument "+CONTAINER.getOpt());
+ LOG.error("Missing required argument "+CONTAINER.getOpt());
printUsage();
yarnClient.stop();
System.exit(1);
@@ -395,13 +375,13 @@ public class Client {
GetNewApplicationResponse appResponse = app.getNewApplicationResponse();
Resource maxRes = appResponse.getMaximumResourceCapability();
if(tmMemory > maxRes.getMemory() || tmCores > maxRes.getVirtualCores()) {
- LOG.fatal("The cluster does not have the requested resources for the TaskManagers available!\n"
+ LOG.error("The cluster does not have the requested resources for the TaskManagers available!\n"
+ "Maximum Memory: "+maxRes.getMemory() +", Maximum Cores: "+tmCores);
yarnClient.stop();
System.exit(1);
}
if(jmMemory > maxRes.getMemory() ) {
- LOG.fatal("The cluster does not have the requested resources for the JobManager available!\n"
+ LOG.error("The cluster does not have the requested resources for the JobManager available!\n"
+ "Maximum Memory: "+maxRes.getMemory());
yarnClient.stop();
System.exit(1);
@@ -409,19 +389,19 @@ public class Client {
int totalMemoryRequired = jmMemory + tmMemory * taskManagerCount;
ClusterResourceDescription freeClusterMem = getCurrentFreeClusterResources(yarnClient);
if(freeClusterMem.totalFreeMemory < totalMemoryRequired) {
- LOG.fatal("This YARN session requires "+totalMemoryRequired+"MB of memory in the cluster. "
+ LOG.error("This YARN session requires "+totalMemoryRequired+"MB of memory in the cluster. "
+ "There are currently only "+freeClusterMem.totalFreeMemory+"MB available.");
yarnClient.stop();
System.exit(1);
}
if( tmMemory > freeClusterMem.containerLimit) {
- LOG.fatal("The requested amount of memory for the TaskManagers ("+tmMemory+"MB) is more than "
+ LOG.error("The requested amount of memory for the TaskManagers ("+tmMemory+"MB) is more than "
+ "the largest possible YARN container: "+freeClusterMem.containerLimit);
yarnClient.stop();
System.exit(1);
}
if( jmMemory > freeClusterMem.containerLimit) {
- LOG.fatal("The requested amount of memory for the JobManager ("+jmMemory+"MB) is more than "
+ LOG.error("The requested amount of memory for the JobManager ("+jmMemory+"MB) is more than "
+ "the largest possible YARN container: "+freeClusterMem.containerLimit);
yarnClient.stop();
System.exit(1);
@@ -436,8 +416,9 @@ public class Client {
String amCommand = "$JAVA_HOME/bin/java"
+ " -Xmx"+Utils.calculateHeapSize(jmMemory)+"M " +javaOpts;
- if(hasLog4j) {
- amCommand += " -Dlog.file=\""+ApplicationConstants.LOG_DIR_EXPANSION_VAR +"/jobmanager-log4j.log\" -Dlog4j.configuration=file:log4j.properties";
+ if(hasLogback) {
+ amCommand += " -Dlog.file=\""+ApplicationConstants.LOG_DIR_EXPANSION_VAR +"/jobmanager-logback.log\" " +
+ "-Dlogback.configurationFile=file:logback.xml";
}
amCommand += " "+ApplicationMaster.class.getName()+" "
+ " 1>"
@@ -777,7 +758,7 @@ public class Client {
try {
jar = new JarFile(localJarPath.toUri().getPath());
} catch(FileNotFoundException fne) {
- LOG.fatal("Unable to access jar file. Specify jar file or configuration file.", fne);
+ LOG.error("Unable to access jar file. Specify jar file or configuration file.", fne);
System.exit(1);
}
InputStream confStream = jar.getInputStream(jar.getEntry("flink-conf.yaml"));
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/ClientMasterControl.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/ClientMasterControl.java b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/ClientMasterControl.java
index 1c87289..07762cc 100644
--- a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/ClientMasterControl.java
+++ b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/ClientMasterControl.java
@@ -23,8 +23,8 @@ import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.ipc.RPC;
import org.apache.flink.runtime.net.NetUtils;
import org.apache.flink.yarn.rpc.ApplicationMasterStatus;
@@ -33,7 +33,7 @@ import org.apache.flink.yarn.rpc.YARNClientMasterProtocol.Message;
public class ClientMasterControl extends Thread {
- private static final Log LOG = LogFactory.getLog(ClientMasterControl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClientMasterControl.class);
private InetSocketAddress applicationMasterAddress;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
index bd2cb9e..01539f8 100644
--- a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
+++ b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
@@ -34,8 +34,8 @@ import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.hadoop.conf.Configuration;
@@ -61,7 +61,7 @@ import org.apache.hadoop.yarn.util.ConverterUtils;
public class Utils {
- private static final Log LOG = LogFactory.getLog(Utils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
private static final int HEAP_LIMIT_CAP = 500;
@@ -163,7 +163,7 @@ public class Utils {
try {
hadoopHome = Shell.getHadoopHome();
} catch (IOException e) {
- LOG.fatal("Unable to get hadoop home. Please set HADOOP_HOME variable!", e);
+ LOG.error("Unable to get hadoop home. Please set HADOOP_HOME variable!", e);
System.exit(1);
}
File tryConf = new File(hadoopHome+"/etc/hadoop");
@@ -181,10 +181,10 @@ public class Utils {
}
public static void setupEnv(Configuration conf, Map<String, String> appMasterEnv) {
+ addToEnvironment(appMasterEnv, Environment.CLASSPATH.name(), Environment.PWD.$() + File.separator + "*");
for (String c : conf.getStrings(YarnConfiguration.YARN_APPLICATION_CLASSPATH,YarnConfiguration.DEFAULT_YARN_APPLICATION_CLASSPATH)) {
addToEnvironment(appMasterEnv, Environment.CLASSPATH.name(), c.trim());
}
- addToEnvironment(appMasterEnv, Environment.CLASSPATH.name(), Environment.PWD.$() + File.separator + "*");
}
@@ -236,7 +236,7 @@ public class Utils {
amContainer.setTokens(securityTokens);
}
- public static void logFilesInCurrentDirectory(final Log logger) {
+ public static void logFilesInCurrentDirectory(final Logger logger) {
new File(".").list(new FilenameFilter() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
index 30d2f30..afda8e0 100644
--- a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
+++ b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.client.CliFrontend;
import org.apache.flink.configuration.ConfigConstants;
@@ -78,7 +78,7 @@ import com.google.common.base.Preconditions;
public class ApplicationMaster implements YARNClientMasterProtocol {
- private static final Log LOG = LogFactory.getLog(ApplicationMaster.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ApplicationMaster.class);
private final String currDir;
private final String logDirs;
@@ -132,9 +132,9 @@ public class ApplicationMaster implements YARNClientMasterProtocol {
private List<Message> messages = new SerializableArrayList<Message>();
/**
- * Indicates if a log4j config file is being shipped.
+ * Indicates if a logback config file is being shipped.
*/
- private boolean hasLog4j;
+ private boolean hasLogback;
/**
* Heap size of TaskManager containers in MB.
@@ -332,7 +332,7 @@ public class ApplicationMaster implements YARNClientMasterProtocol {
LOG.info("Prepared local resource for modified yaml: "+flinkConf);
- hasLog4j = new File(currDir+"/log4j.properties").exists();
+ hasLogback = new File(currDir+"/logback.xml").exists();
// prepare the files to ship
LocalResource[] remoteShipRsc = null;
String[] remoteShipPaths = shipListString.split(",");
@@ -416,8 +416,9 @@ public class ApplicationMaster implements YARNClientMasterProtocol {
ContainerLaunchContext ctx = Records.newRecord(ContainerLaunchContext.class);
String tmCommand = "$JAVA_HOME/bin/java -Xmx"+heapLimit+"m " + javaOpts ;
- if(hasLog4j) {
- tmCommand += " -Dlog.file=\""+ApplicationConstants.LOG_DIR_EXPANSION_VAR +"/taskmanager-log4j.log\" -Dlog4j.configuration=file:log4j.properties";
+ if(hasLogback) {
+ tmCommand += " -Dlog.file=\""+ApplicationConstants.LOG_DIR_EXPANSION_VAR +"/taskmanager-logback" +
+ ".log\" -Dlogback.configurationFile=file:logback.xml";
}
tmCommand += " "+YarnTaskManagerRunner.class.getName()+" -configDir . "
+ " 1>"
@@ -585,7 +586,7 @@ public class ApplicationMaster implements YARNClientMasterProtocol {
am.setRMClient(rmClient);
am.run();
} catch (Throwable e) {
- LOG.fatal("Error while running the application master", e);
+ LOG.error("Error while running the application master", e);
// the AM is not available. Report error through the unregister function.
if(rmClient != null && am == null) {
try {
@@ -593,13 +594,13 @@ public class ApplicationMaster implements YARNClientMasterProtocol {
+ " stopped unexpectedly with an exception.\n"
+ StringUtils.stringifyException(e), "");
} catch (Exception e1) {
- LOG.fatal("Unable to fail the application master", e1);
+ LOG.error("Unable to fail the application master", e1);
}
LOG.info("AM unregistered from RM");
return null;
}
if(rmClient == null) {
- LOG.fatal("Unable to unregister AM since the RM client is not available");
+ LOG.error("Unable to unregister AM since the RM client is not available");
}
if(am != null) {
LOG.info("Writing error into internal message system");
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/YarnTaskManagerRunner.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/YarnTaskManagerRunner.java b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/YarnTaskManagerRunner.java
index 0b0b1e4..ba0edc6 100644
--- a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/YarnTaskManagerRunner.java
+++ b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/YarnTaskManagerRunner.java
@@ -23,8 +23,8 @@ import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.taskmanager.TaskManager;
import org.apache.flink.yarn.Client;
import org.apache.hadoop.security.UserGroupInformation;
@@ -35,7 +35,7 @@ import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
public class YarnTaskManagerRunner {
- private static final Log LOG = LogFactory.getLog(YarnTaskManagerRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(YarnTaskManagerRunner.class);
public static void main(final String[] args) throws IOException {
Map<String, String> envs = System.getenv();
@@ -59,7 +59,7 @@ public class YarnTaskManagerRunner {
try {
TaskManager.main(newArgs);
} catch (Exception e) {
- LOG.fatal("Error while running the TaskManager", e);
+ LOG.error("Error while running the TaskManager", e);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
index 52eda29..d637c7e 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
@@ -28,8 +28,6 @@ import org.apache.flink.api.common.PlanExecutor;
import org.apache.flink.api.common.Program;
import org.apache.flink.runtime.client.JobClient;
import org.apache.flink.runtime.jobgraph.JobGraph;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.client.minicluster.NepheleMiniCluster;
import org.apache.flink.compiler.DataStatistics;
@@ -77,10 +75,6 @@ public class LocalExecutor extends PlanExecutor {
if (!ExecutionEnvironment.localExecutionIsAllowed()) {
throw new InvalidProgramException("The LocalEnvironment cannot be used when submitting a program through a client.");
}
-
- if (System.getProperty("log4j.configuration") == null) {
- setLoggingLevel(Level.INFO);
- }
}
public int getJobManagerRpcPort() {
@@ -339,14 +333,7 @@ public class LocalExecutor extends PlanExecutor {
List<DataSinkNode> sinks = PactCompiler.createPreOptimizedPlan(plan);
return gen.getPactPlanAsJSON(sinks);
}
-
- /**
- * Utility method for logging
- */
- public static void setLoggingLevel(Level lvl) {
- LogUtils.initializeDefaultConsoleLogger(lvl);
- }
-
+
/**
* By default, local environments do not overwrite existing files.
*
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java
index 53c4dac..7334578 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/WebFrontend.java
@@ -19,8 +19,8 @@
package org.apache.flink.client;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.client.web.WebInterfaceServer;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
@@ -35,7 +35,7 @@ public class WebFrontend {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(WebFrontend.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WebFrontend.class);
/**
* Main method. accepts a single parameter, which is the config directory.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java b/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java
index 454c543..db52adc 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java
@@ -21,8 +21,8 @@ package org.apache.flink.client.minicluster;
import java.lang.reflect.Method;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.FileInputFormat;
import org.apache.flink.api.common.io.FileOutputFormat;
import org.apache.flink.configuration.ConfigConstants;
@@ -37,7 +37,7 @@ import org.apache.flink.runtime.jobmanager.JobManager;
public class NepheleMiniCluster {
- private static final Log LOG = LogFactory.getLog(NepheleMiniCluster.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NepheleMiniCluster.class);
private static final int DEFAULT_JM_RPC_PORT = 6498;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
index a82b9d5..88ddc9d 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
@@ -27,8 +27,8 @@ import java.net.InetSocketAddress;
import java.util.List;
import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.JobExecutionResult;
import org.apache.flink.api.common.Plan;
import org.apache.flink.compiler.CompilerException;
@@ -58,7 +58,7 @@ import org.apache.flink.api.java.ExecutionEnvironment;
*/
public class Client {
- private static final Log LOG = LogFactory.getLog(Client.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Client.class);
private final Configuration configuration; // the configuration describing the job manager address
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
index 844930c..52d22f0 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
@@ -35,8 +35,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.flink.client.program.Client;
import org.apache.flink.client.program.PackagedProgram;
import org.apache.flink.client.program.ProgramInvocationException;
@@ -45,6 +43,8 @@ import org.apache.flink.compiler.plan.OptimizedPlan;
import org.apache.flink.compiler.plandump.PlanJSONDumpGenerator;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.jobgraph.JobGraph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JobSubmissionServlet extends HttpServlet {
@@ -74,7 +74,7 @@ public class JobSubmissionServlet extends HttpServlet {
private static final String SUSPEND_PARAM_NAME = "suspend";
- private static final Log LOG = LogFactory.getLog(JobSubmissionServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobSubmissionServlet.class);
// ------------------------------------------------------------------------
@@ -86,7 +86,7 @@ public class JobSubmissionServlet extends HttpServlet {
private final Random rand; // random number generator for UID
- private final Configuration nepheleConfig;
+ private final Configuration nepheleConfig;
public JobSubmissionServlet(Configuration nepheleConfig, File jobDir, File planDir) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java
index 1ca7408..570f222 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/PactJobJSONServlet.java
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.client.program.PackagedProgram;
@@ -38,7 +38,7 @@ public class PactJobJSONServlet extends HttpServlet {
/** Serial UID for serialization interoperability. */
private static final long serialVersionUID = 558077298726449201L;
- private static final Log LOG = LogFactory.getLog(PactJobJSONServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PactJobJSONServlet.class);
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java b/flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java
index a7da0f9..af1725c 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/WebInterfaceServer.java
@@ -23,8 +23,8 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
@@ -48,7 +48,7 @@ public class WebInterfaceServer {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(WebInterfaceServer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WebInterfaceServer.class);
/**
* The jetty server serving all requests.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java
----------------------------------------------------------------------
diff --git a/flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java b/flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java
index de5a3e1..7ba5dcc 100644
--- a/flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java
+++ b/flink-compiler/src/main/java/org/apache/flink/compiler/PactCompiler.java
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.common.Plan;
import org.apache.flink.api.common.operators.Operator;
@@ -321,7 +321,7 @@ public class PactCompiler {
/**
* The log handle that is used by the compiler to log messages.
*/
- public static final Log LOG = LogFactory.getLog(PactCompiler.class);
+ public static final Logger LOG = LoggerFactory.getLogger(PactCompiler.class);
// ------------------------------------------------------------------------
// Members
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
----------------------------------------------------------------------
diff --git a/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java b/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
index fcf9f8d..043a0a7 100644
--- a/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
+++ b/flink-compiler/src/main/java/org/apache/flink/compiler/plantranslate/NepheleJobGraphGenerator.java
@@ -103,7 +103,7 @@ public class NepheleJobGraphGenerator implements Visitor<PlanNode> {
private static final boolean mergeIterationAuxTasks = GlobalConfiguration.getBoolean(MERGE_ITERATION_AUX_TASKS_KEY, false);
-// private static final Log LOG = LogFactory.getLog(NepheleJobGraphGenerator.class);
+// private static final Logger LOG = LoggerFactory.getLogger(NepheleJobGraphGenerator.class);
private static final TaskInChain ALREADY_VISITED_PLACEHOLDER = new TaskInChain(null, null, null);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java
----------------------------------------------------------------------
diff --git a/flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java b/flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java
index 0115c31..a13e4a8 100644
--- a/flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java
+++ b/flink-compiler/src/test/java/org/apache/flink/compiler/CompilerTestBase.java
@@ -37,11 +37,9 @@ import org.apache.flink.compiler.costs.DefaultCostEstimator;
import org.apache.flink.compiler.plan.OptimizedPlan;
import org.apache.flink.compiler.plan.PlanNode;
import org.apache.flink.compiler.plan.SingleInputPlanNode;
-import org.apache.flink.util.LogUtils;
import org.apache.flink.util.OperatingSystem;
import org.apache.flink.util.Visitor;
import org.junit.Before;
-import org.junit.BeforeClass;
/**
*
@@ -72,11 +70,6 @@ public abstract class CompilerTestBase implements java.io.Serializable {
// ------------------------------------------------------------------------
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
-
@Before
public void setup() {
this.dataStats = new DataStatistics();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-compiler/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-compiler/src/test/resources/logback-test.xml b/flink-compiler/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8b3bb27
--- /dev/null
+++ b/flink-compiler/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index cd338c9..e0c0a2f 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -33,7 +33,7 @@ under the License.
<name>flink-core</name>
<packaging>jar</packaging>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java
index ec63da7..4216f20 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.BlockLocation;
@@ -50,7 +50,7 @@ public abstract class BinaryInputFormat<T extends IOReadableWritable> extends Fi
/**
* The log.
*/
- private static final Log LOG = LogFactory.getLog(BinaryInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BinaryInputFormat.class);
/**
* The config parameter which defines the fixed length of a record.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java
index b6ad8b3..63a394f 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/io/DelimitedInputFormat.java
@@ -25,8 +25,8 @@ import java.nio.charset.IllegalCharsetNameException;
import java.nio.charset.UnsupportedCharsetException;
import java.util.ArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.common.operators.base.FileDataSourceBase;
import org.apache.flink.configuration.ConfigConstants;
@@ -55,7 +55,7 @@ public abstract class DelimitedInputFormat<OT> extends FileInputFormat<OT> {
/**
* The log.
*/
- private static final Log LOG = LogFactory.getLog(DelimitedInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DelimitedInputFormat.class);
/**
* The default read buffer size = 1MB.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
index 9a674a2..ccd6c51 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/io/FileInputFormat.java
@@ -26,8 +26,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.common.operators.base.GenericDataSourceBase;
import org.apache.flink.configuration.ConfigConstants;
@@ -53,7 +53,7 @@ public abstract class FileInputFormat<OT> implements InputFormat<OT, FileInputSp
// -------------------------------------- Constants -------------------------------------------
- private static final Log LOG = LogFactory.getLog(FileInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileInputFormat.class);
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java
index ad771be..4331116 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/io/FileOutputFormat.java
@@ -21,8 +21,8 @@ package org.apache.flink.api.common.io;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.operators.base.FileDataSinkBase;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
@@ -83,7 +83,7 @@ public abstract class FileOutputFormat<IT> implements OutputFormat<IT>, Initiali
/**
* The LOG for logging messages in this class.
*/
- private static final Log LOG = LogFactory.getLog(FileOutputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileOutputFormat.class);
/**
* The key under which the name of the target path is stored in the configuration.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java
index c91e6ab..81c6679 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/BulkIterationBase.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.common.aggregators.Aggregator;
import org.apache.flink.api.common.aggregators.AggregatorRegistry;
@@ -281,7 +281,7 @@ public class BulkIterationBase<T> extends SingleInputOperator<T, T, AbstractRich
@SuppressWarnings("serial")
public static class TerminationCriterionAggregationConvergence implements ConvergenceCriterion<LongValue> {
- private static final Log log = LogFactory.getLog(TerminationCriterionAggregationConvergence.class);
+ private static final Logger log = LoggerFactory.getLogger(TerminationCriterionAggregationConvergence.class);
@Override
public boolean isConverged(int iteration, LongValue countAggregate) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java b/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
index c9de712..648b9b5 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
@@ -33,8 +33,8 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.util.StringUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -54,7 +54,7 @@ public final class GlobalConfiguration {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(GlobalConfiguration.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GlobalConfiguration.class);
/**
* The global configuration object accessible through a singleton pattern.
@@ -460,7 +460,6 @@ public final class GlobalConfiguration {
}
if (!"configuration".equals(root.getNodeName())) {
- LOG.warn("Cannot load configuration: unknown element " + root.getNodeName());
return;
}
@@ -481,14 +480,11 @@ public final class GlobalConfiguration {
}
if (!(propNode instanceof Element)) {
- LOG.warn("Error while reading configuration: " + propNode.getNodeName()
- + " is not of type element");
continue;
}
Element property = (Element) propNode;
if (!"property".equals(property.getNodeName())) {
- LOG.warn("Error while reading configuration: unknown element " + property.getNodeName());
continue;
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java
index 2289091..2b2b5e0 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/local/LocalFileSystem.java
@@ -32,8 +32,8 @@ import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.fs.BlockLocation;
import org.apache.flink.core.fs.FSDataInputStream;
import org.apache.flink.core.fs.FSDataOutputStream;
@@ -64,7 +64,7 @@ public class LocalFileSystem extends FileSystem {
*/
private final String hostName;
- private static final Log LOG = LogFactory.getLog(LocalFileSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LocalFileSystem.class);
/**
* Constructs a new <code>LocalFileSystem</code> object.
@@ -77,7 +77,7 @@ public class LocalFileSystem extends FileSystem {
try {
tmp = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
- LOG.error(e);
+ LOG.error("Could not resolve local host", e);
}
this.hostName = tmp;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/main/java/org/apache/flink/util/LogUtils.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/util/LogUtils.java b/flink-core/src/main/java/org/apache/flink/util/LogUtils.java
deleted file mode 100644
index be8c061..0000000
--- a/flink-core/src/main/java/org/apache/flink/util/LogUtils.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.util;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
-
-public class LogUtils {
-
- public static void initializeDefaultConsoleLogger() {
- initializeDefaultConsoleLogger(Level.INFO);
- }
-
- public static void initializeDefaultTestConsoleLogger() {
- initializeDefaultConsoleLogger(Level.WARN);
- }
-
- public static void initializeDefaultConsoleLogger(Level logLevel) {
- Logger root = Logger.getRootLogger();
- root.removeAllAppenders();
- PatternLayout layout = new PatternLayout("%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n");
- ConsoleAppender appender = new ConsoleAppender(layout, "System.err");
- root.addAppender(appender);
- root.setLevel(logLevel);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java
index 889f2b4..6418ce7 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java
@@ -23,16 +23,11 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.flink.api.common.io.BinaryInputFormat;
-import org.apache.flink.api.common.io.BlockInfo;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.types.Record;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
public class BinaryInputFormatTest {
@@ -47,11 +42,6 @@ public class BinaryInputFormatTest {
}
}
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
@Test
public void testCreateInputSplitsWithOneFile() throws IOException {
// create temporary file with 3 blocks
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java
index 632acd4..9512a73 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatSamplingTest.java
@@ -19,7 +19,6 @@
package org.apache.flink.api.common.io;
-import org.apache.flink.api.common.io.DelimitedInputFormat;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
@@ -27,8 +26,6 @@ import org.apache.flink.testutils.TestConfigUtils;
import org.apache.flink.testutils.TestFileSystem;
import org.apache.flink.testutils.TestFileUtils;
import org.apache.flink.types.IntValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -75,8 +72,6 @@ public class DelimitedInputFormatSamplingTest {
@BeforeClass
public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.ERROR);
-
try {
TestFileSystem.registerTestFileSysten();
} catch (Throwable t) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java
index f01e025..7b8e58b 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/DelimitedInputFormatTest.java
@@ -34,17 +34,13 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStreamWriter;
-import org.apache.flink.api.common.io.DelimitedInputFormat;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.fs.Path;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
public class DelimitedInputFormatTest {
@@ -56,12 +52,7 @@ public class DelimitedInputFormatTest {
private final DelimitedInputFormat<Record> format = new MyTextInputFormat();
// --------------------------------------------------------------------------------------------
-
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
+
@Before
public void setup() {
this.format.setFilePath(new Path("file:///some/file/that/will/not/be/read"));
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
index 0c12456..9e93e67 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/FileInputFormatTest.java
@@ -24,26 +24,18 @@ import java.io.FileWriter;
import java.io.IOException;
import java.net.URI;
-import org.apache.flink.api.common.io.FileInputFormat;
import org.apache.flink.api.common.io.FileInputFormat.FileBaseStatistics;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.testutils.TestFileUtils;
import org.apache.flink.types.IntValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
public class FileInputFormatTest {
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.ERROR);
- }
-
@Test
public void testGetStatisticsNonExistingFile() {
try {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
index fd09c07..89e77d8 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/FileOutputFormatTest.java
@@ -24,23 +24,15 @@ import java.io.IOException;
import org.junit.Assert;
-import org.apache.flink.api.common.io.FileOutputFormat;
import org.apache.flink.api.common.io.FileOutputFormat.OutputDirectoryMode;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.Path;
import org.apache.flink.core.fs.FileSystem.WriteMode;
import org.apache.flink.types.IntValue;
-import org.apache.flink.util.LogUtils;
-import org.junit.BeforeClass;
import org.junit.Test;
public class FileOutputFormatTest {
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
-
@Test
public void testCreateNoneParallelLocalFS() {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java
index d77901b..3534c84 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/GenericCsvInputFormatTest.java
@@ -31,8 +31,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.flink.api.common.io.GenericCsvInputFormat;
-import org.apache.flink.api.common.io.ParseException;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.fs.Path;
@@ -41,11 +39,8 @@ import org.apache.flink.types.IntValue;
import org.apache.flink.types.LongValue;
import org.apache.flink.types.StringValue;
import org.apache.flink.types.Value;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
public class GenericCsvInputFormatTest {
@@ -56,11 +51,6 @@ public class GenericCsvInputFormatTest {
// --------------------------------------------------------------------------------------------
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
@Before
public void setup() {
format = new TestCsvInputFormat();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java
index eaf1c09..85003e5 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/io/SequentialFormatTest.java
@@ -27,12 +27,6 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import org.apache.flink.api.common.io.BinaryInputFormat;
-import org.apache.flink.api.common.io.BinaryOutputFormat;
-import org.apache.flink.api.common.io.BlockInfo;
-import org.apache.flink.api.common.io.FormatUtil;
-import org.apache.flink.api.common.io.SerializedInputFormat;
-import org.apache.flink.api.common.io.SerializedOutputFormat;
import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
@@ -42,12 +36,9 @@ import org.apache.flink.core.memory.OutputViewDataOutputStreamWrapper;
import org.apache.flink.types.IntValue;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -79,11 +70,6 @@ public class SequentialFormatTest {
private File tempFile;
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
/**
* Initializes SequentialFormatTest.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java
index c8fc301..d60da17 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java
@@ -22,7 +22,8 @@ package org.apache.flink.api.common.typeutils;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-public class SerializerTestInstance<T> extends SerializerTestBase<T> {
+public class
+ SerializerTestInstance<T> extends SerializerTestBase<T> {
private final TypeSerializer<T> serializer;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java b/flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java
index 8d60854..6aa8a73 100644
--- a/flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java
+++ b/flink-core/src/test/java/org/apache/flink/configuration/GlobalConfigurationTest.java
@@ -27,13 +27,8 @@ import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.lang.reflect.Field;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.core.testutils.CommonTestUtils;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -41,11 +36,6 @@ import org.junit.Test;
*/
public class GlobalConfigurationTest {
- @BeforeClass
- public static void initLogging() {
- LogUtils.initializeDefaultConsoleLogger(Level.OFF);
- }
-
@Before
public void resetSingleton() throws SecurityException, NoSuchFieldException, IllegalArgumentException,
IllegalAccessException {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-core/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/flink-core/src/test/resources/logback-test.xml b/flink-core/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8b3bb27
--- /dev/null
+++ b/flink-core/src/test/resources/logback-test.xml
@@ -0,0 +1,29 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/assemblies/yarn.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/assemblies/yarn.xml b/flink-dist/src/main/assemblies/yarn.xml
index f262ab0..71d2815 100644
--- a/flink-dist/src/main/assemblies/yarn.xml
+++ b/flink-dist/src/main/assemblies/yarn.xml
@@ -114,7 +114,7 @@ under the License.
<fileMode>0644</fileMode>
</file>
<file>
- <source>src/main/flink-bin/conf/log4j.properties</source>
+ <source>src/main/flink-bin/conf/logback.xml</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</file>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/LICENSE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
index ebe9502..78e8a3e 100644
--- a/flink-dist/src/main/flink-bin/LICENSE
+++ b/flink-dist/src/main/flink-bin/LICENSE
@@ -224,7 +224,6 @@ under the Apache License (v 2.0):
- Apache Commons FileUpload (http://commons.apache.org/fileupload/)
- Apache Commons IO (http://commons.apache.org/io/)
- Apache Commons Math (http://commons.apache.org/proper/commons-math/)
- - Apache Log4J (http://logging.apache.org/log4j/1.2/)
- Apache Avro (http://avro.apache.org)
- Apache Hadoop (http://hadoop.apache.org)
- Apache Derby (http://db.apache.org/derby/)
@@ -346,6 +345,19 @@ http://www.mozilla.org/MPL/
-----------------------------------------------------------------------
+ Eclipse Public License - v 1.0
+-----------------------------------------------------------------------
+
+The Apache Flink project depends on and/or bundles the following components
+under the Eclipse Public License (v 1.0)
+
+- LOGback (http://logback.qos.ch)
+ Copyright (C) 1999-2012, QOS.ch. All rights reserved.
+
+You may obtain a copy of the Eclipse Public License (v 1.0) at
+https://www.eclipse.org/legal/epl-v10.html
+
+-----------------------------------------------------------------------
The Open Font License
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/NOTICE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE
index 67c621d..b43d671 100644
--- a/flink-dist/src/main/flink-bin/NOTICE
+++ b/flink-dist/src/main/flink-bin/NOTICE
@@ -33,17 +33,20 @@ with permission from the original authors.
Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-
-----------------------------------------------------------------------
- Apache Log4J
+ LOGBack
-----------------------------------------------------------------------
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
+Copyright (C) 1999-2012, QOS.ch
+
+This program and the accompanying materials are dual-licensed under
+either the terms of the Eclipse Public License v1.0 as published by
+the Eclipse Foundation
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
+ or (per the licensee's choosing)
+under the terms of the GNU Lesser General Public License version 2.1
+as published by the Free Software Foundation.
-----------------------------------------------------------------------
Apache Commmons Lang3
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/bin/flink
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/flink b/flink-dist/src/main/flink-bin/bin/flink
index 99b7a77..e33619b 100755
--- a/flink-dist/src/main/flink-bin/bin/flink
+++ b/flink-dist/src/main/flink-bin/bin/flink
@@ -52,7 +52,7 @@ constructCLIClientClassPath() {
CC_CLASSPATH=`manglePathList $(constructCLIClientClassPath)`
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-flink-client-$HOSTNAME.log
-log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties"
+log_setting="-Dlog.file="$log" -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
export FLINK_CONF_DIR
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/bin/jobmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
index c2f297c..f8f2ec8 100755
--- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
@@ -58,7 +58,7 @@ FLINK_JM_CLASSPATH=`manglePathList "$(constructJobManagerClassPath)"`
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-jobmanager-$HOSTNAME.log
out=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-jobmanager-$HOSTNAME.out
pid=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-jobmanager.pid
-log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties)
+log_setting=(-Dlog.file="$log" -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
case $STARTSTOP in
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/bin/start-local.bat
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-local.bat b/flink-dist/src/main/flink-bin/bin/start-local.bat
index e77b40c..8089686 100644
--- a/flink-dist/src/main/flink-bin/bin/start-local.bat
+++ b/flink-dist/src/main/flink-bin/bin/start-local.bat
@@ -20,24 +20,24 @@
setlocal EnableDelayedExpansion
SET bin=%~dp0
-SET NEPHELE_ROOT_DIR=%bin%..
-SET NEPHELE_LIB_DIR=%NEPHELE_ROOT_DIR%\lib
-SET NEPHELE_CONF_DIR=%NEPHELE_ROOT_DIR%\conf
-SET NEPHELE_LOG_DIR=%NEPHELE_ROOT_DIR%\log
+SET FLINK_ROOT_DIR=%bin%..
+SET FLINK_LIB_DIR=%FLINK_ROOT_DIR%\lib
+SET FLINK_CONF_DIR=%FLINK_ROOT_DIR%\conf
+SET FLINK_LOG_DIR=%FLINK_ROOT_DIR%\log
SET JVM_ARGS=-Xms768m -Xmx768m
-SET NEPHELE_JM_CLASSPATH=%NEPHELE_LIB_DIR%\*
+SET FLINK_JM_CLASSPATH=%FLINK_LIB_DIR%\*
-SET logname=nephele-%username%-jobmanager-%computername%.log
-SET log=%NEPHELE_LOG_DIR%\%logname%
-SET outname=nephele-%username%-jobmanager-%computername%.out
-SET out=%NEPHELE_LOG_DIR%\%outname%
-SET log_setting=-Dlog.file=%log% -Dlog4j.configuration=file:%NEPHELE_CONF_DIR%/log4j.properties
+SET logname=flink-%username%-jobmanager-%computername%.log
+SET log=%FLINK_LOG_DIR%\%logname%
+SET outname=flink-%username%-jobmanager-%computername%.out
+SET out=%FLINK_LOG_DIR%\%outname%
+SET log_setting=-Dlog.file=%log% -Dlogback.configurationFile=file:%FLINK_CONF_DIR%/logback.xml
:: Log rotation (quick and dirty)
-CD %NEPHELE_LOG_DIR%
+CD %FLINK_LOG_DIR%
for /l %%x in (5, -1, 1) do (
SET /A y = %%x+1
RENAME "%logname%.%%x" "%logname%.!y!" 2> nul
@@ -57,6 +57,6 @@ if not defined FOUND (
echo Starting Flink job manager. Webinterface by default on http://localhost:8081/.
echo Don't close this batch window. Stop job manager by pressing Ctrl+C.
-java %JVM_ARGS% %log_setting% -cp %NEPHELE_JM_CLASSPATH% org.apache.flink.runtime.jobmanager.JobManager -executionMode local -configDir %NEPHELE_CONF_DIR% > "%out%" 2>&1
+java %JVM_ARGS% %log_setting% -cp %FLINK_JM_CLASSPATH% org.apache.flink.runtime.jobmanager.JobManager -executionMode local -configDir %FLINK_CONF_DIR% > "%out%" 2>&1
endlocal
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/bin/taskmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index 91259b3..a53325e 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -49,7 +49,7 @@ FLINK_TM_CLASSPATH=`manglePathList "$(constructTaskManagerClassPath)"`
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-taskmanager-$HOSTNAME.log
out=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-taskmanager-$HOSTNAME.out
pid=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-taskmanager.pid
-log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties)
+log_setting=(-Dlog.file="$log" -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
JVM_ARGS="$JVM_ARGS -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -XX:NewRatio=6"
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/bin/webclient.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/webclient.sh b/flink-dist/src/main/flink-bin/bin/webclient.sh
index cb8c6b3..c7dd2ab 100755
--- a/flink-dist/src/main/flink-bin/bin/webclient.sh
+++ b/flink-dist/src/main/flink-bin/bin/webclient.sh
@@ -57,7 +57,7 @@ FLINK_WEBCLIENT_CLASSPATH=`manglePathList "$(constructWebclientClassPath)"`
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-webclient-$HOSTNAME.log
out=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-webclient-$HOSTNAME.out
pid=$FLINK_PID_DIR/flink-$FLINK_IDENT_STRING-webclient.pid
-log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties)
+log_setting=(-Dlog.file="$log" -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
case $STARTSTOP in
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/conf/log4j.properties b/flink-dist/src/main/flink-bin/conf/log4j.properties
deleted file mode 100644
index 0857ce0..0000000
--- a/flink-dist/src/main/flink-bin/conf/log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-log4j.rootLogger=INFO, file
-
-# Log all infos in the given file
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.file=${log.file}
-log4j.appender.file.append=false
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n
-
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/conf/log4jconsole.properties
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/conf/log4jconsole.properties b/flink-dist/src/main/flink-bin/conf/log4jconsole.properties
deleted file mode 100644
index 020cbeb..0000000
--- a/flink-dist/src/main/flink-bin/conf/log4jconsole.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-log4j.rootLogger=INFO, console
-
-# Log all infos in the given file
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n
-
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/conf/logback.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/conf/logback.xml b/flink-dist/src/main/flink-bin/conf/logback.xml
new file mode 100644
index 0000000..9305b11
--- /dev/null
+++ b/flink-dist/src/main/flink-bin/conf/logback.xml
@@ -0,0 +1,31 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="file" class="ch.qos.logback.core.FileAppender">
+ <file>${log.file}</file>
+ <append>false</append>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="file"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/conf/logbackConsole.xml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/conf/logbackConsole.xml b/flink-dist/src/main/flink-bin/conf/logbackConsole.xml
new file mode 100644
index 0000000..807f40c
--- /dev/null
+++ b/flink-dist/src/main/flink-bin/conf/logbackConsole.xml
@@ -0,0 +1,30 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "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
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{60} %X{sourceThread} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
----------------------------------------------------------------------
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 31b662e..44a80c5 100644
--- a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
+++ b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
@@ -48,7 +48,7 @@ constructCLIClientClassPath() {
CC_CLASSPATH=`manglePathList $(constructCLIClientClassPath)`
#log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-yarn-session-$HOSTNAME.log
-#log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties"
+#log_setting="-Dlog.file="$log" -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
export FLINK_CONF_DIR
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
index 10fe3ce..c74fc96 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
@@ -22,9 +22,6 @@ import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.common.JobExecutionResult;
import org.apache.flink.api.common.Plan;
import org.apache.flink.api.common.PlanExecutor;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-
/**
* An {@link ExecutionEnvironment} that runs the program locally, multi-threaded, in the JVM where the
@@ -35,9 +32,6 @@ import org.apache.log4j.Level;
* machine.
*/
public class LocalEnvironment extends ExecutionEnvironment {
-
- private boolean logging = false;
-
/**
* Creates a new local environment.
*/
@@ -54,7 +48,6 @@ public class LocalEnvironment extends ExecutionEnvironment {
Plan p = createProgramPlan(jobName);
PlanExecutor executor = PlanExecutor.createLocalExecutor();
- initLogging();
return executor.executePlan(p);
}
@@ -63,41 +56,8 @@ public class LocalEnvironment extends ExecutionEnvironment {
Plan p = createProgramPlan();
PlanExecutor executor = PlanExecutor.createLocalExecutor();
- initLogging();
return executor.getOptimizerPlanAsJSON(p);
}
-
- // --------------------------------------------------------------------------------------------
-
- /**
- * Causes the local environment to print INFO level log messages to the standard error output.
- */
- public void enableLogging() {
- this.logging = true;
- }
-
- /**
- * Completely disables logging during the execution of programs in the local environment.
- */
- public void disableLogging() {
- this.logging = false;
- }
-
- /**
- * Checks whether logging during the program execution is enabled or disabled.
- * <p>
- * By default, logging is turned off.
- *
- * @return True, if logging is enabled, false otherwise.
- */
- public boolean isLoggingEnabled() {
- return this.logging;
- }
-
- private void initLogging() {
- LogUtils.initializeDefaultConsoleLogger(logging ? Level.INFO : Level.OFF);
- }
-
// --------------------------------------------------------------------------------------------
@Override
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
index 7bc7fc9..71d339c 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/CsvOutputFormat.java
@@ -24,8 +24,8 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.api.common.io.FileOutputFormat;
import org.apache.flink.api.java.tuple.Tuple;
@@ -43,7 +43,7 @@ public class CsvOutputFormat<T extends Tuple> extends FileOutputFormat<T> implem
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(CsvOutputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CsvOutputFormat.class);
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java
index 6eae03c..b7a8931 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/record/io/CsvOutputFormat.java
@@ -24,8 +24,8 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.record.operators.FileDataSink;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.types.Record;
@@ -70,7 +70,7 @@ public class CsvOutputFormat extends FileOutputFormat {
public static final String LENIENT_PARSING = "output.record.lenient";
@SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(CsvOutputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CsvOutputFormat.class);
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java
index 644a6ae..93d9661 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/record/io/TextInputFormat.java
@@ -26,8 +26,8 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
@@ -45,7 +45,7 @@ public class TextInputFormat extends DelimitedInputFormat {
public static final String DEFAULT_CHARSET_NAME = "UTF-8";
- private static final Log LOG = LogFactory.getLog(TextInputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TextInputFormat.class);
protected final StringValue theString = new StringValue();
[2/5] [FLINK-1086] Replace JCL with SLF4J and Log4j with LOGBack
Posted by uc...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
index 721f4f6..a71d586 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.ReduceFunction;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
@@ -39,7 +39,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class AllReduceDriver<T> implements PactDriver<ReduceFunction<T>, T> {
- private static final Log LOG = LogFactory.getLog(AllReduceDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AllReduceDriver.class);
private PactTaskContext<ReduceFunction<T>, T> taskContext;
@@ -119,4 +119,4 @@ public class AllReduceDriver<T> implements PactDriver<ReduceFunction<T>, T> {
public void cancel() {
this.running = false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
index 8ff0262..16ff217 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.CoGroupFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypePairComparatorFactory;
@@ -43,7 +43,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class CoGroupDriver<IT1, IT2, OT> implements PactDriver<CoGroupFunction<IT1, IT2, OT>, OT> {
- private static final Log LOG = LogFactory.getLog(CoGroupDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CoGroupDriver.class);
private PactTaskContext<CoGroupFunction<IT1, IT2, OT>, OT> taskContext;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
index b68f24d..9fedab2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.CrossFunction;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.runtime.memorymanager.MemoryManager;
@@ -42,7 +42,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class CrossDriver<T1, T2, OT> implements PactDriver<CrossFunction<T1, T2, OT>, OT> {
- private static final Log LOG = LogFactory.getLog(CrossDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CrossDriver.class);
private PactTaskContext<CrossFunction<T1, T2, OT>, OT> taskContext;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java
index 0c6ffa7..138ae49 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.operators;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.OutputFormat;
import org.apache.flink.api.common.typeutils.TypeComparatorFactory;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -56,7 +56,7 @@ public class DataSinkTask<IT> extends AbstractInvokable {
public static final String DEGREE_OF_PARALLELISM_KEY = "sink.dop";
// Obtain DataSinkTask Logger
- private static final Log LOG = LogFactory.getLog(DataSinkTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataSinkTask.class);
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java
index f24cc2f..62d425d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java
@@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.accumulators.Accumulator;
import org.apache.flink.api.common.io.InputFormat;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -56,7 +56,7 @@ import org.apache.flink.util.Collector;
*/
public class DataSourceTask<OT> extends AbstractInvokable {
- private static final Log LOG = LogFactory.getLog(DataSourceTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataSourceTask.class);
private List<BufferWriter> eventualOutputs;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java
index 0452ef7..f4bd9c1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.FlatCombineFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -47,7 +47,7 @@ import java.util.List;
*/
public class GroupReduceCombineDriver<T> implements PactDriver<FlatCombineFunction<T>, T> {
- private static final Log LOG = LogFactory.getLog(GroupReduceCombineDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GroupReduceCombineDriver.class);
/** Fix length records with a length below this threshold will be in-place sorted, if possible. */
private static final int THRESHOLD_FOR_IN_PLACE_SORTING = 32;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
index 960143d..8dfb338 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.GroupReduceFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -41,7 +41,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class GroupReduceDriver<IT, OT> implements PactDriver<GroupReduceFunction<IT, OT>, OT> {
- private static final Log LOG = LogFactory.getLog(GroupReduceDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GroupReduceDriver.class);
private PactTaskContext<GroupReduceFunction<IT, OT>, OT> taskContext;
@@ -116,4 +116,4 @@ public class GroupReduceDriver<IT, OT> implements PactDriver<GroupReduceFunction
public void cancel() {
this.running = false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
index e205f1e..ff88935 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.FlatJoinFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypePairComparatorFactory;
@@ -46,7 +46,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class MatchDriver<IT1, IT2, OT> implements PactDriver<FlatJoinFunction<IT1, IT2, OT>, OT> {
- protected static final Log LOG = LogFactory.getLog(MatchDriver.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(MatchDriver.class);
protected PactTaskContext<FlatJoinFunction<IT1, IT2, OT>, OT> taskContext;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java
index 6b18bb1..08cacc0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java
@@ -22,8 +22,8 @@ package org.apache.flink.runtime.operators;
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.ReduceFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -46,7 +46,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class ReduceCombineDriver<T> implements PactDriver<ReduceFunction<T>, T> {
- private static final Log LOG = LogFactory.getLog(ReduceCombineDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReduceCombineDriver.class);
/** Fix length records with a length below this threshold will be in-place sorted, if possible. */
private static final int THRESHOLD_FOR_IN_PLACE_SORTING = 32;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
index 9495cdc..549d6bb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.ReduceFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -40,7 +40,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class ReduceDriver<T> implements PactDriver<ReduceFunction<T>, T> {
- private static final Log LOG = LogFactory.getLog(ReduceDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReduceDriver.class);
private PactTaskContext<ReduceFunction<T>, T> taskContext;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
index f884df1..62eafa4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.accumulators.Accumulator;
import org.apache.flink.api.common.accumulators.AccumulatorHelper;
import org.apache.flink.api.common.distributions.DataDistribution;
@@ -80,7 +80,7 @@ import java.util.Map;
*/
public class RegularPactTask<S extends Function, OT> extends AbstractInvokable implements PactTaskContext<S, OT> {
- protected static final Log LOG = LogFactory.getLog(RegularPactTask.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(RegularPactTask.class);
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java
index bfef3d5..ee54c24 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypePairComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -73,7 +73,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class CompactingHashTable<T> extends AbstractMutableHashTable<T>{
- private static final Log LOG = LogFactory.getLog(CompactingHashTable.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompactingHashTable.class);
// ------------------------------------------------------------------------
// Internal Constants
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
index 575f2d0..7d668ab 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypePairComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -91,7 +91,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class MutableHashTable<BT, PT> implements MemorySegmentSource {
- private static final Log LOG = LogFactory.getLog(MutableHashTable.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MutableHashTable.class);
// ------------------------------------------------------------------------
// Internal Constants
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java
index cff4519..947f168 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java
@@ -23,8 +23,8 @@ import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.io.disk.RandomAccessInputView;
@@ -41,7 +41,7 @@ import org.apache.flink.runtime.util.MemoryBlockIterator;
*/
abstract class AbstractBlockResettableIterator<T> implements MemoryBlockIterator {
- protected static final Log LOG = LogFactory.getLog(AbstractBlockResettableIterator.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(AbstractBlockResettableIterator.class);
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java
index f7f880b..05f5720 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableIterator.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memorymanager.MemoryAllocationException;
@@ -38,7 +38,7 @@ import org.apache.flink.runtime.util.ResettableIterator;
*/
public class BlockResettableIterator<T> extends AbstractBlockResettableIterator<T> implements ResettableIterator<T> {
- public static final Log LOG = LogFactory.getLog(BlockResettableIterator.class);
+ public static final Logger LOG = LoggerFactory.getLogger(BlockResettableIterator.class);
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java
index 064eae4..fbebd77 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.operators.resettable;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memorymanager.MemoryAllocationException;
@@ -38,7 +38,7 @@ import org.apache.flink.util.MutableObjectIterator;
public class BlockResettableMutableObjectIterator<T> extends AbstractBlockResettableIterator<T>
implements ResettableMutableObjectIterator<T>
{
- public static final Log LOG = LogFactory.getLog(BlockResettableMutableObjectIterator.class);
+ public static final Logger LOG = LoggerFactory.getLogger(BlockResettableMutableObjectIterator.class);
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java
index 3677dc7..13d2e3d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.MemorySegment;
@@ -46,7 +46,7 @@ import org.apache.flink.runtime.util.ResettableIterator;
*/
public class SpillingResettableIterator<T> implements ResettableIterator<T> {
- private static final Log LOG = LogFactory.getLog(SpillingResettableIterator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpillingResettableIterator.class);
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java
index 392f930..eaf6bd1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.MemorySegment;
@@ -45,7 +45,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class SpillingResettableMutableObjectIterator<T> implements ResettableMutableObjectIterator<T> {
- private static final Log LOG = LogFactory.getLog(SpillingResettableMutableObjectIterator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpillingResettableMutableObjectIterator.class);
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java
index 6a6f6ff..44656b1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMerger.java
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Queue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.FlatCombineFunction;
import org.apache.flink.api.common.functions.util.FunctionUtils;
import org.apache.flink.api.common.typeutils.TypeComparator;
@@ -71,7 +71,7 @@ public class CombiningUnilateralSortMerger<E> extends UnilateralSortMerger<E> {
/**
* Logging.
*/
- private static final Log LOG = LogFactory.getLog(CombiningUnilateralSortMerger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CombiningUnilateralSortMerger.class);
private final FlatCombineFunction<E> combineStub; // the user code stub that does the combining
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java
index 48693a1..ee2b295 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeMatchIterator.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.FlatJoinFunction;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypePairComparator;
@@ -50,7 +50,7 @@ public class MergeMatchIterator<T1, T2, O> implements JoinTaskIterator<T1, T2, O
/**
* The log used by this iterator to log messages.
*/
- private static final Log LOG = LogFactory.getLog(MergeMatchIterator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MergeMatchIterator.class);
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java
index 00b433b..358719d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/UnilateralSortMerger.java
@@ -31,8 +31,8 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.common.typeutils.TypeSerializerFactory;
@@ -68,7 +68,7 @@ public class UnilateralSortMerger<E> implements Sorter<E> {
/**
* Logging.
*/
- private static final Log LOG = LogFactory.getLog(UnilateralSortMerger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UnilateralSortMerger.class);
/**
* Fix length records with a length below this threshold will be in-place sorted, if possible.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java
index 8f17fbc..4be639d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/ProfilingUtils.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.instance.InstanceConnectionInfo;
import org.apache.flink.util.StringUtils;
@@ -38,7 +38,7 @@ public class ProfilingUtils {
/**
* The logging instance used to report problems.
*/
- private static final Log LOG = LogFactory.getLog(ProfilingUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ProfilingUtils.class);
/**
* The key to check the job manager's profiling component should be enabled.
@@ -150,10 +150,12 @@ public class ProfilingUtils {
try {
constructor = profilerClass.getConstructor(InetAddress.class, InstanceConnectionInfo.class);
} catch (SecurityException e1) {
- LOG.error(e1);
+ LOG.error("Security exception while retrieving constructor for class " + profilerClass.getCanonicalName()
+ + ".", e1);
return null;
} catch (NoSuchMethodException e1) {
- LOG.error(e1);
+ LOG.error("Class " + profilerClass.getCanonicalName() + " does not have a constructor taking a " +
+ "InetAddress and InstanceConnectionInfo parameter.", e1);
return null;
}
@@ -161,13 +163,16 @@ public class ProfilingUtils {
try {
profiler = constructor.newInstance(jobManagerAddress, instanceConnectionInfo);
} catch (IllegalArgumentException e) {
- LOG.error(e);
+ LOG.error("IllegalArgumentException while creating object of class " + profilerClass.getCanonicalName() +
+ ".", e);
} catch (InstantiationException e) {
- LOG.error(e);
+ LOG.error("Could not instantiate object of class " + profilerClass.getCanonicalName() + ".",e);
} catch (IllegalAccessException e) {
- LOG.error(e);
+ LOG.error("IllegalAccessException while creating object of class " + profilerClass.getCanonicalName() + ".",
+ e);
} catch (InvocationTargetException e) {
- LOG.error(e);
+ LOG.error("InvocationTargetException while creating object of class " + profilerClass.getCanonicalName() +
+ ".", e);
}
return profiler;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java
index 46569b1..bf6105e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/EnvironmentListenerImpl.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.profiling.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.execution.ExecutionListener;
import org.apache.flink.runtime.execution.ExecutionState;
import org.apache.flink.runtime.execution.RuntimeEnvironment;
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.jobgraph.JobID;
public class EnvironmentListenerImpl implements ExecutionListener {
- private static final Log LOG = LogFactory.getLog(EnvironmentListenerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EnvironmentListenerImpl.class);
private final TaskManagerProfilerImpl taskManagerProfiler;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java
index 71cdcc4..faae345 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/JobManagerProfilerImpl.java
@@ -28,8 +28,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.executiongraph.ExecutionGraph;
import org.apache.flink.runtime.ipc.RPC;
@@ -54,7 +54,7 @@ import org.apache.flink.util.StringUtils;
public class JobManagerProfilerImpl implements JobManagerProfiler, ProfilerImplProtocol {
- private static final Log LOG = LogFactory.getLog(JobManagerProfilerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobManagerProfilerImpl.class);
private static final String RPC_NUM_HANDLER_KEY = "jobmanager.profiling.rpc.numhandler";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java
index c67d463..1d8d80f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/profiling/impl/TaskManagerProfilerImpl.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.profiling.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.execution.Environment;
@@ -50,7 +50,7 @@ import java.util.TimerTask;
public class TaskManagerProfilerImpl extends TimerTask implements TaskManagerProfiler {
- private static final Log LOG = LogFactory.getLog(TaskManagerProfilerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskManagerProfilerImpl.class);
private final ProfilerImplProtocol jobManagerProfiler;
@@ -168,7 +168,7 @@ public class TaskManagerProfilerImpl extends TimerTask implements TaskManagerPro
this.jobManagerProfiler.reportProfilingData(this.profilingDataContainer);
this.profilingDataContainer.clear();
} catch (IOException e) {
- LOG.error(e);
+ LOG.error("Could not report profiling data.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
index 0fa7f42..450732c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.taskmanager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.execution.Environment;
import org.apache.flink.runtime.execution.ExecutionListener;
@@ -43,7 +43,7 @@ public final class Task implements ExecutionObserver {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(Task.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Task.class);
private final ExecutionVertexID vertexID;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
index 7b4a961..4525649 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
@@ -54,8 +54,8 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.cache.DistributedCache;
import org.apache.flink.api.common.cache.DistributedCache.DistributedCacheEntry;
import org.apache.flink.configuration.ConfigConstants;
@@ -110,7 +110,7 @@ import org.apache.flink.util.StringUtils;
*/
public class TaskManager implements TaskOperationProtocol {
- private static final Log LOG = LogFactory.getLog(TaskManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskManager.class);
private final static int FAILURE_RETURN_CODE = -1;
@@ -196,7 +196,7 @@ public class TaskManager implements TaskOperationProtocol {
jobManagerAddress = new InetSocketAddress(tmpAddress, port);
}
catch (UnknownHostException e) {
- LOG.fatal("Could not resolve JobManager host name.");
+ LOG.error("Could not resolve JobManager host name.");
throw new Exception("Could not resolve JobManager host name: " + e.getMessage(), e);
}
@@ -207,7 +207,7 @@ public class TaskManager implements TaskOperationProtocol {
try {
this.jobManager = RPC.getProxy(JobManagerProtocol.class, jobManagerAddress, NetUtils.getSocketFactory());
} catch (IOException e) {
- LOG.fatal("Could not connect to the JobManager: " + e.getMessage(), e);
+ LOG.error("Could not connect to the JobManager: " + e.getMessage(), e);
throw new Exception("Failed to initialize connection to JobManager: " + e.getMessage(), e);
}
@@ -238,7 +238,7 @@ public class TaskManager implements TaskOperationProtocol {
this.taskManagerServer = RPC.getServer(this, taskManagerAddress.getHostAddress(), ipcPort, IPC_HANDLER_COUNT);
this.taskManagerServer.start();
} catch (IOException e) {
- LOG.fatal("Failed to start TaskManager server. " + e.getMessage(), e);
+ LOG.error("Failed to start TaskManager server. " + e.getMessage(), e);
throw new Exception("Failed to start taskmanager server. " + e.getMessage(), e);
}
}
@@ -247,7 +247,7 @@ public class TaskManager implements TaskOperationProtocol {
try {
this.globalInputSplitProvider = RPC.getProxy(InputSplitProviderProtocol.class, jobManagerAddress, NetUtils.getSocketFactory());
} catch (IOException e) {
- LOG.fatal(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
throw new Exception("Failed to initialize connection to global input split provider: " + e.getMessage(), e);
}
@@ -255,7 +255,7 @@ public class TaskManager implements TaskOperationProtocol {
try {
this.lookupService = RPC.getProxy(ChannelLookupProtocol.class, jobManagerAddress, NetUtils.getSocketFactory());
} catch (IOException e) {
- LOG.fatal(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
throw new Exception("Failed to initialize channel lookup protocol. " + e.getMessage(), e);
}
@@ -263,7 +263,7 @@ public class TaskManager implements TaskOperationProtocol {
try {
this.accumulatorProtocolProxy = RPC.getProxy(AccumulatorProtocol.class, jobManagerAddress, NetUtils.getSocketFactory());
} catch (IOException e) {
- LOG.fatal("Failed to initialize accumulator protocol: " + e.getMessage(), e);
+ LOG.error("Failed to initialize accumulator protocol: " + e.getMessage(), e);
throw new Exception("Failed to initialize accumulator protocol: " + e.getMessage(), e);
}
@@ -382,7 +382,7 @@ public class TaskManager implements TaskOperationProtocol {
this.memoryManager = new DefaultMemoryManager(memorySize, this.numberOfSlots, pageSize);
} catch (Throwable t) {
- LOG.fatal("Unable to initialize memory manager with " + (memorySize >>> 20) + " megabytes of memory.", t);
+ LOG.error("Unable to initialize memory manager with " + (memorySize >>> 20) + " megabytes of memory.", t);
throw new Exception("Unable to initialize memory manager.", t);
}
}
@@ -513,7 +513,7 @@ public class TaskManager implements TaskOperationProtocol {
try {
new TaskManager(ExecutionMode.CLUSTER);
} catch (Exception e) {
- LOG.fatal("Taskmanager startup failed: " + e.getMessage(), e);
+ LOG.error("Taskmanager startup failed: " + e.getMessage(), e);
System.exit(FAILURE_RETURN_CODE);
}
@@ -968,7 +968,7 @@ public class TaskManager implements TaskOperationProtocol {
this.jobManager.updateTaskExecutionState(new TaskExecutionState(jobID, id, newExecutionState,
optionalDescription));
} catch (IOException e) {
- LOG.error(e);
+ LOG.error("Could not update task execution state.", e);
}
}
}
@@ -1035,7 +1035,7 @@ public class TaskManager implements TaskOperationProtocol {
this.executorService.awaitTermination(5000L, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
- LOG.debug(e);
+ LOG.debug("Got interrupted while awaiting the termination of the executor service.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/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 d6d32f2..eeb4f66 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
@@ -24,20 +24,16 @@ import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.security.UserGroupInformation;
public class EnvironmentInformation {
- private static final Log LOG = LogFactory.getLog(EnvironmentInformation.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EnvironmentInformation.class);
private static final String UNKNOWN = "<unknown>";
- private static final String LOG_FILE_OPTION = "-Dlog.file";
-
- private static final String LOG_CONFIGURAION_OPTION = "-Dlog4j.configuration";
-
/**
* Returns the version of the code as String. If version == null, then the JobManager does not run from a
* maven build. An example is a source code checkout, compile, and run from inside an IDE.
@@ -120,11 +116,6 @@ public class EnvironmentInformation {
try {
final RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
final StringBuilder bld = new StringBuilder();
- for (String s : bean.getInputArguments()) {
- if (!s.startsWith(LOG_FILE_OPTION) && !s.startsWith(LOG_CONFIGURAION_OPTION)) {
- bld.append(s).append(' ');
- }
- }
return bld.toString();
}
catch (Throwable t) {
@@ -132,7 +123,7 @@ public class EnvironmentInformation {
}
}
- public static void logEnvironmentInfo(Log log, String componentName) {
+ public static void logEnvironmentInfo(Logger log, String componentName) {
if (log.isInfoEnabled()) {
RevisionInformation rev = getRevisionInformation();
String version = getVersion();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java
index 210d8f2..59237cf 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/IOUtils.java
@@ -25,7 +25,7 @@ import java.io.OutputStream;
import java.io.PrintStream;
import java.net.Socket;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
/**
* An utility class for I/O related functionality.
@@ -170,7 +170,7 @@ public final class IOUtils {
* @param closeables
* the objects to close
*/
- public static void cleanup(final Log log, final java.io.Closeable... closeables) {
+ public static void cleanup(final Logger log, final java.io.Closeable... closeables) {
for (java.io.Closeable c : closeables) {
if (c != null) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java
index 4a2e538..02e60b9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/AbstractIDTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
*
*/
public class AbstractIDTest {
-
/**
* Tests the setID method of an abstract ID.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java
index 3b6a5e6..527d625 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/client/JobResultTest.java
@@ -25,16 +25,13 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.flink.runtime.client.AbstractJobResult;
-import org.apache.flink.runtime.client.JobCancelResult;
-import org.apache.flink.runtime.client.JobProgressResult;
-import org.apache.flink.runtime.client.JobSubmissionResult;
import org.apache.flink.runtime.client.AbstractJobResult.ReturnCode;
import org.apache.flink.runtime.event.job.AbstractEvent;
import org.apache.flink.runtime.event.job.JobEvent;
import org.apache.flink.runtime.jobgraph.JobStatus;
import org.apache.flink.runtime.testutils.CommonTestUtils;
import org.apache.flink.runtime.util.SerializableArrayList;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java
index 6cbfc3d..d0b1504 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/ChannelDeploymentDescriptorTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.flink.runtime.deployment.ChannelDeploymentDescriptor;
import org.apache.flink.runtime.io.network.channels.ChannelID;
import org.apache.flink.runtime.testutils.ServerTestUtils;
import org.apache.flink.util.StringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java
index c07608f..68d285a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/GateDeploymentDescriptorTest.java
@@ -27,8 +27,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.flink.runtime.deployment.ChannelDeploymentDescriptor;
-import org.apache.flink.runtime.deployment.GateDeploymentDescriptor;
import org.apache.flink.runtime.io.network.channels.ChannelID;
import org.apache.flink.runtime.io.network.channels.ChannelType;
import org.apache.flink.runtime.io.network.gates.GateID;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java
index ad0a175..3a1aa40 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/deployment/TaskDeploymentDescriptorTest.java
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.runtime.deployment.GateDeploymentDescriptor;
-import org.apache.flink.runtime.deployment.TaskDeploymentDescriptor;
import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager;
import org.apache.flink.runtime.executiongraph.ExecutionVertexID;
import org.apache.flink.runtime.jobgraph.JobID;
@@ -43,7 +41,6 @@ import org.junit.Test;
*
*/
public class TaskDeploymentDescriptorTest {
-
/**
* Tests the constructor of the {@link TaskDeploymentDescriptor} class with valid arguments.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java
index 9c82321..f96dfaf 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/JobEventTest.java
@@ -25,8 +25,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.flink.runtime.event.job.JobEvent;
-import org.apache.flink.runtime.event.job.VertexEvent;
import org.apache.flink.runtime.execution.ExecutionState;
import org.apache.flink.runtime.jobgraph.JobStatus;
import org.apache.flink.runtime.jobgraph.JobVertexID;
@@ -39,7 +37,6 @@ import org.junit.Test;
*
*/
public class JobEventTest {
-
/**
* This test checks the correct serialization/deserialization of a {@link JobEvent}.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java
index 8fbfe81..2a30ae4 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/event/job/ManagementEventTest.java
@@ -22,9 +22,6 @@ package org.apache.flink.runtime.event.job;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.flink.runtime.event.job.ExecutionStateChangeEvent;
-import org.apache.flink.runtime.event.job.RecentJobEvent;
-import org.apache.flink.runtime.event.job.VertexAssignmentEvent;
import org.apache.flink.runtime.execution.ExecutionState;
import org.apache.flink.runtime.jobgraph.JobID;
import org.apache.flink.runtime.jobgraph.JobStatus;
@@ -37,7 +34,6 @@ import org.junit.Test;
*
*/
public class ManagementEventTest {
-
/**
* The time stamp used during the tests.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java
index d3dfe06..fabf900 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/EventNotificationManagerTest.java
@@ -22,11 +22,6 @@ package org.apache.flink.runtime.event.task;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.flink.runtime.event.task.AbstractTaskEvent;
-import org.apache.flink.runtime.event.task.EventListener;
-import org.apache.flink.runtime.event.task.EventNotificationManager;
-import org.apache.flink.runtime.event.task.IntegerTaskEvent;
-import org.apache.flink.runtime.event.task.StringTaskEvent;
import org.junit.Test;
/**
@@ -34,7 +29,6 @@ import org.junit.Test;
*
*/
public class EventNotificationManagerTest {
-
/**
* A test implementation of an {@link EventListener}.
*
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java
index f6c8c57..7530fc8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/TaskEventTest.java
@@ -26,11 +26,8 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Iterator;
-import org.apache.flink.runtime.event.task.AbstractEvent;
-import org.apache.flink.runtime.event.task.EventList;
-import org.apache.flink.runtime.event.task.IntegerTaskEvent;
-import org.apache.flink.runtime.event.task.StringTaskEvent;
import org.apache.flink.runtime.testutils.CommonTestUtils;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -39,7 +36,6 @@ import org.junit.Test;
*
*/
public class TaskEventTest {
-
/**
* This test checks the serialization/deserialization of {@link IntegerTaskEvent} objects.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java
index e624589..36e3640 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphTest.java
@@ -33,13 +33,6 @@ import java.util.Iterator;
import org.apache.flink.core.fs.Path;
import org.apache.flink.runtime.execution.ExecutionState;
import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager;
-import org.apache.flink.runtime.executiongraph.ExecutionGraph;
-import org.apache.flink.runtime.executiongraph.ExecutionGraphIterator;
-import org.apache.flink.runtime.executiongraph.ExecutionGroupVertex;
-import org.apache.flink.runtime.executiongraph.ExecutionGroupVertexIterator;
-import org.apache.flink.runtime.executiongraph.ExecutionStage;
-import org.apache.flink.runtime.executiongraph.ExecutionVertex;
-import org.apache.flink.runtime.executiongraph.GraphConversionException;
import org.apache.flink.runtime.io.network.channels.ChannelType;
import org.apache.flink.runtime.jobgraph.DistributionPattern;
import org.apache.flink.runtime.jobgraph.JobGraph;
@@ -51,9 +44,6 @@ import org.apache.flink.runtime.jobgraph.JobTaskVertex;
import org.apache.flink.runtime.operators.DataSinkTask;
import org.apache.flink.runtime.operators.DataSourceTask;
import org.apache.flink.runtime.testutils.ServerTestUtils;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.flink.api.java.io.DiscardingOuputFormat;
import org.apache.flink.api.java.io.TextInputFormat;
@@ -63,12 +53,6 @@ import org.apache.flink.api.java.io.TextInputFormat;
*
*/
public class ExecutionGraphTest {
-
- @BeforeClass
- public static void reduceLogLevel() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
/*
* input1 -> task1 -> output1
* output1 shares instance with input1
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
index 8e9ad2f..8fd938b 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/filecache/FileCacheDeleteValidationTest.java
@@ -26,7 +26,6 @@ import org.junit.Assert;
import org.apache.flink.api.common.cache.DistributedCache.DistributedCacheEntry;
import org.apache.flink.core.fs.local.LocalFileSystem;
-import org.apache.flink.runtime.filecache.FileCache;
import org.apache.flink.runtime.jobgraph.JobID;
import org.junit.After;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java
index 0bffeb6..f4dd731 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/LineReaderTest.java
@@ -29,6 +29,7 @@ import org.apache.flink.core.fs.FSDataInputStream;
import org.apache.flink.core.fs.Path;
import org.apache.flink.core.fs.local.LocalFileSystem;
import org.apache.flink.runtime.testutils.CommonTestUtils;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -37,7 +38,6 @@ import org.junit.Test;
*/
public class LineReaderTest {
-
/**
* This test tests the LineReader. So far only under usual conditions.
*/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
index 6c0a7fa..0fd393f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/instance/DefaultInstanceManagerTest.java
@@ -32,7 +32,6 @@ import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.jobgraph.JobID;
-import org.apache.flink.util.LogUtils;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,13 +40,6 @@ import org.junit.Test;
* Tests for {@link org.apache.flink.runtime.instance.DefaultInstanceManager}.
*/
public class DefaultInstanceManagerTest {
-
- @BeforeClass
- public static void initLogging() {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
-
-
@Test
public void testInstanceRegistering() {
try {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
index 1fab785..8c36200 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java
@@ -27,18 +27,13 @@ import java.util.Random;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
import org.apache.flink.core.memory.MemorySegment;
-import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader;
-import org.apache.flink.runtime.io.disk.iomanager.BlockChannelWriter;
-import org.apache.flink.runtime.io.disk.iomanager.Channel;
-import org.apache.flink.runtime.io.disk.iomanager.ChannelReaderInputView;
-import org.apache.flink.runtime.io.disk.iomanager.ChannelWriterOutputView;
-import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
import org.apache.flink.runtime.memory.DefaultMemoryManagerTest;
import org.apache.flink.runtime.memorymanager.DefaultMemoryManager;
@@ -54,7 +49,7 @@ import org.junit.Test;
*/
public class IOManagerITCase {
- private static final Log LOG = LogFactory.getLog(IOManagerITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IOManagerITCase.class);
private static final long SEED = 649180756312423613L;
@@ -70,7 +65,6 @@ public class IOManagerITCase {
private DefaultMemoryManager memoryManager;
-
@Before
public void beforeTest() {
memoryManager = new DefaultMemoryManager(NUMBER_OF_SEGMENTS * SEGMENT_SIZE, 1);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
index 9e79311..337cf67 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerPerformanceBenchmark.java
@@ -34,8 +34,8 @@ import java.util.List;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.memory.InputViewDataInputStreamWrapper;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.core.memory.OutputViewDataOutputStreamWrapper;
@@ -59,7 +59,7 @@ import org.junit.Test;
*/
public class IOManagerPerformanceBenchmark
{
- private static final Log LOG = LogFactory.getLog(IOManagerPerformanceBenchmark.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IOManagerPerformanceBenchmark.class);
private static final int[] SEGMENT_SIZES_ALIGNED = { 4096, 16384, 524288 };
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java
index 78877e2..774f31a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/bufferprovider/LocalBufferPoolTest.java
@@ -20,11 +20,7 @@
package org.apache.flink.runtime.io.network.bufferprovider;
import org.apache.flink.runtime.io.network.Buffer;
-import org.apache.flink.runtime.io.network.bufferprovider.BufferAvailabilityListener;
-import org.apache.flink.runtime.io.network.bufferprovider.GlobalBufferPool;
-import org.apache.flink.runtime.io.network.bufferprovider.LocalBufferPool;
import org.apache.flink.runtime.io.network.bufferprovider.BufferProvider.BufferAvailabilityRegistration;
-import org.apache.flink.util.LogUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -43,10 +39,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
public class LocalBufferPoolTest {
-
- static {
- LogUtils.initializeDefaultTestConsoleLogger();
- }
private final static int NUM_BUFFERS = 2048;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java
index cff207c..0b222f5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerITCase.java
@@ -45,7 +45,6 @@ import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.runtime.jobgraph.JobGraphDefinitionException;
import org.apache.flink.runtime.jobgraph.JobOutputVertex;
import org.apache.flink.runtime.jobgraph.JobTaskVertex;
-import org.apache.flink.runtime.jobmanager.JobManager;
import org.apache.flink.runtime.operators.DataSinkTask;
import org.apache.flink.runtime.operators.util.TaskConfig;
import org.apache.flink.runtime.taskmanager.Task;
@@ -57,9 +56,6 @@ import org.apache.flink.runtime.testutils.tasks.FileLineWriter;
import org.apache.flink.runtime.testutils.tasks.JobFileInputVertex;
import org.apache.flink.runtime.testutils.tasks.JobFileOutputVertex;
import org.apache.flink.runtime.util.JarFileCreator;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -69,11 +65,6 @@ import org.junit.Test;
*/
public class JobManagerITCase {
- static {
- // no logging, because the tests create expected exception
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
/**
* The name of the test directory some tests read their input from.
*/
@@ -319,13 +310,6 @@ public class JobManagerITCase {
// Create job client and launch job
jobClient = new JobClient(jg, configuration, getClass().getClassLoader());
- // deactivate logging of expected test exceptions
- Logger taskLogger = Logger.getLogger(Task.class);
- taskLogger.setLevel(Level.OFF);
-
- Logger jmLogger = Logger.getLogger(JobManager.class);
- jmLogger.setLevel(Level.OFF);
-
try {
jobClient.submitJobAndWait();
} catch (JobExecutionException e) {
@@ -413,13 +397,6 @@ public class JobManagerITCase {
// Create job client and launch job
jobClient = new JobClient(jg, configuration, getClass().getClassLoader());
- // deactivate logging of expected test exceptions
- Logger jcLogger = Logger.getLogger(JobClient.class);
- jcLogger.setLevel(Level.OFF);
- Logger tmLogger = Logger.getLogger(TaskManager.class);
- tmLogger.setLevel(Level.OFF);
-
-
try {
jobClient.submitJobAndWait();
} catch (JobExecutionException e) {
@@ -520,13 +497,6 @@ public class JobManagerITCase {
// Create job client and launch job
jobClient = new JobClient(jg, configuration, getClass().getClassLoader());
- // deactivate logging of expected test exceptions
- // deactivate logging of expected test exceptions
- Logger jcLogger = Logger.getLogger(JobClient.class);
- jcLogger.setLevel(Level.OFF);
- Logger tmLogger = Logger.getLogger(TaskManager.class);
- tmLogger.setLevel(Level.OFF);
-
try {
jobClient.submitJobAndWait();
} catch (JobExecutionException e) {
@@ -1036,16 +1006,6 @@ public class JobManagerITCase {
// Create job client and launch job
jobClient = new JobClient(jg, configuration, getClass().getClassLoader());
- // disable logging for the taskmanager and the client, as they will have many
- // expected test errors they will log.
-
- Logger tmLogger = Logger.getLogger(TaskManager.class);
- Logger jcLogger = Logger.getLogger(JobClient.class);
- Level tmLevel = tmLogger.getEffectiveLevel();
- Level jcLevel = jcLogger.getEffectiveLevel();
-
- tmLogger.setLevel(Level.OFF);
- jcLogger.setLevel(Level.OFF);
try {
jobClient.submitJobAndWait();
@@ -1056,10 +1016,6 @@ public class JobManagerITCase {
e.printStackTrace();
fail(e.getMessage());
}
- finally {
- tmLogger.setLevel(tmLevel);
- jcLogger.setLevel(jcLevel);
- }
fail("Undetected lack of resources");
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
index 6b1a269..fd0a51c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java
@@ -30,13 +30,12 @@ import java.util.Set;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.record.io.DelimitedOutputFormat;
import org.apache.flink.api.java.typeutils.runtime.record.RecordComparatorFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.Path;
-import org.apache.flink.runtime.operators.DataSinkTask;
import org.apache.flink.runtime.operators.testutils.InfiniteInputIterator;
import org.apache.flink.runtime.operators.testutils.TaskCancelThread;
import org.apache.flink.runtime.operators.testutils.TaskTestBase;
@@ -50,7 +49,7 @@ import org.junit.Test;
public class DataSinkTaskTest extends TaskTestBase
{
- private static final Log LOG = LogFactory.getLog(DataSinkTaskTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataSinkTaskTest.class);
private static final int MEMORY_MANAGER_SIZE = 3 * 1024 * 1024;
@@ -82,7 +81,7 @@ public class DataSinkTaskTest extends TaskTestBase
try {
testTask.invoke();
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while invoking the test task.", e);
Assert.fail("Invoke method caused exception.");
}
@@ -151,7 +150,7 @@ public class DataSinkTaskTest extends TaskTestBase
try {
testTask.invoke();
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while invoking the test task.", e);
Assert.fail("Invoke method caused exception.");
}
@@ -228,7 +227,7 @@ public class DataSinkTaskTest extends TaskTestBase
try {
testTask.invoke();
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while invoking the test task.", e);
Assert.fail("Invoke method caused exception.");
}
@@ -298,13 +297,12 @@ public class DataSinkTaskTest extends TaskTestBase
super.registerFileOutputTask(testTask, MockFailingOutputFormat.class, new File(tempTestPath).toURI().toString());
boolean stubFailed = false;
-
+
try {
testTask.invoke();
} catch (Exception e) {
stubFailed = true;
}
-
Assert.assertTrue("Function exception was not forwarded.", stubFailed);
// assert that temp file was created
@@ -340,13 +338,12 @@ public class DataSinkTaskTest extends TaskTestBase
super.registerFileOutputTask(testTask, MockFailingOutputFormat.class, new File(tempTestPath).toURI().toString());
boolean stubFailed = false;
-
+
try {
testTask.invoke();
} catch (Exception e) {
stubFailed = true;
}
-
Assert.assertTrue("Function exception was not forwarded.", stubFailed);
// assert that temp file was created
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
index fd0542f..f511627 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSourceTaskTest.java
@@ -32,7 +32,6 @@ import org.junit.Assert;
import org.apache.flink.api.java.record.io.DelimitedInputFormat;
import org.apache.flink.core.fs.Path;
-import org.apache.flink.runtime.operators.DataSourceTask;
import org.apache.flink.runtime.operators.testutils.NirvanaOutputList;
import org.apache.flink.runtime.operators.testutils.TaskCancelThread;
import org.apache.flink.runtime.operators.testutils.TaskTestBase;
@@ -138,13 +137,12 @@ public class DataSourceTaskTest extends TaskTestBase {
super.registerFileInputTask(testTask, MockFailingInputFormat.class, new File(tempTestPath).toURI().toString(), "\n");
boolean stubFailed = false;
-
+
try {
testTask.invoke();
} catch (Exception e) {
stubFailed = true;
}
-
Assert.assertTrue("Function exception was not forwarded.", stubFailed);
// assert that temp file was created
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java
index 786fb4e..7c3f132 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/MapTaskTest.java
@@ -21,8 +21,8 @@ package org.apache.flink.runtime.operators;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.GenericCollectorMap;
import org.apache.flink.api.java.record.functions.MapFunction;
import org.apache.flink.runtime.operators.CollectorMapDriver;
@@ -40,7 +40,7 @@ import org.junit.Test;
@SuppressWarnings("deprecation")
public class MapTaskTest extends DriverTestBase<GenericCollectorMap<Record, Record>> {
- private static final Log LOG = LogFactory.getLog(MapTaskTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MapTaskTest.class);
private final CountingOutputCollector output = new CountingOutputCollector();
@@ -62,7 +62,7 @@ public class MapTaskTest extends DriverTestBase<GenericCollectorMap<Record, Reco
try {
testDriver(testDriver, MockMapStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test driver.", e);
Assert.fail("Invoke method caused exception.");
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
index 8b8e991..af58a17 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java
@@ -23,8 +23,8 @@ import java.util.List;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.functions.RichGroupReduceFunction;
import org.apache.flink.api.java.record.operators.ReduceOperator.Combinable;
import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
@@ -42,7 +42,7 @@ import org.junit.Test;
public class ReduceTaskExternalITCase extends DriverTestBase<RichGroupReduceFunction<Record, Record>>
{
- private static final Log LOG = LogFactory.getLog(ReduceTaskExternalITCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReduceTaskExternalITCase.class);
@SuppressWarnings("unchecked")
private final RecordComparator comparator = new RecordComparator(
@@ -74,7 +74,7 @@ public class ReduceTaskExternalITCase extends DriverTestBase<RichGroupReduceFunc
testDriver(testTask, MockReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Exception in Test.");
}
@@ -106,7 +106,7 @@ public class ReduceTaskExternalITCase extends DriverTestBase<RichGroupReduceFunc
testDriver(testTask, MockReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Exception in Test.");
}
@@ -143,7 +143,7 @@ public class ReduceTaskExternalITCase extends DriverTestBase<RichGroupReduceFunc
testDriver(testTask, MockCombiningReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Invoke method caused exception.");
} finally {
if (sorter != null) {
@@ -189,7 +189,7 @@ public class ReduceTaskExternalITCase extends DriverTestBase<RichGroupReduceFunc
testDriver(testTask, MockCombiningReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Invoke method caused exception.");
} finally {
if (sorter != null) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
index fada5a4..97b8950 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java
@@ -24,8 +24,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.java.functions.RichGroupReduceFunction;
import org.apache.flink.api.java.record.operators.ReduceOperator.Combinable;
import org.apache.flink.api.java.typeutils.runtime.record.RecordComparator;
@@ -47,7 +47,7 @@ import org.junit.Test;
public class ReduceTaskTest extends DriverTestBase<RichGroupReduceFunction<Record, Record>>
{
- private static final Log LOG = LogFactory.getLog(ReduceTaskTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReduceTaskTest.class);
@SuppressWarnings("unchecked")
private final RecordComparator comparator = new RecordComparator(
@@ -75,7 +75,7 @@ public class ReduceTaskTest extends DriverTestBase<RichGroupReduceFunction<Recor
testDriver(testTask, MockReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Exception in Test.");
}
@@ -103,7 +103,7 @@ public class ReduceTaskTest extends DriverTestBase<RichGroupReduceFunction<Recor
try {
testDriver(testTask, MockReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Invoke method caused exception.");
}
@@ -137,7 +137,7 @@ public class ReduceTaskTest extends DriverTestBase<RichGroupReduceFunction<Recor
testDriver(testTask, MockCombiningReduceStub.class);
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception while running the test task.", e);
Assert.fail("Invoke method caused exception.");
} finally {
if (sorter != null) {
@@ -178,7 +178,7 @@ public class ReduceTaskTest extends DriverTestBase<RichGroupReduceFunction<Recor
} catch (ExpectedTestException eetex) {
// Good!
} catch (Exception e) {
- LOG.debug(e);
+ LOG.debug("Exception which was not the ExpectedTestException while running the test task.", e);
Assert.fail("Test caused exception.");
}
[3/5] [FLINK-1086] Replace JCL with SLF4J and Log4j with LOGBack
Posted by uc...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java
index 0cf061e..85b7a47 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java
@@ -38,9 +38,6 @@ import org.apache.flink.api.java.tuple.Tuple5;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.fs.Path;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-import org.junit.BeforeClass;
import org.junit.Test;
public class CsvInputFormatTest {
@@ -51,13 +48,7 @@ public class CsvInputFormatTest {
private static final String FIRST_PART = "That is the first part";
private static final String SECOND_PART = "That is the second part";
-
-
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
+
@Test
public void readStringFields() {
try {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java
index 167dfea..1fa606d 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/io/TextInputFormatTest.java
@@ -34,18 +34,9 @@ import java.io.PrintStream;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.fs.Path;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-import org.junit.BeforeClass;
import org.junit.Test;
public class TextInputFormatTest {
-
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
@Test
public void testSimpleRead() {
final String FIRST = "First line";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
index 65652b8..bce9e6a 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/CsvInputFormatTest.java
@@ -33,7 +33,6 @@ import java.io.OutputStreamWriter;
import org.junit.Assert;
-import org.apache.flink.api.java.record.io.CsvInputFormat;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.core.fs.FileInputSplit;
@@ -41,11 +40,8 @@ import org.apache.flink.core.fs.Path;
import org.apache.flink.types.IntValue;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
public class CsvInputFormatTest {
@@ -60,12 +56,6 @@ public class CsvInputFormatTest {
private static final String SECOND_PART = "That is the second part";
// --------------------------------------------------------------------------------------------
-
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
@Before
public void setup() {
format.setFilePath("file:///some/file/that/will/not/be/read");
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java
index 69a62f4..aadb525 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/FixedLenghtInputFormatTest.java
@@ -29,17 +29,13 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.flink.api.java.record.io.FixedLengthInputFormat;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.fs.Path;
import org.apache.flink.types.IntValue;
import org.apache.flink.types.Record;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
public class FixedLenghtInputFormatTest {
@@ -51,12 +47,7 @@ public class FixedLenghtInputFormatTest {
private final FixedLengthInputFormat format = new MyFixedLengthInputFormat();
// --------------------------------------------------------------------------------------------
-
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
+
@Before
public void setup() {
format.setFilePath("file:///some/file/that/will/not/be/read");
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java
index d7c0ea2..d7d2572 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/record/io/TextInputFormatTest.java
@@ -30,23 +30,13 @@ import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.OutputStreamWriter;
-import org.apache.flink.api.java.record.io.TextInputFormat;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.types.Record;
import org.apache.flink.types.StringValue;
-import org.apache.flink.util.LogUtils;
-import org.apache.log4j.Level;
-import org.junit.BeforeClass;
import org.junit.Test;
public class TextInputFormatTest {
-
- @BeforeClass
- public static void initialize() {
- LogUtils.initializeDefaultConsoleLogger(Level.WARN);
- }
-
/**
* The TextInputFormat seems to fail reading more than one record. I guess its
* an off by one error.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java
index e40e4bc..79da72f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/client/JobClient.java
@@ -25,8 +25,8 @@ import java.net.InetSocketAddress;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.JobExecutionResult;
import org.apache.flink.api.common.accumulators.AccumulatorHelper;
import org.apache.flink.configuration.ConfigConstants;
@@ -53,7 +53,7 @@ public class JobClient {
/**
* The logging object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(JobClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobClient.class);
/**
* The job management server stub.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java
index 57ff0fc..98557f9 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/ExecutionStateTransition.java
@@ -23,8 +23,8 @@ import static org.apache.flink.runtime.execution.ExecutionState.CANCELED;
import static org.apache.flink.runtime.execution.ExecutionState.CANCELING;
import static org.apache.flink.runtime.execution.ExecutionState.FAILED;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is a utility class to check the consistency of Nephele's execution state model.
@@ -35,7 +35,7 @@ public final class ExecutionStateTransition {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(ExecutionStateTransition.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionStateTransition.class);
/**
* Private constructor to prevent instantiation of object.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java
index 5cf5c33..6bfaf2a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/RuntimeEnvironment.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.execution;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.Path;
import org.apache.flink.core.io.IOReadableWritable;
@@ -69,7 +69,7 @@ public class RuntimeEnvironment implements Environment, BufferProvider, LocalBuf
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(RuntimeEnvironment.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RuntimeEnvironment.class);
/**
* The interval to sleep in case a communication channel is not yet entirely set up (in milliseconds).
@@ -247,7 +247,7 @@ public class RuntimeEnvironment implements Environment, BufferProvider, LocalBuf
@Override
public void run() {
if (invokable == null) {
- LOG.fatal("ExecutionEnvironment has no Invokable set");
+ LOG.error("ExecutionEnvironment has no Invokable set");
}
// Now the actual program starts to run
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
index 5bc9051..cea0271 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
@@ -34,8 +34,8 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.io.InitializeOnMaster;
import org.apache.flink.api.common.io.OutputFormat;
import org.apache.flink.configuration.Configuration;
@@ -74,7 +74,7 @@ public class ExecutionGraph implements ExecutionListener {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(ExecutionGraph.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionGraph.class);
/**
* The ID of the job this graph has been built for.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java
index 754d0bf..f4efc88 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphIterator.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.Set;
import java.util.Stack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class provides an implementation of the {@link Iterator} interface which allows to
@@ -41,7 +41,7 @@ public class ExecutionGraphIterator implements Iterator<ExecutionVertex> {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(ExecutionGraphIterator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionGraphIterator.class);
/**
* The execution this iterator traverses.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java
index f3dae40..40f2468 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionSignature.java
@@ -24,8 +24,8 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager;
import org.apache.flink.runtime.jobgraph.JobID;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
@@ -44,7 +44,7 @@ public final class ExecutionSignature {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(ExecutionSignature.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionSignature.class);
/**
* The name of the hashing algorithm to be used.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
index 266eea2..72e0696 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionVertex.java
@@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.deployment.ChannelDeploymentDescriptor;
import org.apache.flink.runtime.deployment.GateDeploymentDescriptor;
import org.apache.flink.runtime.deployment.TaskDeploymentDescriptor;
@@ -64,7 +64,7 @@ public final class ExecutionVertex {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(ExecutionVertex.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionVertex.class);
/**
* The ID of the vertex.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java
index 6280fed..1700268 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/hdfs/DistributedFileSystem.java
@@ -24,8 +24,8 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URI;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.core.fs.BlockLocation;
@@ -43,7 +43,7 @@ import org.apache.hadoop.conf.Configuration;
*/
public final class DistributedFileSystem extends FileSystem {
- private static final Log LOG = LogFactory.getLog(DistributedFileSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DistributedFileSystem.class);
private static final String DEFAULT_HDFS_CLASS = "org.apache.hadoop.hdfs.DistributedFileSystem";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/fs/maprfs/MapRFileSystem.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/maprfs/MapRFileSystem.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/maprfs/MapRFileSystem.java
index e85ebc5..ac08c27 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/maprfs/MapRFileSystem.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/maprfs/MapRFileSystem.java
@@ -27,8 +27,8 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.fs.BlockLocation;
import org.apache.flink.core.fs.FSDataInputStream;
import org.apache.flink.core.fs.FSDataOutputStream;
@@ -51,7 +51,7 @@ public final class MapRFileSystem extends FileSystem {
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(MapRFileSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MapRFileSystem.class);
/**
* The name of MapR's class containing the implementation of the Hadoop HDFS
@@ -383,4 +383,4 @@ public final class MapRFileSystem extends FileSystem {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java
index 40fc9fa..73697c8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/fs/s3/S3FileSystem.java
@@ -32,8 +32,8 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.core.fs.BlockLocation;
import org.apache.flink.core.fs.FSDataInputStream;
@@ -64,7 +64,7 @@ public final class S3FileSystem extends FileSystem {
/**
* The logging object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(S3FileSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(S3FileSystem.class);
/**
* The configuration key to access the S3 host.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java
index 5c65131..3475a02 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/DefaultInstanceManager.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.instance;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.jobgraph.JobID;
@@ -52,7 +52,7 @@ public class DefaultInstanceManager implements InstanceManager {
/**
* The log object used to report debugging and error information.
*/
- private static final Log LOG = LogFactory.getLog(DefaultInstanceManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultInstanceManager.class);
/**
* Default duration after which a host is purged in case it did not send
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java
index c71f6e6..8a4de1e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/HardwareDescriptionFactory.java
@@ -26,8 +26,8 @@ import java.io.InputStreamReader;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.util.OperatingSystem;
/**
@@ -42,7 +42,7 @@ public class HardwareDescriptionFactory {
/**
* The log object used to report errors.
*/
- private static final Log LOG = LogFactory.getLog(HardwareDescriptionFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HardwareDescriptionFactory.class);
/**
* The path to the interface to extract memory information under Linux.
@@ -214,7 +214,7 @@ public class HardwareDescriptionFactory {
}
} catch (Exception e) {
- LOG.error(e);
+ LOG.error("Exception while retrieving size of physical of memory on mac.", e);
return -1;
} finally {
if (bi != null) {
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java
index 6b2fad7..8fced32 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/IOManager.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.memory.MemorySegment;
/**
@@ -38,7 +38,7 @@ public final class IOManager implements UncaughtExceptionHandler
/**
* Logging.
*/
- private static final Log LOG = LogFactory.getLog(IOManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IOManager.class);
/**
* The default temp paths for anonymous Channels.
@@ -199,7 +199,7 @@ public final class IOManager implements UncaughtExceptionHandler
@Override
public void uncaughtException(Thread t, Throwable e)
{
- LOG.fatal("IO Thread '" + t.getName() + "' terminated due to an exception. Closing I/O Manager.", e);
+ LOG.error("IO Thread '" + t.getName() + "' terminated due to an exception. Closing I/O Manager.", e);
shutdown();
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java
index b886e5d..3aae114 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ChannelManager.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.io.network;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.runtime.AbstractID;
import org.apache.flink.runtime.execution.CancelTaskException;
@@ -56,7 +56,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class ChannelManager implements EnvelopeDispatcher, BufferProviderBroker {
- private static final Log LOG = LogFactory.getLog(ChannelManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ChannelManager.class);
private final ChannelLookupProtocol channelLookupService;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java
index f231463..844ca6e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/bufferprovider/GlobalBufferPool.java
@@ -22,8 +22,8 @@ package org.apache.flink.runtime.io.network.bufferprovider;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.memory.MemorySegment;
/**
@@ -36,7 +36,7 @@ import org.apache.flink.core.memory.MemorySegment;
*/
public final class GlobalBufferPool {
- private final static Log LOG = LogFactory.getLog(GlobalBufferPool.class);
+ private final static Logger LOG = LoggerFactory.getLogger(GlobalBufferPool.class);
// -----------------------------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java
index 4a7b5fc..be59242 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/InputChannel.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.io.network.channels;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.runtime.event.task.AbstractEvent;
import org.apache.flink.runtime.event.task.AbstractTaskEvent;
@@ -56,7 +56,7 @@ public class InputChannel<T extends IOReadableWritable> extends Channel implemen
/**
* The log object used to report warnings and errors.
*/
- private static final Log LOG = LogFactory.getLog(InputChannel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputChannel.class);
/**
* The deserializer used to deserialize records.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java
index a80da94..3b19ede 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/channels/OutputChannel.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.io.network.channels;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.event.task.AbstractEvent;
import org.apache.flink.runtime.event.task.AbstractTaskEvent;
import org.apache.flink.runtime.io.network.Buffer;
@@ -34,7 +34,7 @@ import java.util.Arrays;
public class OutputChannel extends Channel {
- private static final Log LOG = LogFactory.getLog(OutputChannel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OutputChannel.class);
private final Object closeLock = new Object();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java
index 8d42821..238d1e7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/gates/InputGate.java
@@ -24,8 +24,8 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.runtime.deployment.ChannelDeploymentDescriptor;
import org.apache.flink.runtime.deployment.GateDeploymentDescriptor;
@@ -55,7 +55,7 @@ public class InputGate<T extends IOReadableWritable> extends Gate<T> implements
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(InputGate.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputGate.class);
/**
* The array of input channels attached to this input gate.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java
index 82f84ad..1dba3f8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/InboundEnvelopeDecoder.java
@@ -23,8 +23,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.io.network.Buffer;
import org.apache.flink.runtime.io.network.Envelope;
import org.apache.flink.runtime.io.network.bufferprovider.BufferAvailabilityListener;
@@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
public class InboundEnvelopeDecoder extends ChannelInboundHandlerAdapter implements BufferAvailabilityListener {
- private static final Log LOG = LogFactory.getLog(InboundEnvelopeDecoder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InboundEnvelopeDecoder.class);
private final BufferProviderBroker bufferProviderBroker;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
index 7e9af6f..6d7e15c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
@@ -30,8 +30,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.io.network.ChannelManager;
import org.apache.flink.runtime.io.network.Envelope;
import org.apache.flink.runtime.io.network.EnvelopeDispatcher;
@@ -48,7 +48,7 @@ import java.util.concurrent.ConcurrentMap;
public class NettyConnectionManager implements NetworkConnectionManager {
- private static final Log LOG = LogFactory.getLog(NettyConnectionManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NettyConnectionManager.class);
private static final int DEBUG_PRINT_QUEUED_ENVELOPES_EVERY_MS = 10000;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java
index eb76be5..4008e97 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/OutboundConnectionQueue.java
@@ -25,8 +25,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.timeout.IdleStateEvent;
import io.netty.handler.timeout.IdleStateHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.io.network.Envelope;
import org.apache.flink.runtime.io.network.NetworkConnectionManager;
import org.apache.flink.runtime.io.network.RemoteReceiver;
@@ -41,7 +41,7 @@ public class OutboundConnectionQueue extends ChannelInboundHandlerAdapter {
TRIGGER_WRITE
}
- private static final Log LOG = LogFactory.getLog(OutboundConnectionQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OutboundConnectionQueue.class);
private final ChannelWriteListener writeListener = new ChannelWriteListener();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java
index 346b79a..87267fe 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Client.java
@@ -25,8 +25,8 @@
package org.apache.flink.runtime.ipc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.core.io.StringRecord;
import org.apache.flink.core.memory.InputViewDataInputStreamWrapper;
@@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public class Client {
- public static final Log LOG = LogFactory.getLog(Client.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Client.class);
private Hashtable<ConnectionId, Connection> connections = new Hashtable<ConnectionId, Connection>();
@@ -512,14 +512,14 @@ public class Client {
try {
c = ClassUtils.getRecordByName(returnClassName);
} catch (ClassNotFoundException e) {
- LOG.error(e);
+ LOG.error("Could not find class " + returnClassName + ".", e);
}
try {
value = c.newInstance();
} catch (InstantiationException e) {
- LOG.error(e);
+ LOG.error("Could not instantiate object of class " + c.getCanonicalName() + ".", e);
} catch (IllegalAccessException e) {
- LOG.error(e);
+ LOG.error("Error instantiating object of class " + c.getCanonicalName() + ".", e);
}
try {
value.read(new InputViewDataInputStreamWrapper(in)); // read value
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java
index efeeadc..1768687 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/RPC.java
@@ -38,8 +38,8 @@ import java.util.Map;
import javax.net.SocketFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.core.io.StringRecord;
import org.apache.flink.core.memory.DataInputView;
@@ -64,7 +64,7 @@ import org.apache.flink.util.ClassUtils;
*/
public class RPC {
- private static final Log LOG = LogFactory.getLog(RPC.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RPC.class);
private RPC() {
} // no public ctor
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java
index a8c970c..bde6847 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/ipc/Server.java
@@ -58,8 +58,8 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.IOReadableWritable;
import org.apache.flink.core.io.StringRecord;
import org.apache.flink.core.memory.InputViewDataInputStreamWrapper;
@@ -76,7 +76,7 @@ import org.apache.flink.util.ClassUtils;
*/
public abstract class Server {
- public static final Log LOG = LogFactory.getLog(Server.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Server.class);
private static final Class<?>[] EMPTY_ARRAY = new Class[] {};
@@ -889,7 +889,7 @@ public abstract class Server {
protocol = getProtocolClass(header.getProtocol());
}
} catch (ClassNotFoundException cnfe) {
- LOG.error(cnfe);
+ LOG.error("Could not find class " + header.getProtocol() + ".", cnfe);
throw new IOException("Unknown protocol: " + header.getProtocol());
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java
index 9eb0637..b0ed29e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/convergence/WorksetEmptyConvergenceCriterion.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.iterative.convergence;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
import org.apache.flink.types.LongValue;
@@ -31,7 +31,7 @@ public class WorksetEmptyConvergenceCriterion implements ConvergenceCriterion<Lo
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(WorksetEmptyConvergenceCriterion.class);
+ private static final Logger log = LoggerFactory.getLogger(WorksetEmptyConvergenceCriterion.class);
public static final String AGGREGATOR_NAME = "pact.runtime.workset-empty-aggregator";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java
index 4c03278..1d37fd8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativePactTask.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.iterative.task;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.aggregators.Aggregator;
import org.apache.flink.api.common.aggregators.LongSumAggregator;
import org.apache.flink.api.common.functions.Function;
@@ -57,7 +57,7 @@ import java.io.IOException;
public abstract class AbstractIterativePactTask<S extends Function, OT> extends RegularPactTask<S, OT>
implements Terminable
{
- private static final Log log = LogFactory.getLog(AbstractIterativePactTask.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractIterativePactTask.class);
protected LongSumAggregator worksetAggregator;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java
index 3dbd47c..3d1f599 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadPactTask.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.api.common.typeutils.TypeComparator;
import org.apache.flink.api.common.typeutils.TypeComparatorFactory;
@@ -78,7 +78,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class IterationHeadPactTask<X, Y, S extends Function, OT> extends AbstractIterativePactTask<S, OT> {
- private static final Log log = LogFactory.getLog(IterationHeadPactTask.class);
+ private static final Logger log = LoggerFactory.getLogger(IterationHeadPactTask.class);
private Collector<X> finalOutputCollector;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java
index b12e70b..a7835ee 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationIntermediatePactTask.java
@@ -20,8 +20,8 @@ package org.apache.flink.runtime.iterative.task;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.runtime.io.network.api.BufferWriter;
import org.apache.flink.runtime.io.network.channels.EndOfSuperstepEvent;
@@ -44,7 +44,7 @@ import org.apache.flink.util.Collector;
*/
public class IterationIntermediatePactTask<S extends Function, OT> extends AbstractIterativePactTask<S, OT> {
- private static final Log log = LogFactory.getLog(IterationIntermediatePactTask.class);
+ private static final Logger log = LoggerFactory.getLogger(IterationIntermediatePactTask.class);
private WorksetUpdateOutputCollector<OT> worksetUpdateOutputCollector;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java
index c44f443..7852918 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationSynchronizationSinkTask.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.aggregators.Aggregator;
import org.apache.flink.api.common.aggregators.AggregatorWithName;
import org.apache.flink.api.common.aggregators.ConvergenceCriterion;
@@ -51,7 +51,7 @@ import com.google.common.base.Preconditions;
*/
public class IterationSynchronizationSinkTask extends AbstractInvokable implements Terminable {
- private static final Log log = LogFactory.getLog(IterationSynchronizationSinkTask.class);
+ private static final Logger log = LoggerFactory.getLogger(IterationSynchronizationSinkTask.class);
private MutableRecordReader<IntegerRecord> headEventReader;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java
index 0d9c903..0a28bd7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationTailPactTask.java
@@ -18,8 +18,8 @@
package org.apache.flink.runtime.iterative.task;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.runtime.iterative.concurrent.SolutionSetUpdateBarrier;
import org.apache.flink.runtime.iterative.concurrent.SolutionSetUpdateBarrierBroker;
@@ -42,7 +42,7 @@ import org.apache.flink.util.Collector;
public class IterationTailPactTask<S extends Function, OT> extends AbstractIterativePactTask<S, OT>
implements PactTaskContext<S, OT> {
- private static final Log log = LogFactory.getLog(IterationTailPactTask.class);
+ private static final Logger log = LoggerFactory.getLogger(IterationTailPactTask.class);
private SolutionSetUpdateBarrier solutionSetUpdateBarrier;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java
index d1601f2..d142348 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/SyncEventHandler.java
@@ -30,7 +30,7 @@ import com.google.common.base.Preconditions;
public class SyncEventHandler implements EventListener {
-// private static final Log log = LogFactory.getLog(SyncEventHandler.class);
+// private static final Logger log = LoggerFactory.getLogger(SyncEventHandler.class);
private final ClassLoader userCodeClassLoader;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
index 71957ad..3ba630b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java
@@ -42,8 +42,8 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.accumulators.Accumulator;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
@@ -111,10 +111,6 @@ import org.apache.flink.runtime.types.IntegerRecord;
import org.apache.flink.runtime.util.EnvironmentInformation;
import org.apache.flink.runtime.util.SerializableArrayList;
import org.apache.flink.util.StringUtils;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
/**
* In Nephele the job manager is the central component for communication with clients, creating
@@ -128,7 +124,7 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
JobManagerProtocol, ChannelLookupProtocol, JobStatusListener, AccumulatorProtocol
{
- private static final Log LOG = LogFactory.getLog(JobManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobManager.class);
private final Server jobManagerServer;
@@ -276,7 +272,7 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
try {
this.executorService.awaitTermination(5000L, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- LOG.debug(e);
+ LOG.debug("Got interrupted while waiting for the executor service to shutdown.", e);
}
}
@@ -310,16 +306,6 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
*/
public static void main(String[] args) {
- // determine if a valid log4j config exists and initialize a default logger if not
- if (System.getProperty("log4j.configuration") == null) {
- Logger root = Logger.getRootLogger();
- root.removeAllAppenders();
- PatternLayout layout = new PatternLayout("%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n");
- ConsoleAppender appender = new ConsoleAppender(layout, "System.err");
- root.addAppender(appender);
- root.setLevel(Level.INFO);
- }
-
JobManager jobManager;
try {
jobManager = initialize(args);
@@ -327,7 +313,7 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
jobManager.startInfoServer();
}
catch (Exception e) {
- LOG.fatal(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
System.exit(FAILURE_RETURN_CODE);
}
@@ -566,7 +552,7 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
LibraryCacheManager.unregister(executionGraph.getJobID());
} catch (IOException ioe) {
if (LOG.isWarnEnabled()) {
- LOG.warn(ioe);
+ LOG.warn("IOException while unregistering the job with id " + executionGraph.getJobID() + ".",ioe);
}
}
}
@@ -940,7 +926,7 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
try {
instance.killTaskManager();
} catch (IOException ioe) {
- LOG.error(ioe);
+ LOG.error("IOException while killing the task manager on instance " + instanceName + ".", ioe);
}
}
};
@@ -1023,7 +1009,7 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
it2.next().logBufferUtilization();
}
} catch (IOException ioe) {
- LOG.error(ioe);
+ LOG.error("IOException while logging buffer utilization.", ioe);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java
index 6e11a90..4c7b957 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerUtils.java
@@ -22,8 +22,8 @@ package org.apache.flink.runtime.jobmanager;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.ExecutionMode;
import org.apache.flink.runtime.instance.InstanceManager;
import org.apache.flink.runtime.jobmanager.scheduler.DefaultScheduler;
@@ -38,7 +38,7 @@ public class JobManagerUtils {
/**
* The logging object used by the utility methods.
*/
- private static final Log LOG = LogFactory.getLog(JobManagerUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobManagerUtils.class);
/**
* Private constructor.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java
index dd2fabd..47f959b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/scheduler/DefaultScheduler.java
@@ -31,8 +31,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.Deque;
import java.util.ArrayDeque;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.execution.ExecutionState;
import org.apache.flink.runtime.executiongraph.ExecutionEdge;
import org.apache.flink.runtime.executiongraph.ExecutionGate;
@@ -70,7 +70,7 @@ public class DefaultScheduler implements InstanceListener, JobStatusListener, Ex
/**
* The LOG object to report events within the scheduler.
*/
- protected static final Log LOG = LogFactory.getLog(DefaultScheduler.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(DefaultScheduler.class);
/**
* The instance manager assigned to this scheduler.
@@ -511,7 +511,7 @@ public class DefaultScheduler implements InstanceListener, JobStatusListener, Ex
getInstanceManager().releaseAllocatedResource(allocatedResource);
}
} catch (InstanceException e) {
- LOG.error(e);
+ LOG.error("InstanceException while releasing allocated ressources.", e);
}
return;
}
@@ -560,7 +560,7 @@ public class DefaultScheduler implements InstanceListener, JobStatusListener, Ex
try {
getInstanceManager().releaseAllocatedResource(allocatedResource);
} catch (InstanceException e) {
- LOG.error(e);
+ LOG.error("InstanceException while releasing allocated ressources.", e);
}
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java
index 9c722b7..916772a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/DefaultInputSplitAssigner.java
@@ -25,8 +25,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.InputSplit;
import org.apache.flink.runtime.executiongraph.ExecutionGroupVertex;
import org.apache.flink.runtime.executiongraph.ExecutionVertex;
@@ -45,7 +45,7 @@ public class DefaultInputSplitAssigner implements InputSplitAssigner {
/**
* The logging object used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(DefaultInputSplitAssigner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultInputSplitAssigner.class);
/**
* The split map stores a list of all input splits that still must be consumed by a specific input vertex.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java
index 158a283..d9de4ee 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitManager.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.io.GenericInputSplit;
@@ -52,7 +52,7 @@ public final class InputSplitManager {
/**
* The logging object which is used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(InputSplitManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputSplitManager.class);
/**
* The prefix of the configuration key which is used to retrieve the class names of the individual
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java
index d15ec3e..013fbec 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/InputSplitTracker.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.InputSplit;
import org.apache.flink.runtime.executiongraph.ExecutionGraph;
import org.apache.flink.runtime.executiongraph.ExecutionGraphIterator;
@@ -48,7 +48,7 @@ final class InputSplitTracker {
/**
* The logging object which is used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(InputSplitTracker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputSplitTracker.class);
/**
* The central split map which stores the logs of the individual input vertices.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java
index 448fa51..6a45866 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitAssigner.java
@@ -22,8 +22,8 @@ package org.apache.flink.runtime.jobmanager.splitassigner;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.InputSplit;
import org.apache.flink.core.io.LocatableInputSplit;
import org.apache.flink.runtime.executiongraph.ExecutionGroupVertex;
@@ -44,7 +44,7 @@ public final class LocatableInputSplitAssigner implements InputSplitAssigner {
/**
* The logging object which is used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(LocatableInputSplitAssigner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LocatableInputSplitAssigner.class);
private final ConcurrentMap<ExecutionGroupVertex, LocatableInputSplitList> vertexMap = new ConcurrentHashMap<ExecutionGroupVertex, LocatableInputSplitList>();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java
index 57ea393..71fbf7a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/LocatableInputSplitList.java
@@ -27,8 +27,8 @@ import java.util.PriorityQueue;
import java.util.Queue;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.io.LocatableInputSplit;
import org.apache.flink.runtime.instance.Instance;
@@ -47,7 +47,7 @@ public final class LocatableInputSplitList {
/**
* The logging object which is used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(LocatableInputSplitList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LocatableInputSplitList.class);
/**
* The set containing all the locatable input splits that still must be consumed.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java
index f4e0c74..383ed38 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitAssigner.java
@@ -22,8 +22,8 @@ package org.apache.flink.runtime.jobmanager.splitassigner.file;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.core.io.InputSplit;
import org.apache.flink.runtime.executiongraph.ExecutionGroupVertex;
@@ -45,7 +45,7 @@ public final class FileInputSplitAssigner implements InputSplitAssigner {
/**
* The logging object which is used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(FileInputSplitAssigner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileInputSplitAssigner.class);
private final ConcurrentMap<ExecutionGroupVertex, FileInputSplitList> vertexMap = new ConcurrentHashMap<ExecutionGroupVertex, FileInputSplitList>();
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java
index c54a98c..06cca24 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/splitassigner/file/FileInputSplitList.java
@@ -27,8 +27,8 @@ import java.util.PriorityQueue;
import java.util.Queue;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.fs.FileInputSplit;
import org.apache.flink.runtime.instance.Instance;
@@ -47,7 +47,7 @@ public final class FileInputSplitList {
/**
* The logging object which is used to report information and errors.
*/
- private static final Log LOG = LogFactory.getLog(FileInputSplitList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileInputSplitList.class);
/**
* The set containing all the file input splits that still must be consumed.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java
index 2f738a2..91d2110 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobmanagerInfoServlet.java
@@ -33,8 +33,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.accumulators.AccumulatorHelper;
import org.apache.flink.runtime.event.job.AbstractEvent;
import org.apache.flink.runtime.event.job.ExecutionStateChangeEvent;
@@ -61,7 +61,7 @@ public class JobmanagerInfoServlet extends HttpServlet {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(JobmanagerInfoServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobmanagerInfoServlet.class);
/**
* Underlying JobManager
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java
index 5b09704..2f915f8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/LogfileInfoServlet.java
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.util.StringUtils;
@@ -42,7 +42,7 @@ public class LogfileInfoServlet extends HttpServlet {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(LogfileInfoServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogfileInfoServlet.class);
private File[] logDirs;
@@ -58,11 +58,11 @@ public class LogfileInfoServlet extends HttpServlet {
try {
if("stdout".equals(req.getParameter("get"))) {
// Find current stdout file
- sendFile("jobmanager-stdout.log", resp);
+ sendFile(".*-jobmanager-[^\\.]*\\.out", resp);
}
else {
// Find current logfile
- sendFile("jobmanager-log4j.log", resp);
+ sendFile(".*-jobmanager-[^\\.]*\\.log", resp);
}
} catch (Throwable t) {
resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
@@ -73,14 +73,11 @@ public class LogfileInfoServlet extends HttpServlet {
}
}
- private void sendFile(String fileName, HttpServletResponse resp) throws IOException {
+ private void sendFile(String fileNamePattern, HttpServletResponse resp) throws IOException {
for(File logDir: logDirs) {
for(File f : logDir.listFiles()) {
// contains "jobmanager" ".log" and no number in the end ->needs improvement
- if( f.getName().equals(fileName) /*||
- (f.getName().indexOf("jobmanager") != -1 && f.getName().indexOf(".log") != -1 && ! Character.isDigit(f.getName().charAt(f.getName().length() - 1) )) */
- ) {
-
+ if( f.getName().matches(fileNamePattern)) {
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType("text/plain");
writeFile(resp.getOutputStream(), f);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java
index 8397ab4..441b64b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/MenuServlet.java
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Servlet that displays the Configruation in the webinterface.
@@ -43,7 +43,7 @@ public class MenuServlet extends HttpServlet {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(MenuServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MenuServlet.class);
/**
* Array of possible menu entries on the left
@@ -68,7 +68,7 @@ public class MenuServlet extends HttpServlet {
public MenuServlet() {
if (names.length != entries.length || names.length != classes.length) {
- LOG.fatal("The Arrays 'entries', 'classes' and 'names' differ in thier length. This is not allowed!");
+ LOG.error("The Arrays 'entries', 'classes' and 'names' differ in thier length. This is not allowed!");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java
index aa781f6..a9bbec6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/SetupInfoServlet.java
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.instance.Instance;
@@ -57,7 +57,7 @@ public class SetupInfoServlet extends HttpServlet {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(SetupInfoServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SetupInfoServlet.class);
private Configuration globalC;
private JobManager jobmanager;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java
index 933e49d..283fb83 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/WebInfoServer.java
@@ -23,8 +23,8 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
@@ -50,7 +50,7 @@ public class WebInfoServer {
/**
* The log for this class.
*/
- private static final Log LOG = LogFactory.getLog(WebInfoServer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WebInfoServer.class);
/**
* The jetty server serving all requests.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java
index 79ba66a..c2b8ef3 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/managementgraph/ManagementGraphIterator.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.Set;
import java.util.Stack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class provides an implementation of the {@link java.util.Iterator} interface which allows to
@@ -41,7 +41,7 @@ public final class ManagementGraphIterator implements Iterator<ManagementVertex>
/**
* The log object used for debugging.
*/
- private static final Log LOG = LogFactory.getLog(ManagementGraphIterator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ManagementGraphIterator.class);
/**
* The management graph this iterator traverses.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java
index 7939a35..a633948 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/memorymanager/DefaultMemoryManager.java
@@ -28,8 +28,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.core.memory.MemorySegment;
import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
@@ -47,9 +47,9 @@ public class DefaultMemoryManager implements MemoryManager {
public static final int MIN_PAGE_SIZE = 4 * 1024;
/**
- * The Log.
+ * The Logger.
*/
- private static final Log LOG = LogFactory.getLog(DefaultMemoryManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultMemoryManager.class);
// --------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java
index b2103e1..46edfdc 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/net/NetUtils.java
@@ -46,12 +46,12 @@ import java.util.Set;
import javax.net.SocketFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.runtime.ipc.Server;
public class NetUtils {
- private static final Log LOG = LogFactory.getLog(NetUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NetUtils.class);
private static Map<String, String> hostToResolved = new HashMap<String, String>();
@@ -102,7 +102,7 @@ public class NetUtils {
hostname = addr.getHost();
port = addr.getPort();
} catch (URISyntaxException use) {
- LOG.fatal(use);
+ LOG.error("Invalid URI syntax.", use);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java
index 2276c7f..f1fa4e7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/net/SocketIOWithTimeout.java
@@ -38,8 +38,8 @@ import java.nio.channels.spi.SelectorProvider;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This supports input and output streams for a socket channels.
@@ -48,7 +48,7 @@ import org.apache.commons.logging.LogFactory;
abstract class SocketIOWithTimeout {
// This is intentionally package private.
- static final Log LOG = LogFactory.getLog(SocketIOWithTimeout.class);
+ static final Logger LOG = LoggerFactory.getLogger(SocketIOWithTimeout.class);
private SelectableChannel channel;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/08188508/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
index 0727d63..9a63226 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
@@ -19,8 +19,8 @@
package org.apache.flink.runtime.operators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.flink.api.common.functions.FlatCombineFunction;
import org.apache.flink.api.common.functions.GroupReduceFunction;
import org.apache.flink.api.common.typeutils.TypeSerializer;
@@ -41,7 +41,7 @@ import org.apache.flink.util.MutableObjectIterator;
*/
public class AllGroupReduceDriver<IT, OT> implements PactDriver<GroupReduceFunction<IT, OT>, OT> {
- private static final Log LOG = LogFactory.getLog(AllGroupReduceDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AllGroupReduceDriver.class);
private PactTaskContext<GroupReduceFunction<IT, OT>, OT> taskContext;
@@ -124,4 +124,4 @@ public class AllGroupReduceDriver<IT, OT> implements PactDriver<GroupReduceFunct
@Override
public void cancel() {}
-}
\ No newline at end of file
+}