You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2017/12/15 16:18:02 UTC
[04/13] asterixdb git commit: [ASTERIXDB-1564][CONF] Consistently Use
Log4j2
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/HybridTopKSortRunGenerator.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/HybridTopKSortRunGenerator.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/HybridTopKSortRunGenerator.java
index 80b36ce..180ecbc 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/HybridTopKSortRunGenerator.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/HybridTopKSortRunGenerator.java
@@ -20,8 +20,6 @@
package org.apache.hyracks.dataflow.std.sort;
import java.nio.ByteBuffer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
@@ -34,9 +32,11 @@ import org.apache.hyracks.dataflow.std.buffermanager.EnumFreeSlotPolicy;
import org.apache.hyracks.dataflow.std.buffermanager.FrameFreeSlotPolicyFactory;
import org.apache.hyracks.dataflow.std.buffermanager.VariableFrameMemoryManager;
import org.apache.hyracks.dataflow.std.buffermanager.VariableFramePool;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class HybridTopKSortRunGenerator extends HeapSortRunGenerator {
- private static final Logger LOG = Logger.getLogger(HybridTopKSortRunGenerator.class.getName());
+ private static final Logger LOG = LogManager.getLogger();
private static final int SWITCH_TO_FRAME_SORTER_THRESHOLD = 2;
private IFrameSorter frameSorter = null;
@@ -90,8 +90,8 @@ public class HybridTopKSortRunGenerator extends HeapSortRunGenerator {
}
tupleSorter.close();
tupleSorter = null;
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("clear tupleSorter");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("clear tupleSorter");
}
}
}
@@ -103,8 +103,8 @@ public class HybridTopKSortRunGenerator extends HeapSortRunGenerator {
frameLimit - 1));
frameSorter = new FrameSorterMergeSort(ctx, bufferManager, frameLimit - 1, sortFields, nmkFactories,
comparatorFactories, recordDescriptor, topK);
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("create frameSorter");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("create frameSorter");
}
}
if (!frameSorter.insertFrame(buffer)) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TupleSorterHeapSort.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TupleSorterHeapSort.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TupleSorterHeapSort.java
index 980857a..b02f859 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TupleSorterHeapSort.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TupleSorterHeapSort.java
@@ -21,8 +21,6 @@ package org.apache.hyracks.dataflow.std.sort;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IFrame;
import org.apache.hyracks.api.comm.IFrameTupleAccessor;
@@ -42,10 +40,12 @@ import org.apache.hyracks.dataflow.std.structures.IResetableComparable;
import org.apache.hyracks.dataflow.std.structures.IResetableComparableFactory;
import org.apache.hyracks.dataflow.std.structures.MaxHeap;
import org.apache.hyracks.dataflow.std.structures.TuplePointer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class TupleSorterHeapSort implements ITupleSorter {
- private static final Logger LOGGER = Logger.getLogger(TupleSorterHeapSort.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
class HeapEntryFactory implements IResetableComparableFactory<HeapEntry> {
@Override
@@ -304,7 +304,7 @@ public class TupleSorterHeapSort implements ITupleSorter {
}
maxFrameSize = Math.max(maxFrameSize, outputFrame.getFrameSize());
outputAppender.write(writer, true);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Flushed records:" + numEntries + "; Flushed through " + (io + 1) + " frames");
}
return maxFrameSize;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
index d894d9b..7472aa8 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
@@ -179,5 +179,9 @@
<artifactId>hyracks-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java
index 8696f8b..7a675bc 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java
@@ -24,8 +24,6 @@ import java.io.FileReader;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IFrame;
import org.apache.hyracks.api.comm.IFrameReader;
@@ -44,10 +42,12 @@ import org.apache.hyracks.dataflow.common.comm.io.SerializingDataWriter;
import org.apache.hyracks.dataflow.common.data.marshalling.IntegerSerializerDeserializer;
import org.apache.hyracks.dataflow.common.data.marshalling.UTF8StringSerializerDeserializer;
import org.apache.hyracks.test.support.TestUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Test;
public class SerializationDeserializationTest {
- private static final Logger LOGGER = Logger.getLogger(SerializationDeserializationTest.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final String DBLP_FILE = "data" + File.separator + "device1" + File.separator + "data"
+ File.separator + "dblp.txt";
@@ -139,7 +139,7 @@ public class SerializationDeserializationTest {
reader.open();
Object[] arr;
while ((arr = reader.readData()) != null) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(arr[0] + " " + arr[1]);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
index 82fd737..ae27ac9 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
@@ -30,8 +30,6 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.client.HyracksConnection;
@@ -55,12 +53,14 @@ import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.control.nc.resources.memory.FrameManager;
import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
public abstract class AbstractIntegrationTest {
- private static final Logger LOGGER = Logger.getLogger(AbstractIntegrationTest.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
public static final String NC1_ID = "nc1";
public static final String NC2_ID = "nc2";
@@ -121,7 +121,7 @@ public abstract class AbstractIntegrationTest {
nc2.start();
hcc = new HyracksConnection(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort());
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Starting CC in " + ccRoot.getAbsolutePath());
}
}
@@ -134,11 +134,11 @@ public abstract class AbstractIntegrationTest {
}
protected JobId executeTest(JobSpecification spec) throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(spec.toJSON().asText());
}
JobId jobId = hcc.startJob(spec, EnumSet.of(JobFlag.PROFILE_RUNTIME));
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(jobId.toString());
}
return jobId;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java
index cc46a7d..a455cc9 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.client.HyracksConnection;
@@ -50,6 +48,8 @@ import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.control.nc.resources.memory.FrameManager;
import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -58,7 +58,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
public abstract class AbstractMultiNCIntegrationTest {
- private static final Logger LOGGER = Logger.getLogger(AbstractMultiNCIntegrationTest.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final TestJobLifecycleListener jobLifecycleListener = new TestJobLifecycleListener();
public static final String[] ASTERIX_IDS =
@@ -113,7 +113,7 @@ public abstract class AbstractMultiNCIntegrationTest {
}
hcc = new HyracksConnection(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort());
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Starting CC in " + ccRoot.getAbsolutePath());
}
}
@@ -144,11 +144,11 @@ public abstract class AbstractMultiNCIntegrationTest {
}
protected void runTest(JobSpecification spec, String expectedErrorMessage) throws Exception {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(spec.toJSON().asText());
}
JobId jobId = hcc.startJob(spec, EnumSet.of(JobFlag.PROFILE_RUNTIME));
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info(jobId.toString());
}
@@ -218,7 +218,7 @@ public abstract class AbstractMultiNCIntegrationTest {
}
private void dumpOutputFiles() {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
for (File f : outputFiles) {
if (f.exists() && f.isFile()) {
try {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java
index dd4fdd1..553c5b5 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java
@@ -25,8 +25,6 @@ import static org.mockito.Mockito.verify;
import java.io.File;
import java.lang.reflect.Field;
import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.client.HyracksConnection;
@@ -40,6 +38,8 @@ import org.apache.hyracks.control.cc.cluster.NodeManager;
import org.apache.hyracks.control.common.controllers.CCConfig;
import org.apache.hyracks.control.common.controllers.NCConfig;
import org.apache.hyracks.control.nc.NodeControllerService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -47,7 +47,7 @@ import org.junit.Test;
import org.mockito.Mockito;
public class DeployedJobSpecsTest {
- private static final Logger LOGGER = Logger.getLogger(DeployedJobSpecsTest.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final String NC1_ID = "nc1";
private static final String NC2_ID = "nc2";
@@ -111,7 +111,7 @@ public class DeployedJobSpecsTest {
nc2.start();
hcc = new HyracksConnection(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort());
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Starting CC in " + ccRoot.getAbsolutePath());
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
index c8d0b9c..008be29 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
@@ -24,18 +24,19 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.job.IJobLifecycleListener;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.job.JobStatus;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class TestJobLifecycleListener implements IJobLifecycleListener {
- private static final Logger LOGGER = Logger.getLogger(TestJobLifecycleListener.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final Map<JobId, JobSpecification> created = new HashMap<>();
private final Set<JobId> started = new HashSet<>();
private final Set<JobId> finished = new HashSet<>();
@@ -48,7 +49,7 @@ public class TestJobLifecycleListener implements IJobLifecycleListener {
@Override
public void notifyJobCreation(JobId jobId, JobSpecification spec) throws HyracksException {
if (created.containsKey(jobId)) {
- LOGGER.log(Level.WARNING, "Job " + jobId + "has been created before");
+ LOGGER.log(Level.WARN, "Job " + jobId + "has been created before");
increment(doubleCreated, jobId);
}
created.put(jobId, spec);
@@ -63,11 +64,11 @@ public class TestJobLifecycleListener implements IJobLifecycleListener {
@Override
public void notifyJobStart(JobId jobId) throws HyracksException {
if (!created.containsKey(jobId)) {
- LOGGER.log(Level.WARNING, "Job " + jobId + "has not been created");
+ LOGGER.log(Level.WARN, "Job " + jobId + "has not been created");
startWithoutCreate.add(jobId);
}
if (started.contains(jobId)) {
- LOGGER.log(Level.WARNING, "Job " + jobId + "has been started before");
+ LOGGER.log(Level.WARN, "Job " + jobId + "has been started before");
increment(doubleStarted, jobId);
}
started.add(jobId);
@@ -76,43 +77,43 @@ public class TestJobLifecycleListener implements IJobLifecycleListener {
@Override
public void notifyJobFinish(JobId jobId, JobStatus jobStatus, List<Exception> exceptions) throws HyracksException {
if (!started.contains(jobId)) {
- LOGGER.log(Level.WARNING, "Job " + jobId + "has not been started");
+ LOGGER.log(Level.WARN, "Job " + jobId + "has not been started");
finishWithoutStart.add(jobId);
}
if (finished.contains(jobId)) {
// TODO: job finish should be called once only when it has really completed
// throw new HyracksDataException("Job " + jobId + "has been finished before");
- LOGGER.log(Level.WARNING, "Dangerous: Duplicate Job: " + jobId + " has finished with status: " + jobStatus);
+ LOGGER.log(Level.WARN, "Dangerous: Duplicate Job: " + jobId + " has finished with status: " + jobStatus);
increment(doubleFinished, jobId);
}
finished.add(jobId);
}
public void check() throws Exception {
- LOGGER.log(Level.WARNING, "Checking all created jobs have started");
+ LOGGER.log(Level.WARN, "Checking all created jobs have started");
for (JobId jobId : created.keySet()) {
if (!started.contains(jobId)) {
- LOGGER.log(Level.WARNING, "JobId " + jobId + " has been created but never started");
+ LOGGER.log(Level.WARN, "JobId " + jobId + " has been created but never started");
}
}
- LOGGER.log(Level.WARNING, "Checking all started jobs have terminated");
+ LOGGER.log(Level.WARN, "Checking all started jobs have terminated");
for (JobId jobId : started) {
if (!finished.contains(jobId)) {
- LOGGER.log(Level.WARNING, "JobId " + jobId + " has started but not finished");
+ LOGGER.log(Level.WARN, "JobId " + jobId + " has started but not finished");
}
}
- LOGGER.log(Level.WARNING, "Checking multiple creates");
+ LOGGER.log(Level.WARN, "Checking multiple creates");
for (Entry<JobId, Integer> entry : doubleCreated.entrySet()) {
- LOGGER.log(Level.WARNING, "job " + entry.getKey() + " has been created " + entry.getValue() + " times");
+ LOGGER.log(Level.WARN, "job " + entry.getKey() + " has been created " + entry.getValue() + " times");
}
- LOGGER.log(Level.WARNING, "Checking multiple starts");
+ LOGGER.log(Level.WARN, "Checking multiple starts");
for (Entry<JobId, Integer> entry : doubleStarted.entrySet()) {
- LOGGER.log(Level.WARNING, "job " + entry.getKey() + " has been started " + entry.getValue() + " times");
+ LOGGER.log(Level.WARN, "job " + entry.getKey() + " has been started " + entry.getValue() + " times");
}
- LOGGER.log(Level.WARNING, "Checking multiple finishes");
+ LOGGER.log(Level.WARN, "Checking multiple finishes");
for (Entry<JobId, Integer> entry : doubleFinished.entrySet()) {
- LOGGER.log(Level.WARNING, "job " + entry.getKey() + " has been finished " + entry.getValue() + " times");
+ LOGGER.log(Level.WARN, "job " + entry.getKey() + " has been finished " + entry.getValue() + " times");
}
- LOGGER.log(Level.WARNING, "Done checking!");
+ LOGGER.log(Level.WARN, "Done checking!");
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/WaitingOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/WaitingOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/WaitingOperatorDescriptor.java
index 6503b7b..799520c 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/WaitingOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/WaitingOperatorDescriptor.java
@@ -18,8 +18,6 @@
*/
package org.apache.hyracks.tests.integration;
-import java.util.logging.Logger;
-
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.hyracks.api.comm.IFrameWriter;
import org.apache.hyracks.api.context.IHyracksTaskContext;
@@ -35,7 +33,6 @@ class WaitingOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor
public static final MutableBoolean CONTINUE_RUNNING = new MutableBoolean(false);
private static final long serialVersionUID = 1L;
- private static Logger LOGGER = Logger.getLogger(WaitingOperatorDescriptor.class.getName());
public WaitingOperatorDescriptor(IOperatorDescriptorRegistry spec, int inputArity, int outputArity) {
super(spec, inputArity, outputArity);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java
index d704671..10d6947 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/ExceptionOnCreatePushRuntimeOperatorDescriptor.java
@@ -20,8 +20,6 @@ package org.apache.hyracks.tests.util;
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IFrameWriter;
import org.apache.hyracks.api.context.IHyracksTaskContext;
@@ -31,10 +29,13 @@ import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.job.IOperatorDescriptorRegistry;
import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ExceptionOnCreatePushRuntimeOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor {
private static final long serialVersionUID = 1L;
- private static Logger LOGGER = Logger.getLogger(ExceptionOnCreatePushRuntimeOperatorDescriptor.class.getName());
+ private static Logger LOGGER = LogManager.getLogger();
private static AtomicInteger createPushRuntime = new AtomicInteger();
private static AtomicInteger initializeCounter = new AtomicInteger();
private static AtomicInteger openCloseCounter = new AtomicInteger();
@@ -130,10 +131,10 @@ public class ExceptionOnCreatePushRuntimeOperatorDescriptor extends AbstractSing
public static boolean succeed() {
boolean success = openCloseCounter.get() == 0 && createPushRuntime.get() == 0 && initializeCounter.get() == 0;
if (!success) {
- LOGGER.log(Level.SEVERE, "Failure:");
- LOGGER.log(Level.SEVERE, "CreatePushRuntime:" + createPushRuntime.get());
- LOGGER.log(Level.SEVERE, "InitializeCounter:" + initializeCounter.get());
- LOGGER.log(Level.SEVERE, "OpenCloseCounter:" + openCloseCounter.get());
+ LOGGER.log(Level.ERROR, "Failure:");
+ LOGGER.log(Level.ERROR, "CreatePushRuntime:" + createPushRuntime.get());
+ LOGGER.log(Level.ERROR, "InitializeCounter:" + initializeCounter.get());
+ LOGGER.log(Level.ERROR, "OpenCloseCounter:" + openCloseCounter.get());
}
return success;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
index 478650f..1514c8e 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
@@ -209,5 +209,9 @@
<artifactId>hyracks-control-cc</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java
index c1083c9..6f4d8b1 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java
@@ -19,8 +19,9 @@
package org.apache.hyracks.examples.shutdown.test;
import java.net.ServerSocket;
-import java.util.logging.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -30,7 +31,7 @@ import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.apache.hyracks.ipc.exceptions.IPCException;
public class ClusterShutdownIT {
- private static Logger LOGGER = Logger.getLogger(ClusterShutdownIT.class.getName());
+ private static Logger LOGGER = LogManager.getLogger();
@Rule
public ExpectedException closeTwice = ExpectedException.none();
@Test
@@ -49,7 +50,7 @@ public class ClusterShutdownIT {
s = new ServerSocket(1099);
//and we should be able to bind to this too
} catch (Exception e) {
- LOGGER.severe(e.getMessage());
+ LOGGER.error(e.getMessage());
throw e;
} finally {
s.close();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
index 678645c..e1c91c1 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
@@ -410,5 +410,9 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java
index 4937a15..c9bf547 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
-import java.util.logging.Logger;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.mapred.InputSplit;
@@ -33,10 +32,12 @@ import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.topology.ClusterTopology;
import org.apache.hyracks.hdfs.api.INcCollection;
import org.apache.hyracks.hdfs.api.INcCollectionBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
@SuppressWarnings("deprecation")
public class RackAwareNcCollectionBuilder implements INcCollectionBuilder {
- private static final Logger LOGGER = Logger.getLogger(RackAwareNcCollectionBuilder.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private ClusterTopology topology;
public RackAwareNcCollectionBuilder(ClusterTopology topology) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
index f9b68bc..615f827 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.PriorityQueue;
import java.util.Random;
-import java.util.logging.Logger;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.mapred.InputSplit;
@@ -42,13 +41,15 @@ import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.topology.ClusterTopology;
import org.apache.hyracks.hdfs.api.INcCollection;
import org.apache.hyracks.hdfs.api.INcCollectionBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* The scheduler conduct data-local scheduling for data reading on HDFS. This
* class works for Hadoop old API.
*/
public class Scheduler {
- private static final Logger LOGGER = Logger.getLogger(Scheduler.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
/** a list of NCs */
private String[] NCs;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/pom.xml b/hyracks-fullstack/hyracks/hyracks-http/pom.xml
index 7d0ddb2..099c429 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-http/pom.xml
@@ -75,5 +75,9 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
index d0637ca..21653c8 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
@@ -24,13 +24,14 @@ import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTR
import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServlet;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
import org.apache.hyracks.http.server.utils.HttpUtil;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
@@ -40,7 +41,7 @@ import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpResponseStatus;
public abstract class AbstractServlet implements IServlet {
- private static final Logger LOGGER = Logger.getLogger(AbstractServlet.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
static {
@@ -99,11 +100,11 @@ public abstract class AbstractServlet implements IServlet {
notAllowed(method, response);
}
} catch (Exception e) {
- LOGGER.log(Level.WARNING, "Unhandled exception", e);
+ LOGGER.log(Level.WARN, "Unhandled exception", e);
response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
} catch (Throwable th) { //NOSONAR Just logging and then throwing again
try {
- LOGGER.log(Level.WARNING, "Unhandled throwable", th);
+ LOGGER.log(Level.WARN, "Unhandled throwable", th);
} catch (Throwable loggingFailure) {// NOSONAR... swallow logging failure
}
throw th;
@@ -116,7 +117,7 @@ public abstract class AbstractServlet implements IServlet {
if (message != null) {
response.writer().println(message);
}
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("sendError: status=" + status + ", message=" + message);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
index e4f0777..d5f81e5 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java
@@ -20,8 +20,10 @@ package org.apache.hyracks.http.server;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -31,7 +33,7 @@ import io.netty.util.internal.OutOfDirectMemoryError;
public class ChunkedNettyOutputStream extends OutputStream {
- private static final Logger LOGGER = Logger.getLogger(ChunkedNettyOutputStream.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final ChannelHandlerContext ctx;
private final ChunkedResponse response;
private ByteBuf buffer;
@@ -132,7 +134,7 @@ public class ChunkedNettyOutputStream extends OutputStream {
wait();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- LOGGER.log(Level.WARNING, "Interupted while waiting for channel to be writable", e);
+ LOGGER.log(Level.WARN, "Interupted while waiting for channel to be writable", e);
throw new IOException(e);
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java
index d8e9a9a..323a463 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java
@@ -21,10 +21,11 @@ package org.apache.hyracks.http.server;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServletResponse;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelFuture;
@@ -60,7 +61,7 @@ import io.netty.handler.codec.http.LastHttpContent;
*/
public class ChunkedResponse implements IServletResponse {
- private static final Logger LOGGER = Logger.getLogger(ChunkedResponse.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final ChannelHandlerContext ctx;
private final ChunkedNettyOutputStream outputStream;
private final PrintWriter writer;
@@ -112,7 +113,7 @@ public class ChunkedResponse implements IServletResponse {
} else {
// There was an error
if (headerSent) {
- LOGGER.log(Level.WARNING, "Error after header write of chunked response");
+ LOGGER.log(Level.WARN, "Error after header write of chunked response");
if (error != null) {
error.release();
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java
index 13ed1fc..cb6ad0d 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java
@@ -18,8 +18,9 @@
*/
package org.apache.hyracks.http.server;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
@@ -40,7 +41,7 @@ import io.netty.util.internal.PromiseNotificationUtil;
*/
public class HttpRequestCapacityController extends ChannelInboundHandlerAdapter {
- private static final Logger LOGGER = Logger.getLogger(HttpRequestCapacityController.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final HttpServer server;
private boolean overloaded = false;
@@ -74,7 +75,7 @@ public class HttpRequestCapacityController extends ChannelInboundHandlerAdapter
ctx.writeAndFlush(ctx.alloc().buffer(0), promise);
} catch (Throwable th) {//NOSONAR
try {
- LOGGER.log(Level.SEVERE, "Failure during request rejection", th);
+ LOGGER.log(Level.ERROR, "Failure during request rejection", th);
} catch (Throwable loggingFailure) {//NOSONAR
}
PromiseNotificationUtil.tryFailure(promise, th, null);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestHandler.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestHandler.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestHandler.java
index 555f845..bf8e629 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestHandler.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestHandler.java
@@ -20,12 +20,13 @@ package org.apache.hyracks.http.server;
import java.io.IOException;
import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServlet;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
@@ -34,7 +35,7 @@ import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpUtil;
public class HttpRequestHandler implements Callable<Void> {
- private static final Logger LOGGER = Logger.getLogger(HttpRequestHandler.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final ChannelHandlerContext ctx;
private final IServlet servlet;
private final IServletRequest request;
@@ -57,7 +58,7 @@ public class HttpRequestHandler implements Callable<Void> {
lastContentFuture.addListener(ChannelFutureListener.CLOSE);
}
} catch (Throwable th) { //NOSONAR
- LOGGER.log(Level.SEVERE, "Failure handling HTTP Request", th);
+ LOGGER.log(Level.ERROR, "Failure handling HTTP Request", th);
ctx.close();
} finally {
request.getHttpRequest().release();
@@ -69,7 +70,7 @@ public class HttpRequestHandler implements Callable<Void> {
try {
servlet.handle(request, response);
} catch (Exception e) {
- LOGGER.log(Level.WARNING, "Failure during handling of an IServletRequest", e);
+ LOGGER.log(Level.WARN, "Failure during handling of an IServletRequest", e);
response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
} finally {
response.close();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
index 71ddbc0..19436ab 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
@@ -27,11 +27,12 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServlet;
import org.apache.hyracks.util.ThreadDumpUtil;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator;
@@ -54,7 +55,7 @@ public class HttpServer {
protected static final int RECEIVE_BUFFER_SIZE = 4096;
protected static final int DEFAULT_NUM_EXECUTOR_THREADS = 16;
protected static final int DEFAULT_REQUEST_QUEUE_SIZE = 256;
- private static final Logger LOGGER = Logger.getLogger(HttpServer.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final int FAILED = -1;
private static final int STOPPED = 0;
private static final int STARTING = 1;
@@ -111,7 +112,7 @@ public class HttpServer {
doStart();
setStarted();
} catch (Throwable e) { // NOSONAR
- LOGGER.log(Level.SEVERE, "Failure starting an Http Server with port: " + port, e);
+ LOGGER.log(Level.ERROR, "Failure starting an Http Server with port: " + port, e);
setFailed(e);
throw e;
}
@@ -128,7 +129,7 @@ public class HttpServer {
doStop();
setStopped();
} catch (Throwable e) { // NOSONAR
- LOGGER.log(Level.SEVERE, "Failure stopping an Http Server", e);
+ LOGGER.log(Level.ERROR, "Failure stopping an Http Server", e);
setFailed(e);
throw e;
}
@@ -229,15 +230,15 @@ public class HttpServer {
// wait 30s for interrupted requests to unwind
executor.awaitTermination(30, TimeUnit.SECONDS);
if (!executor.isTerminated()) {
- if (LOGGER.isLoggable(Level.INFO)) {
- LOGGER.log(Level.SEVERE,
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.log(Level.ERROR,
"Failed to shutdown http server executor; thread dump: " + ThreadDumpUtil.takeDumpString());
} else {
- LOGGER.log(Level.SEVERE, "Failed to shutdown http server executor");
+ LOGGER.log(Level.ERROR, "Failed to shutdown http server executor");
}
}
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Error while shutting down http server executor", e);
+ LOGGER.log(Level.ERROR, "Error while shutting down http server executor", e);
}
channel.close();
channel.closeFuture().sync();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
index 0984ebf..9290cdf 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
@@ -20,12 +20,13 @@ package org.apache.hyracks.http.server;
import java.io.IOException;
import java.util.concurrent.RejectedExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServlet;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.server.utils.HttpUtil;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
@@ -37,7 +38,7 @@ import io.netty.handler.codec.http.HttpVersion;
public class HttpServerHandler<T extends HttpServer> extends SimpleChannelInboundHandler<Object> {
- private static final Logger LOGGER = Logger.getLogger(HttpServerHandler.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected final T server;
protected final int chunkSize;
protected HttpRequestHandler handler;
@@ -71,7 +72,7 @@ public class HttpServerHandler<T extends HttpServer> extends SimpleChannelInboun
submit(ctx, servlet, request);
}
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Failure Submitting HTTP Request", e);
+ LOGGER.log(Level.ERROR, "Failure Submitting HTTP Request", e);
respond(ctx, request.protocolVersion(), new HttpResponseStatus(500, e.getMessage()));
}
}
@@ -86,7 +87,7 @@ public class HttpServerHandler<T extends HttpServer> extends SimpleChannelInboun
try {
servletRequest = HttpUtil.toServletRequest(request);
} catch (IllegalArgumentException e) {
- LOGGER.log(Level.WARNING, "Failure Decoding Request", e);
+ LOGGER.log(Level.WARN, "Failure Decoding Request", e);
respond(ctx, request.protocolVersion(), HttpResponseStatus.BAD_REQUEST);
return;
}
@@ -98,21 +99,21 @@ public class HttpServerHandler<T extends HttpServer> extends SimpleChannelInboun
try {
server.getExecutor(handler).submit(handler);
} catch (RejectedExecutionException e) { // NOSONAR
- LOGGER.log(Level.WARNING, "Request rejected by server executor service. " + e.getMessage());
+ LOGGER.log(Level.WARN, "Request rejected by server executor service. " + e.getMessage());
handler.reject();
}
}
protected void handleServletNotFound(ChannelHandlerContext ctx, FullHttpRequest request) {
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("No servlet for " + request.uri());
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("No servlet for " + request.uri());
}
respond(ctx, request.protocolVersion(), HttpResponseStatus.NOT_FOUND);
}
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
- LOGGER.log(Level.SEVERE, "Failure handling HTTP Request", cause);
+ LOGGER.log(Level.ERROR, "Failure handling HTTP Request", cause);
ctx.close();
}
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/StaticResourceServlet.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/StaticResourceServlet.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/StaticResourceServlet.java
index b21e533..e2b3237 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/StaticResourceServlet.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/StaticResourceServlet.java
@@ -22,19 +22,20 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.io.IOUtils;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
import org.apache.hyracks.http.server.utils.HttpUtil;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.handler.codec.http.HttpResponseStatus;
public class StaticResourceServlet extends AbstractServlet {
- private static final Logger LOGGER = Logger.getLogger(StaticResourceServlet.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
public StaticResourceServlet(ConcurrentMap<String, Object> ctx, String[] paths) {
super(ctx, paths);
@@ -63,7 +64,7 @@ public class StaticResourceServlet extends AbstractServlet {
try {
IOUtils.copy(is, out);
} catch (IOException e) {
- LOGGER.log(Level.WARNING, "Failure copying response", e);
+ LOGGER.log(Level.WARN, "Failure copying response", e);
} finally {
if (out != null) {
IOUtils.closeQuietly(out);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
index 99e334c..ffa4d4b 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
@@ -28,14 +28,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import java.util.regex.Pattern;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
import org.apache.hyracks.http.server.BaseRequest;
import org.apache.hyracks.http.server.FormUrlEncodedRequest;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.handler.codec.http.FullHttpRequest;
@@ -45,7 +46,7 @@ import io.netty.util.internal.PlatformDependent;
public class HttpUtil {
- private static final Logger LOGGER = Logger.getLogger(HttpUtil.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final Pattern PARENT_DIR = Pattern.compile("/[^./]+/\\.\\./");
private static long maxMemUsage = 0L;
@@ -207,7 +208,7 @@ public class HttpUtil {
report.append('\n');
report.append('\n');
} catch (Throwable th) { // NOSONAR
- LOGGER.log(Level.WARNING, "Failed to access PlatformDependent.DIRECT_MEMORY_COUNTER", th);
+ LOGGER.log(Level.WARN, "Failed to access PlatformDependent.DIRECT_MEMORY_COUNTER", th);
return;
}
report.append("--------------- PooledByteBufAllocator.DEFAULT ----------------");
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
index 5bd2e38..e6aedb9 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
@@ -19,18 +19,19 @@
package org.apache.hyracks.http.servlet;
import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
import org.apache.hyracks.http.server.AbstractServlet;
import org.apache.hyracks.http.server.utils.HttpUtil;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import io.netty.handler.codec.http.HttpResponseStatus;
public class ChattyServlet extends AbstractServlet {
- private static final Logger LOGGER = Logger.getLogger(ChattyServlet.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private byte[] bytes;
public ChattyServlet(ConcurrentMap<String, Object> ctx, String[] paths) {
@@ -53,7 +54,7 @@ public class ChattyServlet extends AbstractServlet {
protected void get(IServletRequest request, IServletResponse response) throws Exception {
response.setStatus(HttpResponseStatus.OK);
HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_HTML, HttpUtil.Encoding.UTF8);
- LOGGER.log(Level.WARNING, "I am about to flood you... and a single buffer is " + bytes.length + " bytes");
+ LOGGER.log(Level.WARN, "I am about to flood you... and a single buffer is " + bytes.length + " bytes");
for (int i = 0; i < 100; i++) {
response.outputStream().write(bytes);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml b/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
index b49e99e..5ef436f 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/pom.xml
@@ -49,5 +49,9 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
index 36cf2fd..7688974 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java
@@ -39,13 +39,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class IPCConnectionManager {
- private static final Logger LOGGER = Logger.getLogger(IPCConnectionManager.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
// TODO(mblow): the next two could be config parameters
private static final int INITIAL_RETRY_DELAY_MILLIS = 100;
@@ -120,7 +121,7 @@ public class IPCConnectionManager {
return handle;
}
if (maxRetries < 0 || retries++ < maxRetries) {
- LOGGER.warning("Connection to " + remoteAddress + " failed; retrying" + (maxRetries <= 0 ? ""
+ LOGGER.warn("Connection to " + remoteAddress + " failed; retrying" + (maxRetries <= 0 ? ""
: " (retry attempt " + retries + " of " + maxRetries + ") after " + delay + "ms"));
Thread.sleep(delay);
delay = Math.min(MAX_RETRY_DELAY_MILLIS, (int) (delay * 1.5));
@@ -136,8 +137,8 @@ public class IPCConnectionManager {
}
synchronized void write(Message msg) {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Enqueued message: " + msg);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Enqueued message: " + msg);
}
sendList.add(msg);
networkThread.selector.wakeup();
@@ -209,8 +210,8 @@ public class IPCConnectionManager {
int failingLoops = 0;
while (!stopped) {
try {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Starting Select");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Starting Select");
}
int n = selector.select();
collectOutstandingWork();
@@ -238,9 +239,7 @@ public class IPCConnectionManager {
int len = workingSendList.size();
for (int i = 0; i < len; ++i) {
Message msg = workingSendList.get(i);
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Processing send of message: " + msg);
- }
+ LOGGER.debug(() -> "Processing send of message: " + msg);
IPCHandle handle = msg.getIPCHandle();
if (handle.getState() != HandleState.CLOSED) {
if (!handle.full()) {
@@ -340,7 +339,7 @@ public class IPCConnectionManager {
failingLoops = 0;
} catch (Exception e) {
int sleepSecs = (int)Math.pow(2, Math.min(11, failingLoops++));
- LOGGER.log(Level.SEVERE, "Exception processing message; sleeping " + sleepSecs
+ LOGGER.log(Level.ERROR, "Exception processing message; sleeping " + sleepSecs
+ " seconds", e);
try {
Thread.sleep(TimeUnit.SECONDS.toMillis(sleepSecs));
@@ -364,10 +363,10 @@ public class IPCConnectionManager {
try {
connectFinished = channel.finishConnect();
if (!connectFinished) {
- LOGGER.log(Level.WARNING, "Channel connect did not finish");
+ LOGGER.log(Level.WARN, "Channel connect did not finish");
}
} catch (IOException e) {
- LOGGER.log(Level.WARNING, "Exception finishing channel connect", e);
+ LOGGER.log(Level.WARN, "Exception finishing channel connect", e);
}
return connectFinished;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
index f7e0af1..8e38651 100644
--- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
+++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
@@ -21,17 +21,18 @@ package org.apache.hyracks.ipc.impl;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.ipc.api.IIPCHandle;
import org.apache.hyracks.ipc.api.IIPCI;
import org.apache.hyracks.ipc.api.IPCPerformanceCounters;
import org.apache.hyracks.ipc.api.IPayloadSerializerDeserializer;
import org.apache.hyracks.ipc.exceptions.IPCException;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class IPCSystem {
- private static final Logger LOGGER = Logger.getLogger(IPCSystem.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final IPCConnectionManager cMgr;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-net/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml b/hyracks-fullstack/hyracks/hyracks-net/pom.xml
index 8da177e..66edba6 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml
@@ -51,5 +51,9 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/AbstractChannelWriteInterface.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/AbstractChannelWriteInterface.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/AbstractChannelWriteInterface.java
index e50ffd2..0b548f6 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/AbstractChannelWriteInterface.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/AbstractChannelWriteInterface.java
@@ -21,17 +21,17 @@ package org.apache.hyracks.net.protocols.muxdemux;
import java.nio.ByteBuffer;
import java.util.ArrayDeque;
import java.util.Queue;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IBufferAcceptor;
import org.apache.hyracks.api.comm.IChannelControlBlock;
import org.apache.hyracks.api.comm.IChannelWriteInterface;
import org.apache.hyracks.api.comm.ICloseableBufferAcceptor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public abstract class AbstractChannelWriteInterface implements IChannelWriteInterface {
- private static final Logger LOGGER = Logger.getLogger(AbstractChannelWriteInterface.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected final IChannelControlBlock ccb;
protected final Queue<ByteBuffer> wiFullQueue;
protected boolean channelWritabilityState;
@@ -129,8 +129,8 @@ public abstract class AbstractChannelWriteInterface implements IChannelWriteInte
public void close() {
synchronized (ccb) {
if (eos) {
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Received duplicate close() on channel: " + ccb.getChannelId());
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Received duplicate close() on channel: " + ccb.getChannelId());
}
return;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
index 49bb292..bd42560 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
@@ -20,15 +20,15 @@ package org.apache.hyracks.net.protocols.muxdemux;
import java.util.Arrays;
import java.util.BitSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IChannelInterfaceFactory;
import org.apache.hyracks.api.comm.MuxDemuxCommand;
import org.apache.hyracks.api.exceptions.NetException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class ChannelSet {
- private static final Logger LOGGER = Logger.getLogger(ChannelSet.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final int INITIAL_SIZE = 16;
@@ -82,8 +82,8 @@ public class ChannelSet {
ChannelControlBlock ccb = ccbArray[i];
if (ccb != null) {
if (ccb.completelyClosed()) {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Cleaning free channel: " + ccb);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Cleaning free channel: " + ccb);
}
freeChannel(ccb);
}
@@ -218,8 +218,8 @@ public class ChannelSet {
if (ccbArray[idx] != null) {
assert ccbArray[idx].completelyClosed() : ccbArray[idx].toString();
if (ccbArray[idx].completelyClosed()) {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Cleaning free channel: " + ccbArray[idx]);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Cleaning free channel: " + ccbArray[idx]);
}
freeChannel(ccbArray[idx]);
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
index 418ebd7..17b70a8 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelWriteInterface.java
@@ -18,18 +18,17 @@
*/
package org.apache.hyracks.net.protocols.muxdemux;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.apache.hyracks.api.comm.IBufferFactory;
import org.apache.hyracks.api.comm.IChannelControlBlock;
import org.apache.hyracks.api.comm.IConnectionWriterState;
import org.apache.hyracks.api.comm.MuxDemuxCommand;
import org.apache.hyracks.api.exceptions.NetException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class FullFrameChannelWriteInterface extends AbstractChannelWriteInterface {
- private static final Logger LOGGER = Logger.getLogger(FullFrameChannelWriteInterface.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
FullFrameChannelWriteInterface(IChannelControlBlock ccb) {
super(ccb);
@@ -77,8 +76,8 @@ public class FullFrameChannelWriteInterface extends AbstractChannelWriteInterfac
}
channelWritabilityState = true;
if (eos) {
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Received duplicate close() on channel: " + channelId);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Received duplicate close() on channel: " + channelId);
}
return;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java
index 8c54c65..81636de 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java
@@ -23,8 +23,6 @@ import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import java.util.BitSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.comm.IChannelControlBlock;
import org.apache.hyracks.api.comm.IChannelInterfaceFactory;
@@ -33,6 +31,8 @@ import org.apache.hyracks.api.comm.MuxDemuxCommand;
import org.apache.hyracks.api.exceptions.NetException;
import org.apache.hyracks.net.protocols.tcp.ITCPConnectionEventListener;
import org.apache.hyracks.net.protocols.tcp.TCPConnection;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* A {@link MultiplexedConnection} can be used by clients to create multiple "channels"
@@ -41,7 +41,7 @@ import org.apache.hyracks.net.protocols.tcp.TCPConnection;
* @author vinayakb
*/
public class MultiplexedConnection implements ITCPConnectionEventListener {
- private static final Logger LOGGER = Logger.getLogger(MultiplexedConnection.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final int MAX_CHUNKS_READ_PER_CYCLE = 4;
@@ -366,8 +366,8 @@ public class MultiplexedConnection implements ITCPConnectionEventListener {
}
readerState.readBuffer.flip();
readerState.command.read(readerState.readBuffer);
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Received command: " + readerState.command);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Received command: " + readerState.command);
}
ChannelControlBlock ccb = null;
switch (readerState.command.getCommandType()) {
@@ -409,8 +409,8 @@ public class MultiplexedConnection implements ITCPConnectionEventListener {
muxDemux.getChannelOpenListener().channelOpened(ccb);
}
}
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Applied command: " + readerState.command + " on " + ccb);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Applied command: " + readerState.command + " on " + ccb);
}
}
if (readerState.pendingReadSize > 0) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-server/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
index 8ad94e3..42a29fe 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
@@ -176,5 +176,9 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksServerProcess.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksServerProcess.java b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksServerProcess.java
index c387ceb..0c7be89 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksServerProcess.java
+++ b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksServerProcess.java
@@ -25,11 +25,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
abstract class HyracksServerProcess {
- private static final Logger LOGGER = Logger.getLogger(HyracksServerProcess.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
protected Process process;
protected File configFile = null;
@@ -39,14 +40,14 @@ abstract class HyracksServerProcess {
public void start() throws IOException {
String[] cmd = buildCommand();
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Starting command: " + Arrays.toString(cmd));
}
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.redirectErrorStream(true);
if (logFile != null) {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Logging to: " + logFile.getCanonicalPath());
}
logFile.getParentFile().mkdirs();
@@ -55,7 +56,7 @@ abstract class HyracksServerProcess {
}
pb.redirectOutput(ProcessBuilder.Redirect.appendTo(logFile));
} else {
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("Logfile not set, subprocess will output to stdout");
}
}
@@ -67,8 +68,8 @@ abstract class HyracksServerProcess {
process.destroy();
try {
boolean success = process.waitFor(30, TimeUnit.SECONDS);
- if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Killing unresponsive NC Process");
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Killing unresponsive NC Process");
}
if (!success) {
process.destroyForcibly();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/server/test/NCServiceIT.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/server/test/NCServiceIT.java b/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/server/test/NCServiceIT.java
index c3bdb2a..d12c05b 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/server/test/NCServiceIT.java
+++ b/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/server/test/NCServiceIT.java
@@ -22,13 +22,11 @@ import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.util.Iterator;
-import java.util.logging.Logger;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import junit.framework.Assert;
-import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
@@ -37,6 +35,8 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.apache.hyracks.server.process.HyracksVirtualCluster;
import org.apache.hyracks.util.file.FileUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -47,7 +47,7 @@ public class NCServiceIT {
private static final String LOG_DIR = FileUtil.joinPath(TARGET_DIR, "failsafe-reports");
private static final String RESOURCE_DIR = FileUtil.joinPath(TARGET_DIR, "test-classes", "NCServiceIT");
private static final String APP_HOME = FileUtil.joinPath(TARGET_DIR, "appassembler");
- private static final Logger LOGGER = Logger.getLogger(NCServiceIT.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static HyracksVirtualCluster cluster = null;
@@ -139,7 +139,7 @@ public class NCServiceIT {
setUp();
} catch (Exception e) {
e.printStackTrace();
- LOGGER.severe("TEST CASE(S) FAILED");
+ LOGGER.error("TEST CASE(S) FAILED");
} finally {
tearDown();
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
index 2b3f3cb..1d52034 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
@@ -90,5 +90,9 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>