http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java index 836f266..942f181 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/IntroduceGroupByForSubplanRule.java @@ -201,7 +201,7 @@ public class IntroduceGroupByForSubplanRule implements IAlgebraicRewriteRule { //retain the intersection pkVars.retainAll(producedVars); } - AlgebricksConfig.ALGEBRICKS_LOGGER.fine("Found FD for introducing group-by: " + pkVars); + AlgebricksConfig.ALGEBRICKS_LOGGER.debug("Found FD for introducing group-by: " + pkVars); Mutable<ILogicalOperator> rightRef = join.getInputs().get(1); LogicalVariable testForNull = null;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java index 652f062..6efda52 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java @@ -107,13 +107,13 @@ public class JoinUtils { LogicalPropertiesVisitor.computeLogicalPropertiesDFS(opBuild, context); ILogicalPropertiesVector v = context.getLogicalPropertiesVector(opBuild); AlgebricksConfig.ALGEBRICKS_LOGGER - .fine("// HybridHashJoin inner branch -- Logical properties for " + opBuild + ": " + v + "\n"); + .debug("// HybridHashJoin inner branch -- Logical properties for " + opBuild + ": " + v + "\n"); if (v != null) { int size2 = v.getMaxOutputFrames(); HybridHashJoinPOperator hhj = (HybridHashJoinPOperator) op.getPhysicalOperator(); if (size2 > 0 && size2 * hhj.getFudgeFactor() <= hhj.getMemSizeInFrames()) { AlgebricksConfig.ALGEBRICKS_LOGGER - .fine("// HybridHashJoin inner branch " + opBuild + " fits in memory\n"); + .debug("// HybridHashJoin inner branch " + opBuild + " fits in memory\n"); // maintains the local properties on the probe side op.setPhysicalOperator( new InMemoryHashJoinPOperator(hhj.getKind(), hhj.getPartitioningType(), hhj.getKeysLeftBranch(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/algebricks/algebricks-tests/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml index 357b50c..a835569 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml @@ -181,5 +181,9 @@ <groupId>commons-io</groupId> <artifactId>commons-io</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-api/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml b/hyracks-fullstack/hyracks/hyracks-api/pom.xml index 5e3ccf7..71bf5fc 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml @@ -104,5 +104,9 @@ <groupId>commons-io</groupId> <artifactId>commons-io</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-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java index 0b2cc9b..cd6362f 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java @@ -24,8 +24,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.dataflow.ActivityId; @@ -35,9 +33,11 @@ import org.apache.hyracks.api.job.ActivityCluster; import org.apache.hyracks.api.job.ActivityClusterGraph; import org.apache.hyracks.api.job.ActivityClusterId; import org.apache.hyracks.api.job.JobActivityGraph; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ActivityClusterGraphBuilder { - private static final Logger LOGGER = Logger.getLogger(ActivityClusterGraphBuilder.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public ActivityClusterGraphBuilder() { } @@ -146,8 +146,8 @@ public class ActivityClusterGraphBuilder { } acg.addActivityClusters(acList); - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine(acg.toJSON().asText()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(acg.toJSON().asText()); } return acg; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java index 084626e..64bcf6e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobActivityGraphBuilder.java @@ -24,8 +24,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.dataflow.ActivityId; @@ -37,9 +35,11 @@ import org.apache.hyracks.api.dataflow.IOperatorDescriptor; import org.apache.hyracks.api.job.JobActivityGraph; import org.apache.hyracks.api.job.JobFlag; import org.apache.hyracks.api.job.JobSpecification; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JobActivityGraphBuilder implements IActivityGraphBuilder { - private static final Logger LOGGER = Logger.getLogger(JobActivityGraphBuilder.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final Map<ActivityId, IOperatorDescriptor> activityOperatorMap; @@ -71,8 +71,8 @@ public class JobActivityGraphBuilder implements IActivityGraphBuilder { @Override public void addSourceEdge(int operatorInputIndex, IActivity task, int taskInputIndex) { - if (LOGGER.isLoggable(Level.FINEST)) { - LOGGER.finest("Adding source edge: " + task.getActivityId() + ":" + operatorInputIndex + " -> " + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Adding source edge: " + task.getActivityId() + ":" + operatorInputIndex + " -> " + task.getActivityId() + ":" + taskInputIndex); } IOperatorDescriptor op = activityOperatorMap.get(task.getActivityId()); @@ -83,8 +83,8 @@ public class JobActivityGraphBuilder implements IActivityGraphBuilder { @Override public void addTargetEdge(int operatorOutputIndex, IActivity task, int taskOutputIndex) { - if (LOGGER.isLoggable(Level.FINEST)) { - LOGGER.finest("Adding target edge: " + task.getActivityId() + ":" + operatorOutputIndex + " -> " + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Adding target edge: " + task.getActivityId() + ":" + operatorOutputIndex + " -> " + task.getActivityId() + ":" + taskOutputIndex); } IOperatorDescriptor op = activityOperatorMap.get(task.getActivityId()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java index ddcaab3..80ff77c 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IApplicationConfig.java @@ -22,7 +22,8 @@ import java.net.URL; import java.util.List; import java.util.Set; import java.util.function.Predicate; -import java.util.logging.Level; + +import org.apache.logging.log4j.Level; /** * Accessor for the data contained in the global application configuration file. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksDataException.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksDataException.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksDataException.java index 7ae7cbf..58b4b27 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksDataException.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/HyracksDataException.java @@ -20,10 +20,11 @@ package org.apache.hyracks.api.exceptions; import java.io.Serializable; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.util.ErrorMessageUtil; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * The main execution time exception type for runtime errors in a hyracks environment @@ -31,7 +32,7 @@ import org.apache.hyracks.api.util.ErrorMessageUtil; public class HyracksDataException extends HyracksException { private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(HyracksDataException.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public static HyracksDataException create(Throwable cause) { if (cause instanceof HyracksDataException || cause == null) { @@ -41,7 +42,7 @@ public class HyracksDataException extends HyracksException { throw (Error) cause; } else if (cause instanceof InterruptedException && !Thread.currentThread().isInterrupted()) { // TODO(mblow): why not force interrupt on current thread? - LOGGER.log(Level.WARNING, + LOGGER.log(Level.WARN, "Wrapping an InterruptedException in HyracksDataException and current thread is not interrupted", cause); } @@ -66,7 +67,7 @@ public class HyracksDataException extends HyracksException { throw (Error) th; } else if (th instanceof InterruptedException && !Thread.currentThread().isInterrupted()) { // TODO(mblow): why not force interrupt on current thread? - LOGGER.log(Level.WARNING, "Suppressing an InterruptedException in a HyracksDataException and current " + LOGGER.log(Level.WARN, "Suppressing an InterruptedException in a HyracksDataException and current " + "thread is not interrupted", th); } root.addSuppressed(th); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/lifecycle/LifeCycleComponentManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/lifecycle/LifeCycleComponentManager.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/lifecycle/LifeCycleComponentManager.java index f5b4417..6d5d246 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/lifecycle/LifeCycleComponentManager.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/lifecycle/LifeCycleComponentManager.java @@ -25,10 +25,11 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.util.ExitUtil; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class LifeCycleComponentManager implements ILifeCycleComponentManager { @@ -36,7 +37,7 @@ public class LifeCycleComponentManager implements ILifeCycleComponentManager { public static final String DUMP_PATH_KEY = "DUMP_PATH"; } - private static final Logger LOGGER = Logger.getLogger(LifeCycleComponentManager.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final List<ILifeCycleComponent> components; private boolean stopInitiated; @@ -54,7 +55,7 @@ public class LifeCycleComponentManager implements ILifeCycleComponentManager { @Override public void uncaughtException(Thread t, Throwable e) { try { - LOGGER.log(Level.SEVERE, "Uncaught Exception from thread " + t.getName() + ". Calling shutdown hook", e); + LOGGER.log(Level.ERROR, "Uncaught Exception from thread " + t.getName() + ". Calling shutdown hook", e); } finally { ExitUtil.exit(99); } @@ -79,7 +80,7 @@ public class LifeCycleComponentManager implements ILifeCycleComponentManager { return; } stopped = true; - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Attempting to stop " + this); } if (stopInitiated) { @@ -87,14 +88,14 @@ public class LifeCycleComponentManager implements ILifeCycleComponentManager { return; } if (!configured) { - if (LOGGER.isLoggable(Level.SEVERE)) { - LOGGER.severe("Lifecycle management not configured " + this); + if (LOGGER.isErrorEnabled()) { + LOGGER.error("Lifecycle management not configured " + this); } return; } stopInitiated = true; - LOGGER.severe("Stopping instance"); + LOGGER.error("Stopping instance"); FileOutputStream componentDumpStream = null; String componentDumpPath = null; @@ -110,13 +111,13 @@ public class LifeCycleComponentManager implements ILifeCycleComponentManager { } componentDumpStream = new FileOutputStream(f); } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Stopping component instance " + component.getClass().getName() + "; dump state: " + dumpState + ", dump path: " + componentDumpPath); } component.stop(dumpState, componentDumpStream); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Exception in stopping component " + component.getClass().getName(), e); + LOGGER.log(Level.ERROR, "Exception in stopping component " + component.getClass().getName(), e); } finally { if (componentDumpStream != null) { componentDumpStream.close(); @@ -132,11 +133,11 @@ public class LifeCycleComponentManager implements ILifeCycleComponentManager { dumpPath = configuration.get(Config.DUMP_PATH_KEY); if (dumpPath == null) { dumpPath = System.getProperty("user.dir"); - if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.warning("dump path not configured. Using current directory " + dumpPath); + if (LOGGER.isWarnEnabled()) { + LOGGER.warn("dump path not configured. Using current directory " + dumpPath); } } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("LifecycleComponentManager configured " + this); } configured = true; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java index e9491f3..26ce2c1 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/ErrorMessageUtil.java @@ -26,12 +26,14 @@ import java.util.Formatter; import java.util.HashMap; import java.util.Map; import java.util.Properties; -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; public class ErrorMessageUtil { - private static final Logger LOGGER = Logger.getLogger(ErrorMessageUtil.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public static final String NONE = ""; private static final String COMMA = ","; @@ -99,7 +101,7 @@ public class ErrorMessageUtil { return fmt.out().toString(); } catch (Exception e) { // Do not throw further exceptions during exception processing. - LOGGER.log(Level.WARNING, e.getLocalizedMessage(), e); + LOGGER.log(Level.WARN, e.getLocalizedMessage(), e); return e.getMessage(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java index 21965c7..9eb3b8e 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/SingleThreadEventProcessor.java @@ -19,15 +19,16 @@ package org.apache.hyracks.api.util; import java.util.concurrent.LinkedBlockingQueue; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.exceptions.ErrorCode; import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public abstract class SingleThreadEventProcessor<T> implements Runnable { - private static final Logger LOGGER = Logger.getLogger(SingleThreadEventProcessor.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final String name; private final LinkedBlockingQueue<T> eventInbox; private volatile Thread executorThread; @@ -50,10 +51,10 @@ public abstract class SingleThreadEventProcessor<T> implements Runnable { } catch (InterruptedException e) { Thread.currentThread().interrupt(); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error handling an event", e); + LOGGER.log(Level.ERROR, "Error handling an event", e); } } - LOGGER.log(Level.WARNING, "Stopped " + Thread.currentThread().getName()); + LOGGER.log(Level.WARN, "Stopped " + Thread.currentThread().getName()); } protected abstract void handle(T event) throws Exception; //NOSONAR @@ -71,7 +72,7 @@ public abstract class SingleThreadEventProcessor<T> implements Runnable { int attempt = 0; while (executorThread.isAlive()) { attempt++; - LOGGER.log(Level.WARNING, + LOGGER.log(Level.WARN, "Failed to stop event processor after " + attempt + " attempts. Interrupted exception swallowed?"); if (attempt == 10) { throw HyracksDataException.create(ErrorCode.FAILED_TO_SHUTDOWN_EVENT_PROCESSOR, name); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-client/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-client/pom.xml b/hyracks-fullstack/hyracks/hyracks-client/pom.xml index 81c9963..16039ab 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-client/pom.xml @@ -109,5 +109,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-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java index 31fd379..fc5708d 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java +++ b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java @@ -25,8 +25,6 @@ import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.channels.IInputChannel; import org.apache.hyracks.api.comm.FrameHelper; @@ -45,10 +43,13 @@ import org.apache.hyracks.api.exceptions.HyracksException; import org.apache.hyracks.api.job.JobId; import org.apache.hyracks.client.net.ClientNetworkManager; import org.apache.hyracks.comm.channels.DatasetNetworkInputChannel; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; // TODO(madhusudancs): Should this implementation be moved to org.apache.hyracks.client? public class HyracksDatasetReader implements IHyracksDatasetReader { - private static final Logger LOGGER = Logger.getLogger(HyracksDatasetReader.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final IHyracksDatasetDirectoryServiceConnection datasetDirectoryServiceConnection; @@ -94,10 +95,10 @@ public class HyracksDatasetReader implements IHyracksDatasetReader { return datasetDirectoryServiceConnection.getDatasetResultStatus(jobId, resultSetId); } catch (HyracksDataException e) { if (e.getErrorCode() != ErrorCode.NO_RESULT_SET) { - LOGGER.log(Level.WARNING, "Exception retrieving result set for job " + jobId, e); + LOGGER.log(Level.WARN, "Exception retrieving result set for job " + jobId, e); } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception retrieving result set for job " + jobId, e); + LOGGER.log(Level.WARN, "Exception retrieving result set for job " + jobId, e); } return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-comm/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-comm/pom.xml b/hyracks-fullstack/hyracks/hyracks-comm/pom.xml index 3ca803c..db36094 100644 --- a/hyracks-fullstack/hyracks/hyracks-comm/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-comm/pom.xml @@ -51,5 +51,9 @@ <artifactId>hyracks-net</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-comm/src/main/java/org/apache/hyracks/comm/channels/DatasetNetworkInputChannel.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/DatasetNetworkInputChannel.java b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/DatasetNetworkInputChannel.java index e3c6f4a..c334389 100644 --- a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/DatasetNetworkInputChannel.java +++ b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/DatasetNetworkInputChannel.java @@ -22,8 +22,6 @@ import java.net.SocketAddress; 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.channels.IInputChannel; import org.apache.hyracks.api.channels.IInputChannelMonitor; @@ -34,9 +32,11 @@ import org.apache.hyracks.api.context.IHyracksCommonContext; import org.apache.hyracks.api.dataset.ResultSetId; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobId; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class DatasetNetworkInputChannel implements IInputChannel { - private static final Logger LOGGER = Logger.getLogger(DatasetNetworkInputChannel.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); static final int INITIAL_MESSAGE_SIZE = 20; @@ -114,8 +114,8 @@ public class DatasetNetworkInputChannel implements IInputChannel { writeBuffer.putLong(resultSetId.getId()); writeBuffer.putInt(partition); writeBuffer.flip(); - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Sending partition request for JobId: " + jobId + " partition: " + partition + " on channel: " + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Sending partition request for JobId: " + jobId + " partition: " + partition + " on channel: " + ccb); } ccb.getWriteInterface().getFullBufferAcceptor().accept(writeBuffer); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java index a846da3..0a9342a 100644 --- a/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java +++ b/hyracks-fullstack/hyracks/hyracks-comm/src/main/java/org/apache/hyracks/comm/channels/NetworkInputChannel.java @@ -22,8 +22,6 @@ import java.net.SocketAddress; 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.channels.IInputChannel; import org.apache.hyracks.api.channels.IInputChannelMonitor; @@ -33,9 +31,11 @@ import org.apache.hyracks.api.comm.ICloseableBufferAcceptor; import org.apache.hyracks.api.context.IHyracksCommonContext; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.partitions.PartitionId; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class NetworkInputChannel implements IInputChannel { - private static final Logger LOGGER = Logger.getLogger(NetworkInputChannel.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); static final int INITIAL_MESSAGE_SIZE = 20; @@ -107,8 +107,8 @@ public class NetworkInputChannel implements IInputChannel { writeBuffer.putInt(partitionId.getSenderIndex()); writeBuffer.putInt(partitionId.getReceiverIndex()); writeBuffer.flip(); - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Sending partition request: " + partitionId + " on channel: " + ccb); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Sending partition request: " + partitionId + " on channel: " + ccb); } ccb.getWriteInterface().getFullBufferAcceptor().accept(writeBuffer); ccb.getWriteInterface().getFullBufferAcceptor().close(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index fce37dd..763c5ac 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -93,5 +93,13 @@ <version>2.0.2-beta</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java index b2478a3..a7a64cc 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/BaseCCApplication.java @@ -19,8 +19,6 @@ package org.apache.hyracks.control.cc; import java.util.Arrays; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.application.ICCApplication; import org.apache.hyracks.api.application.IServiceContext; @@ -31,9 +29,13 @@ import org.apache.hyracks.api.job.resource.IJobCapacityController; import org.apache.hyracks.control.common.controllers.CCConfig; import org.apache.hyracks.control.common.controllers.ControllerConfig; import org.apache.hyracks.control.common.controllers.NCConfig; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; public class BaseCCApplication implements ICCApplication { - private static final Logger LOGGER = Logger.getLogger(BaseCCApplication.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public static final ICCApplication INSTANCE = new BaseCCApplication(); private IConfigManager configManager; @@ -83,7 +85,7 @@ public class BaseCCApplication implements ICCApplication { protected void configureLoggingLevel(Level level) { LOGGER.info("Setting Hyracks log level to " + level); - Logger.getLogger("org.apache.hyracks").setLevel(level); + Configurator.setLevel("org.apache.hyracks", level); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java index a78f6bb..a188594 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java @@ -22,17 +22,18 @@ import static org.apache.hyracks.control.common.controllers.CCConfig.Option.APP_ import java.io.IOException; import java.util.Arrays; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.application.ICCApplication; import org.apache.hyracks.control.common.config.ConfigManager; import org.apache.hyracks.control.common.config.ConfigUtils; import org.apache.hyracks.control.common.controllers.CCConfig; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.kohsuke.args4j.CmdLineException; public class CCDriver { - private static final Logger LOGGER = Logger.getLogger(CCDriver.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private CCDriver() { } @@ -49,10 +50,10 @@ public class CCDriver { Thread.sleep(100000); } } catch (CmdLineException e) { - LOGGER.log(Level.FINE, "Exception parsing command line: " + Arrays.toString(args), e); + LOGGER.log(Level.DEBUG, "Exception parsing command line: " + Arrays.toString(args), e); System.exit(2); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Exiting CCDriver due to exception", e); + LOGGER.log(Level.ERROR, "Exiting CCDriver due to exception", e); System.exit(1); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java index 4e3c0f5..ccf798a 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java @@ -18,9 +18,6 @@ */ package org.apache.hyracks.control.cc; -import java.util.logging.Level; -import java.util.logging.Logger; - import org.apache.hyracks.api.client.HyracksClientInterfaceFunctions; import org.apache.hyracks.api.comm.NetworkAddress; import org.apache.hyracks.api.dataset.DatasetJobRecord.Status; @@ -48,10 +45,13 @@ import org.apache.hyracks.control.common.work.IPCResponder; import org.apache.hyracks.ipc.api.IIPCHandle; import org.apache.hyracks.ipc.api.IIPCI; 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; class ClientInterfaceIPCI implements IIPCI { - private static final Logger LOGGER = Logger.getLogger(ClientInterfaceIPCI.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ClusterControllerService ccs; private final JobIdFactory jobIdFactory; private final DeployedJobSpecIdFactory deployedJobSpecIdFactory; @@ -70,7 +70,7 @@ class ClientInterfaceIPCI implements IIPCI { try { handle.send(mid, ccs.getClusterControllerInfo(), null); } catch (IPCException e) { - LOGGER.log(Level.WARNING, "Error sending response to GET_CLUSTER_CONTROLLER_INFO request", e); + LOGGER.log(Level.WARN, "Error sending response to GET_CLUSTER_CONTROLLER_INFO request", e); } break; case GET_JOB_STATUS: @@ -146,7 +146,7 @@ class ClientInterfaceIPCI implements IIPCI { try { handle.send(mid, ccs.getCCContext().getClusterTopology(), null); } catch (IPCException e) { - LOGGER.log(Level.WARNING, "Error sending response to GET_CLUSTER_TOPOLOGY request", e); + LOGGER.log(Level.WARN, "Error sending response to GET_CLUSTER_TOPOLOGY request", e); } break; case CLI_DEPLOY_BINARY: @@ -184,7 +184,7 @@ class ClientInterfaceIPCI implements IIPCI { try { handle.send(mid, null, new IllegalArgumentException("Unknown function " + fn.getFunctionId())); } catch (IPCException e) { - LOGGER.log(Level.WARNING, "Error sending Unknown function response", e); + LOGGER.log(Level.WARN, "Error sending Unknown function response", e); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java index 5a53fce..ad0cb61 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java @@ -19,7 +19,6 @@ package org.apache.hyracks.control.cc; import java.util.Map; -import java.util.logging.Logger; import org.apache.hyracks.api.client.NodeControllerInfo; import org.apache.hyracks.control.cc.work.ApplicationMessageWork; @@ -48,9 +47,11 @@ import org.apache.hyracks.control.common.work.IPCResponder; import org.apache.hyracks.control.common.work.IResultCallback; import org.apache.hyracks.ipc.api.IIPCHandle; import org.apache.hyracks.ipc.api.IIPCI; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; class ClusterControllerIPCI implements IIPCI { - private static final Logger LOGGER = Logger.getLogger(ClusterControllerIPCI.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ClusterControllerService ccs; ClusterControllerIPCI(ClusterControllerService ccs) { @@ -161,7 +162,7 @@ class ClusterControllerIPCI implements IIPCI { .schedule(new NotifyThreadDumpResponse(ccs, tdrf.getRequestId(), tdrf.getThreadDumpJSON())); break; default: - LOGGER.warning("Unknown function: " + fn.getFunctionId()); + LOGGER.warn("Unknown function: " + fn.getFunctionId()); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java index fd53c25..360975d 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java @@ -36,8 +36,6 @@ import java.util.TimerTask; import java.util.TreeMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.application.ICCApplication; @@ -87,10 +85,13 @@ import org.apache.hyracks.ipc.api.IIPCI; import org.apache.hyracks.ipc.impl.IPCSystem; import org.apache.hyracks.ipc.impl.JavaSerializationBasedPayloadSerializerDeserializer; import org.apache.hyracks.util.ExitUtil; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.xml.sax.InputSource; public class ClusterControllerService implements IControllerService { - private static final Logger LOGGER = Logger.getLogger(ClusterControllerService.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final CCConfig ccConfig; @@ -243,8 +244,8 @@ public class ClusterControllerService implements IControllerService { jobManager = (IJobManager) jobManagerConstructor.newInstance(ccConfig, this, jobCapacityController); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { - if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.log(Level.WARNING, "class " + ccConfig.getJobManagerClass() + " could not be used: ", e); + if (LOGGER.isWarnEnabled()) { + LOGGER.log(Level.WARN, "class " + ccConfig.getJobManagerClass() + " could not be used: ", e); } // Falls back to the default implementation if the user-provided class name is not valid. jobManager = new JobManager(ccConfig, this, jobCapacityController); @@ -278,12 +279,12 @@ public class ClusterControllerService implements IControllerService { @Override public void notifyNodeJoin(String nodeId, Map<IOption, Object> ncConfiguration) throws HyracksException { // no-op, we don't care - LOGGER.log(Level.WARNING, "Getting notified that node: " + nodeId + " has joined. and we don't care"); + LOGGER.log(Level.WARN, "Getting notified that node: " + nodeId + " has joined. and we don't care"); } @Override public void notifyNodeFailure(Collection<String> deadNodeIds) throws HyracksException { - LOGGER.log(Level.WARNING, "Getting notified that nodes: " + deadNodeIds + " has failed"); + LOGGER.log(Level.WARN, "Getting notified that nodes: " + deadNodeIds + " has failed"); } }); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java index 4928564..590a0f3 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java @@ -30,7 +30,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.client.NodeControllerInfo; @@ -49,9 +48,11 @@ import org.apache.hyracks.control.common.controllers.CCConfig; import org.apache.hyracks.control.common.ipc.CCNCFunctions.AbortCCJobsFunction; import org.apache.hyracks.ipc.api.IIPCHandle; import org.apache.hyracks.ipc.exceptions.IPCException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class NodeManager implements INodeManager { - private static final Logger LOGGER = Logger.getLogger(NodeManager.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ClusterControllerService ccs; private final CCConfig ccConfig; @@ -89,13 +90,13 @@ public class NodeManager implements INodeManager { @Override public void addNode(String nodeId, NodeControllerState ncState) throws HyracksException { - LOGGER.warning("addNode(" + nodeId + ") called"); + LOGGER.warn("addNode(" + nodeId + ") called"); if (nodeId == null || ncState == null) { throw HyracksException.create(ErrorCode.INVALID_INPUT_PARAMETER); } // Updates the node registry. if (nodeRegistry.containsKey(nodeId)) { - LOGGER.warning( + LOGGER.warn( "Node with name " + nodeId + " has already registered; failing the node then re-registering."); removeDeadNode(nodeId); } else { @@ -106,7 +107,7 @@ public class NodeManager implements INodeManager { throw HyracksDataException.create(e); } } - LOGGER.warning("adding node to registry"); + LOGGER.warn("adding node to registry"); nodeRegistry.put(nodeId, ncState); // Updates the IP address to node names map. try { @@ -119,7 +120,7 @@ public class NodeManager implements INodeManager { throw e; } // Updates the cluster capacity. - LOGGER.warning("updating cluster capacity"); + LOGGER.warn("updating cluster capacity"); resourceManager.update(nodeId, ncState.getCapacity()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java index 1cb07d0..a57baf5 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java @@ -26,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.comm.NetworkAddress; import org.apache.hyracks.api.dataset.DatasetDirectoryRecord; @@ -44,6 +42,9 @@ import org.apache.hyracks.api.job.JobSpecification; import org.apache.hyracks.api.job.JobStatus; import org.apache.hyracks.control.common.dataset.ResultStateSweeper; import org.apache.hyracks.control.common.work.IResultCallback; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * TODO(madhusudancs): The potential perils of this global dataset directory service implementation is that, the jobs @@ -54,7 +55,7 @@ import org.apache.hyracks.control.common.work.IResultCallback; */ public class DatasetDirectoryService implements IDatasetDirectoryService { - private static final Logger LOGGER = Logger.getLogger(DatasetDirectoryService.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final long resultTTL; @@ -75,7 +76,7 @@ public class DatasetDirectoryService implements IDatasetDirectoryService { @Override public synchronized void notifyJobCreation(JobId jobId, JobSpecification spec) throws HyracksException { - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info(getClass().getSimpleName() + " notified of new job " + jobId); } if (jobResultLocations.get(jobId) != null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java index 04166a4..ea37cdd 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/ActivityClusterPlanner.java @@ -27,8 +27,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.constraints.expressions.LValueConstraintExpression; @@ -51,9 +49,11 @@ import org.apache.hyracks.control.cc.job.JobRun; import org.apache.hyracks.control.cc.job.Task; import org.apache.hyracks.control.cc.job.TaskCluster; import org.apache.hyracks.control.cc.job.TaskClusterId; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; class ActivityClusterPlanner { - private static final Logger LOGGER = Logger.getLogger(ActivityClusterPlanner.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final JobExecutor executor; @@ -74,7 +74,7 @@ class ActivityClusterPlanner { TaskCluster[] taskClusters = computeTaskClusters(ac, jobRun, activityPlanMap); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Plan for " + ac); LOGGER.info("Built " + taskClusters.length + " Task Clusters"); for (TaskCluster tc : taskClusters) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java index ab7a3db..ac06344 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java @@ -28,8 +28,6 @@ import java.util.Map; import java.util.PriorityQueue; import java.util.Random; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.comm.NetworkAddress; import org.apache.hyracks.api.constraints.Constraint; @@ -68,9 +66,12 @@ import org.apache.hyracks.control.common.job.PartitionState; import org.apache.hyracks.control.common.job.TaskAttemptDescriptor; import org.apache.hyracks.control.common.work.IResultCallback; import org.apache.hyracks.control.common.work.NoOpCallback; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JobExecutor { - private static final Logger LOGGER = Logger.getLogger(JobExecutor.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ClusterControllerService ccs; @@ -196,7 +197,7 @@ public class JobExecutor { Set<TaskCluster> taskClusterRoots = new HashSet<>(); findRunnableTaskClusterRoots(taskClusterRoots, jobRun.getActivityClusterGraph().getActivityClusterMap().values()); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.log(Level.INFO, "Runnable TC roots: " + taskClusterRoots + ", inProgressTaskClusters: " + inProgressTaskClusters); } @@ -226,19 +227,19 @@ public class JobExecutor { queue.add(new RankedRunnableTaskCluster(priority, tc)); } } - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Ranked TCs: " + queue); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Ranked TCs: " + queue); } Map<String, List<TaskAttemptDescriptor>> taskAttemptMap = new HashMap<>(); for (RankedRunnableTaskCluster rrtc : queue) { TaskCluster tc = rrtc.getTaskCluster(); - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Found runnable TC: " + tc); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Found runnable TC: " + tc); List<TaskClusterAttempt> attempts = tc.getAttempts(); - LOGGER.fine("Attempts so far:" + attempts.size()); + LOGGER.debug("Attempts so far:" + attempts.size()); for (TaskClusterAttempt tcAttempt : attempts) { - LOGGER.fine("Status: " + tcAttempt.getStatus()); + LOGGER.debug("Status: " + tcAttempt.getStatus()); } } assignTaskLocations(tc, taskAttemptMap); @@ -258,16 +259,16 @@ public class JobExecutor { * Runnability(Non-schedulable TaskCluster) = {NOT_RUNNABLE, _} */ private Runnability assignRunnabilityRank(TaskCluster goal, Map<TaskCluster, Runnability> runnabilityMap) { - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Computing runnability: " + goal); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Computing runnability: " + goal); } if (runnabilityMap.containsKey(goal)) { return runnabilityMap.get(goal); } TaskClusterAttempt lastAttempt = findLastTaskClusterAttempt(goal); if (lastAttempt != null) { - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Last Attempt Status: " + lastAttempt.getStatus()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Last Attempt Status: " + lastAttempt.getStatus()); } if (lastAttempt.getStatus() == TaskClusterAttempt.TaskClusterStatus.COMPLETED) { Runnability runnability = new Runnability(Runnability.Tag.COMPLETED, Integer.MIN_VALUE); @@ -284,15 +285,15 @@ public class JobExecutor { PartitionMatchMaker pmm = jobRun.getPartitionMatchMaker(); Runnability aggregateRunnability = new Runnability(Runnability.Tag.RUNNABLE, 0); for (PartitionId pid : goal.getRequiredPartitions()) { - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Inspecting required partition: " + pid); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Inspecting required partition: " + pid); } Runnability runnability; ConnectorDescriptorId cdId = pid.getConnectorDescriptorId(); IConnectorPolicy cPolicy = connectorPolicyMap.get(cdId); PartitionState maxState = pmm.getMaximumAvailableState(pid); - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Policy: " + cPolicy + " maxState: " + maxState); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Policy: " + cPolicy + " maxState: " + maxState); } if (PartitionState.COMMITTED.equals(maxState)) { runnability = new Runnability(Runnability.Tag.RUNNABLE, 0); @@ -328,8 +329,8 @@ public class JobExecutor { // already not runnable -- cannot get better. bail. break; } - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("aggregateRunnability: " + aggregateRunnability); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("aggregateRunnability: " + aggregateRunnability); } } runnabilityMap.put(goal, aggregateRunnability); @@ -511,8 +512,8 @@ public class JobExecutor { if (node != null) { node.getActiveJobIds().add(jobRun.getJobId()); boolean changed = jobRun.getParticipatingNodeIds().add(nodeId); - if (LOGGER.isLoggable(Level.FINE)) { - LOGGER.fine("Starting: " + taskDescriptors + " at " + entry.getKey()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Starting: " + taskDescriptors + " at " + entry.getKey()); } byte[] jagBytes = changed ? acgBytes : null; node.getNodeController().startTasks(deploymentId, jobId, jagBytes, taskDescriptors, @@ -537,14 +538,14 @@ public class JobExecutor { private void abortTaskCluster(TaskClusterAttempt tcAttempt, TaskClusterAttempt.TaskClusterStatus failedOrAbortedStatus) { - LOGGER.fine("Aborting task cluster: " + tcAttempt.getAttempt()); + LOGGER.debug("Aborting task cluster: " + tcAttempt.getAttempt()); Set<TaskAttemptId> abortTaskIds = new HashSet<>(); Map<String, List<TaskAttemptId>> abortTaskAttemptMap = new HashMap<>(); for (TaskAttempt ta : tcAttempt.getTaskAttempts().values()) { TaskAttemptId taId = ta.getTaskAttemptId(); TaskAttempt.TaskStatus status = ta.getStatus(); abortTaskIds.add(taId); - LOGGER.fine("Checking " + taId + ": " + ta.getStatus()); + LOGGER.debug("Checking " + taId + ": " + ta.getStatus()); if (status == TaskAttempt.TaskStatus.RUNNING || status == TaskAttempt.TaskStatus.COMPLETED) { ta.setStatus(TaskAttempt.TaskStatus.ABORTED, null); ta.setEndTime(System.currentTimeMillis()); @@ -564,13 +565,13 @@ public class JobExecutor { abortTaskAttemptMap.forEach((key, abortTaskAttempts) -> { final NodeControllerState node = nodeManager.getNodeControllerState(key); if (node != null) { - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Aborting: " + abortTaskAttempts + " at " + key); } try { node.getNodeController().abortTasks(jobId, abortTaskAttempts); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage(), e); + LOGGER.log(Level.ERROR, e.getMessage(), e); } } }); @@ -648,13 +649,13 @@ public class JobExecutor { TaskCluster tc = ta.getTask().getTaskCluster(); TaskClusterAttempt lastAttempt = findLastTaskClusterAttempt(tc); if (lastAttempt == null || taId.getAttempt() != lastAttempt.getAttempt()) { - LOGGER.warning(() -> "Ignoring task complete notification: " + taId + " -- Current last attempt = " + LOGGER.warn(() -> "Ignoring task complete notification: " + taId + " -- Current last attempt = " + lastAttempt); return; } TaskAttempt.TaskStatus taStatus = ta.getStatus(); if (taStatus != TaskAttempt.TaskStatus.RUNNING) { - LOGGER.warning(() -> "Spurious task complete notification: " + taId + " Current state = " + taStatus); + LOGGER.warn(() -> "Spurious task complete notification: " + taId + " Current state = " + taStatus); return; } ta.setStatus(TaskAttempt.TaskStatus.COMPLETED, null); @@ -666,7 +667,7 @@ public class JobExecutor { startRunnableActivityClusters(); } } catch (Exception e) { - LOGGER.log(Level.SEVERE, e, () -> "Unexpected failure. Aborting job " + jobRun.getJobId()); + LOGGER.error(() -> "Unexpected failure. Aborting job " + jobRun.getJobId(), e); abortJob(Collections.singletonList(e), NoOpCallback.INSTANCE); } } @@ -701,7 +702,7 @@ public class JobExecutor { LOGGER.log(Level.INFO, "We will try to start runnable activity clusters of " + ta.getTaskAttemptId()); startRunnableActivityClusters(); } else { - LOGGER.warning( + LOGGER.warn( "Ignoring task failure notification: " + taId + " -- Current last attempt = " + lastAttempt); } } catch (Exception e) { @@ -729,7 +730,7 @@ public class JobExecutor { ta -> HyracksException.create(ErrorCode.NODE_FAILED, ta.getNodeId())); startRunnableActivityClusters(); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e, () -> "Unexpected failure. Aborting job " + jobRun.getJobId()); + LOGGER.error(() -> "Unexpected failure. Aborting job " + jobRun.getJobId(), e); abortJob(Collections.singletonList(e), NoOpCallback.INSTANCE); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java index 7f1100b..ffb72c9 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java @@ -29,8 +29,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.exceptions.ErrorCode; import org.apache.hyracks.api.exceptions.HyracksException; @@ -48,6 +46,9 @@ import org.apache.hyracks.control.cc.scheduler.IJobQueue; import org.apache.hyracks.control.common.controllers.CCConfig; import org.apache.hyracks.control.common.work.IResultCallback; import org.apache.hyracks.control.common.work.NoOpCallback; +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.node.ObjectNode; @@ -55,7 +56,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; // Job manager manages all jobs that haven been submitted to the cluster. public class JobManager implements IJobManager { - private static final Logger LOGGER = Logger.getLogger(JobManager.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ClusterControllerService ccs; private final Map<JobId, JobRun> activeRunMap; @@ -74,8 +75,8 @@ public class JobManager implements IJobManager { jobQueue = (IJobQueue) jobQueueConstructor.newInstance(this, this.jobCapacityController); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { - if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.log(Level.WARNING, "class " + ccConfig.getJobQueueClass() + " could not be used: ", e); + if (LOGGER.isWarnEnabled()) { + LOGGER.log(Level.WARN, "class " + ccConfig.getJobQueueClass() + " could not be used: ", e); } // Falls back to the default implementation if the user-provided class name is not valid. jobQueue = new FIFOJobQueue(this, jobCapacityController); @@ -158,7 +159,7 @@ public class JobManager implements IJobManager { return; } if (run.getPendingStatus() != null) { - LOGGER.warning("Ignoring duplicate cleanup for JobRun with id: " + jobId); + LOGGER.warn("Ignoring duplicate cleanup for JobRun with id: " + jobId); return; } Set<String> targetNodes = run.getParticipatingNodeIds(); @@ -179,7 +180,7 @@ public class JobManager implements IJobManager { ncs.getNodeController().cleanUpJoblet(jobId, status); } } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage(), e); + LOGGER.log(Level.ERROR, e.getMessage(), e); if (caughtException == null) { caughtException = HyracksException.create(e); } else { @@ -212,7 +213,7 @@ public class JobManager implements IJobManager { try { serviceCtx.notifyJobFinish(jobId, run.getPendingStatus(), run.getPendingExceptions()); } catch (HyracksException e) { - LOGGER.log(Level.SEVERE, e.getMessage(), e); + LOGGER.log(Level.ERROR, e.getMessage(), e); caughtException = e; } } @@ -229,7 +230,7 @@ public class JobManager implements IJobManager { try { ccs.getJobLogFile().log(createJobLogObject(run)); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage(), e); + LOGGER.log(Level.ERROR, e.getMessage(), e); if (caughtException == null) { caughtException = new HyracksException(e); } else { @@ -320,7 +321,7 @@ public class JobManager implements IJobManager { try { run.getExecutor().startJob(); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Aborting " + run.getJobId() + " due to failure during job start", e); + LOGGER.log(Level.ERROR, "Aborting " + run.getJobId() + " due to failure during job start", e); final List<Exception> exceptions = Collections.singletonList(e); // fail the job then abort it run.setStatus(JobStatus.FAILURE, exceptions); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java index 3a5e3be..c5e51a6 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/partitions/PartitionMatchMaker.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.dataflow.TaskAttemptId; @@ -33,9 +32,11 @@ import org.apache.hyracks.api.partitions.PartitionId; import org.apache.hyracks.control.common.job.PartitionDescriptor; import org.apache.hyracks.control.common.job.PartitionRequest; import org.apache.hyracks.control.common.job.PartitionState; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class PartitionMatchMaker { - private static final Logger LOGGER = Logger.getLogger(PartitionMatchMaker.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final Map<PartitionId, List<PartitionDescriptor>> partitionDescriptors; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/FIFOJobQueue.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/FIFOJobQueue.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/FIFOJobQueue.java index da13091..2a6bdae 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/FIFOJobQueue.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/FIFOJobQueue.java @@ -26,8 +26,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.api.exceptions.ErrorCode; import org.apache.hyracks.api.exceptions.HyracksException; @@ -39,6 +37,9 @@ import org.apache.hyracks.control.cc.job.IJobManager; import org.apache.hyracks.control.cc.job.JobRun; import org.apache.hyracks.util.annotations.NotThreadSafe; import org.apache.hyracks.util.annotations.ThreadSafetyGuaranteedBy; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * An implementation of IJobQueue that gives more priority to jobs that are submitted earlier. @@ -47,7 +48,7 @@ import org.apache.hyracks.util.annotations.ThreadSafetyGuaranteedBy; @ThreadSafetyGuaranteedBy("JobManager") public class FIFOJobQueue implements IJobQueue { - private static final Logger LOGGER = Logger.getLogger(FIFOJobQueue.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final Map<JobId, JobRun> jobListMap = new LinkedHashMap<>(); private final IJobManager jobManager; @@ -104,7 +105,7 @@ public class FIFOJobQueue implements IJobQueue { // Fails the job. jobManager.prepareComplete(run, JobStatus.FAILURE_BEFORE_EXECUTION, exceptions); } catch (HyracksException e) { - LOGGER.log(Level.SEVERE, e.getMessage(), e); + LOGGER.log(Level.ERROR, e.getMessage(), e); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java index 2b0382b..f400978 100755 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/ApplicationInstallationHandler.java @@ -24,8 +24,6 @@ import java.io.FileOutputStream; 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.FileUtils; import org.apache.commons.io.IOUtils; @@ -35,6 +33,9 @@ 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.buffer.ByteBuf; import io.netty.handler.codec.http.HttpMethod; @@ -42,7 +43,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; public class ApplicationInstallationHandler extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(ApplicationInstallationHandler.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private ClusterControllerService ccs; @@ -81,7 +82,7 @@ public class ApplicationInstallationHandler extends AbstractServlet { response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED); } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Unhandled exception ", e); + LOGGER.log(Level.WARN, "Unhandled exception ", e); response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestHandler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestHandler.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestHandler.java index b39915f..479004d 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestHandler.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/util/JSONOutputRequestHandler.java @@ -20,13 +20,14 @@ package org.apache.hyracks.control.cc.web.util; import java.io.IOException; 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 com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -35,7 +36,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; public class JSONOutputRequestHandler extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(JSONOutputRequestHandler.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final IJSONOutputFunction fn; public JSONOutputRequestHandler(ConcurrentMap<String, Object> ctx, String[] paths, IJSONOutputFunction fn) { @@ -63,7 +64,7 @@ public class JSONOutputRequestHandler extends AbstractServlet { try { return fn.invoke(host, servletPath, parts); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception invoking " + fn.getClass().getName(), e); + LOGGER.log(Level.WARN, "Exception invoking " + fn.getClass().getName(), e); response.setStatus(HttpResponseStatus.BAD_REQUEST); response.writer().print(e.getMessage()); } @@ -77,7 +78,7 @@ public class JSONOutputRequestHandler extends AbstractServlet { om.writer().writeValue(response.writer(), result); response.setStatus(HttpResponseStatus.OK); } catch (IOException e) { - LOGGER.log(Level.WARNING, "Exception delivering result in " + getClass().getName(), e); + LOGGER.log(Level.WARN, "Exception delivering result in " + getClass().getName(), e); response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); response.writer().print(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java index 341834c..392046d 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ApplicationMessageWork.java @@ -18,21 +18,21 @@ */ package org.apache.hyracks.control.cc.work; -import java.util.logging.Level; -import java.util.logging.Logger; - import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.deployment.DeploymentId; import org.apache.hyracks.api.messages.IMessage; import org.apache.hyracks.control.cc.ClusterControllerService; import org.apache.hyracks.control.common.deployment.DeploymentUtils; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author rico */ public class ApplicationMessageWork extends AbstractHeartbeatWork { - private static final Logger LOGGER = Logger.getLogger(ApplicationMessageWork.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private byte[] message; private DeploymentId deploymentId; private String nodeId; @@ -63,7 +63,7 @@ public class ApplicationMessageWork extends AbstractHeartbeatWork { } }); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Error in stats reporting", e); + LOGGER.log(Level.WARN, "Error in stats reporting", e); throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java index 613efad..b44c58c 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java @@ -20,8 +20,6 @@ package org.apache.hyracks.control.cc.work; import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.control.cc.ClusterControllerService; import org.apache.hyracks.control.cc.NodeControllerState; @@ -31,9 +29,12 @@ import org.apache.hyracks.control.common.work.IResultCallback; import org.apache.hyracks.control.common.work.SynchronizableWork; import org.apache.hyracks.ipc.exceptions.IPCException; import org.apache.hyracks.util.ExitUtil; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ClusterShutdownWork extends SynchronizableWork { - private static final Logger LOGGER = Logger.getLogger(ClusterShutdownWork.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ClusterControllerService ccs; private final boolean terminateNCService; @@ -76,7 +77,7 @@ public class ClusterShutdownWork extends SynchronizableWork { /* * best effort - just exit, user will have to kill misbehaving NCs */ - LOGGER.severe("Clean shutdown of NCs timed out- giving up; unresponsive nodes: " + + LOGGER.error("Clean shutdown of NCs timed out- giving up; unresponsive nodes: " + shutdownStatus.getRemainingNodes()); } callback.setValue(cleanShutdown); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java index 407f9cd..e1b59e1 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetThreadDumpWork.java @@ -22,8 +22,6 @@ package org.apache.hyracks.control.cc.work; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hyracks.control.cc.ClusterControllerService; import org.apache.hyracks.control.cc.NodeControllerState; @@ -31,9 +29,12 @@ import org.apache.hyracks.control.cc.cluster.INodeManager; import org.apache.hyracks.util.ThreadDumpUtil; import org.apache.hyracks.control.common.work.AbstractWork; import org.apache.hyracks.control.common.work.IResultCallback; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class GetThreadDumpWork extends AbstractWork { - private static final Logger LOGGER = Logger.getLogger(GetThreadDumpWork.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public static final int TIMEOUT_SECS = 60; private final ClusterControllerService ccs; @@ -56,7 +57,7 @@ public class GetThreadDumpWork extends AbstractWork { try { callback.setValue(ThreadDumpUtil.takeDumpJSONString()); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception taking CC thread dump", e); + LOGGER.log(Level.WARN, "Exception taking CC thread dump", e); callback.setException(e); } } else { @@ -82,7 +83,7 @@ public class GetThreadDumpWork extends AbstractWork { Thread.sleep(sleepTime); } if (ccs.removeThreadDumpRun(run.getRequestId()) != null) { - LOGGER.log(Level.WARNING, "Timed out thread dump request " + run.getRequestId() + LOGGER.log(Level.WARN, "Timed out thread dump request " + run.getRequestId() + " for node " + nodeId); callback.setException(new TimeoutException("Thread dump request for node " + nodeId + " timed out after " + TIMEOUT_SECS + " seconds."));
