http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java index 5bd3d3c..51f420c 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java @@ -33,8 +33,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.app.active.ActiveNotificationHandler; import org.apache.asterix.common.api.IMetadataLockManager; @@ -52,6 +50,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 com.fasterxml.jackson.databind.node.ObjectNode; @@ -64,7 +65,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; * - rebalance all non-metadata datasets. */ public class RebalanceApiServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(RebalanceApiServlet.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final String METADATA = "Metadata"; private final ICcApplicationContext appCtx; @@ -266,9 +267,9 @@ public class RebalanceApiServlet extends AbstractServlet { private void sendResponse(IServletResponse response, HttpResponseStatus status, String message, Exception e) { if (status != HttpResponseStatus.OK) { if (e != null) { - LOGGER.log(Level.WARNING, message, e); + LOGGER.log(Level.WARN, message, e); } else { - LOGGER.log(Level.WARNING, message); + LOGGER.log(Level.WARN, message); } } PrintWriter out = response.writer();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java index 117d7fb..3359b9f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java @@ -24,8 +24,6 @@ import static org.apache.asterix.api.http.server.ServletConstants.HYRACKS_DATASE import java.io.IOException; import java.util.List; import java.util.concurrent.ConcurrentMap; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.app.result.ResultReader; import org.apache.asterix.app.translator.QueryTranslator; @@ -55,6 +53,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 com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -63,7 +64,7 @@ import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpResponseStatus; public abstract class RestApiServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(RestApiServlet.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final ICcApplicationContext appCtx; private final ILangCompilationProvider compilationProvider; private final IParserFactory parserFactory; @@ -180,7 +181,7 @@ public abstract class RestApiServlet extends AbstractServlet { doHandle(response, query, sessionOutput, resultDelivery); } catch (Exception e) { response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); - LOGGER.log(Level.WARNING, "Failure handling request", e); + LOGGER.log(Level.WARN, "Failure handling request", e); return; } } @@ -212,13 +213,13 @@ public abstract class RestApiServlet extends AbstractServlet { translator.compileAndExecute(hcc, null, requestParameters); } catch (AsterixException | TokenMgrError | org.apache.asterix.aqlplus.parser.TokenMgrError pe) { response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); - GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, pe.getMessage(), pe); + GlobalConfig.ASTERIX_LOGGER.log(Level.ERROR, pe.getMessage(), pe); String errorMessage = ResultUtil.buildParseExceptionMessage(pe, query); ObjectNode errorResp = ResultUtil.getErrorResponse(2, errorMessage, "", ResultUtil.extractFullStackTrace(pe)); sessionOutput.out().write(OBJECT_MAPPER.writeValueAsString(errorResp)); } catch (Exception e) { - GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, e.getMessage(), e); + GlobalConfig.ASTERIX_LOGGER.log(Level.ERROR, e.getMessage(), e); response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); ResultUtil.apiErrorHandler(sessionOutput.out(), e); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ResultUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ResultUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ResultUtil.java index ccbf68d..aace681 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ResultUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ResultUtil.java @@ -45,14 +45,15 @@ import org.apache.hyracks.algebricks.core.algebra.prettyprint.AlgebricksAppendab import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.exceptions.HyracksException; import org.apache.hyracks.util.JSONUtil; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; public class ResultUtil { - private static final Logger LOGGER = Logger.getLogger(ResultUtil.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public static final List<Pair<Character, String>> HTML_ENTITIES = Collections.unmodifiableList( Arrays.asList(Pair.of('&', "&"), Pair.of('"', """), Pair.of('<', "<"), Pair.of('>', ">"), Pair.of('\'', "'"))); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ShutdownApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ShutdownApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ShutdownApiServlet.java index ac31e24..8c4f22d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ShutdownApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ShutdownApiServlet.java @@ -25,8 +25,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Date; import java.util.concurrent.ConcurrentMap; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.cluster.IClusterStateManager; import org.apache.asterix.common.config.GlobalConfig; @@ -37,6 +35,9 @@ 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.hyracks.util.JSONUtil; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -44,7 +45,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import io.netty.handler.codec.http.HttpResponseStatus; public class ShutdownApiServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(ShutdownApiServlet.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public static final String NODE_ID_KEY = "node_id"; public static final String NCSERVICE_PID = "ncservice_pid"; public static final String INI = "ini"; @@ -65,14 +66,14 @@ public class ShutdownApiServlet extends AbstractServlet { try { hcc.stopCluster(terminateNCServices); } catch (Exception e) { - GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, "Exception stopping cluster", e); + GlobalConfig.ASTERIX_LOGGER.log(Level.ERROR, "Exception stopping cluster", e); } }, "Shutdown Servlet Worker"); try { HttpUtil.setContentType(response, HttpUtil.ContentType.APPLICATION_JSON, HttpUtil.Encoding.UTF8); } catch (IOException e) { - LOGGER.log(Level.WARNING, "Failure handling request", e); + LOGGER.log(Level.WARN, "Failure handling request", e); response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); return; } @@ -94,7 +95,7 @@ public class ShutdownApiServlet extends AbstractServlet { nc.put(NCSERVICE_PID, details.get(INI).get(NCSERVICE_PID).asInt()); } } else { - LOGGER.warning("Unable to get node details for " + node + " from hcc"); + LOGGER.warn("Unable to get node details for " + node + " from hcc"); } } jsonObject.set("cluster", clusterState); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/StorageApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/StorageApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/StorageApiServlet.java index c2cda4e..e770bb3 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/StorageApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/StorageApiServlet.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.function.Predicate; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.stream.Collectors; import org.apache.asterix.common.api.INcApplicationContext; @@ -39,6 +37,9 @@ 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.hyracks.util.JSONUtil; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -48,7 +49,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; public class StorageApiServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(StorageApiServlet.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final INcApplicationContext appCtx; public StorageApiServlet(ConcurrentMap<String, Object> ctx, INcApplicationContext appCtx, String... paths) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java index 8d028a5..8b615cf 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java @@ -24,21 +24,22 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Map; import java.util.concurrent.ConcurrentMap; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.dataflow.ICcApplicationContext; 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.node.ObjectNode; import io.netty.handler.codec.http.HttpResponseStatus; public class VersionApiServlet extends AbstractServlet { - private static final Logger LOGGER = Logger.getLogger(VersionApiServlet.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); public VersionApiServlet(ConcurrentMap<String, Object> ctx, String[] paths) { super(ctx, paths); @@ -54,7 +55,7 @@ public class VersionApiServlet extends AbstractServlet { try { HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_PLAIN, HttpUtil.Encoding.UTF8); } catch (IOException e) { - LOGGER.log(Level.WARNING, "Failure handling request", e); + LOGGER.log(Level.WARN, "Failure handling request", e); response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR); return; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java index bae04d5..8cbc109 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveEntityEventsListener.java @@ -25,8 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.active.ActiveEvent; import org.apache.asterix.active.ActiveEvent.Kind; @@ -57,10 +55,13 @@ import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobId; 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 abstract class ActiveEntityEventsListener implements IActiveEntityController { - private static final Logger LOGGER = Logger.getLogger(ActiveEntityEventsListener.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final Level level = Level.INFO; private static final ActiveEvent STATE_CHANGED = new ActiveEvent(null, Kind.STATE_CHANGED, null, null); private static final EnumSet<ActivityState> TRANSITION_STATES = EnumSet.of(ActivityState.RESUMING, @@ -153,12 +154,12 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl handle((ActivePartitionMessage) event.getEventObject()); break; default: - LOGGER.log(Level.FINE, "Unhandled feed event notification: " + event); + LOGGER.log(Level.DEBUG, "Unhandled feed event notification: " + event); break; } notifySubscribers(event); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Unhandled Exception", e); + LOGGER.log(Level.ERROR, "Unhandled Exception", e); } } @@ -181,7 +182,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl protected void finish(ActiveEvent event) throws HyracksDataException { LOGGER.log(level, "the job " + jobId + " finished"); if (numRegistered != numDeRegistered) { - LOGGER.log(Level.WARNING, "the job " + jobId + " finished with reported runtime registrations = " + LOGGER.log(Level.WARN, "the job " + jobId + " finished with reported runtime registrations = " + numRegistered + " and deregistrations = " + numDeRegistered + " on node controllers"); } jobId = null; @@ -317,7 +318,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl try { subscriber.notify(event); } catch (HyracksDataException e) { - LOGGER.log(Level.WARNING, "Failed to notify subscriber", e); + LOGGER.log(Level.WARN, "Failed to notify subscriber", e); } if (subscriber.isDone()) { it.remove(); @@ -379,7 +380,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl setRunning(metadataProvider, true); } catch (Exception e) { setState(ActivityState.PERMANENTLY_FAILED); - LOGGER.log(Level.SEVERE, "Failed to start the entity " + entityId, e); + LOGGER.log(Level.ERROR, "Failed to start the entity " + entityId, e); throw HyracksDataException.create(e); } } @@ -411,7 +412,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl try { setRunning(metadataProvider, false); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failed to set the entity state as not running " + entityId, e); + LOGGER.log(Level.ERROR, "Failed to set the entity state as not running " + entityId, e); throw HyracksDataException.create(e); } } else if (state == ActivityState.RUNNING) { @@ -421,7 +422,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl setRunning(metadataProvider, false); } catch (Exception e) { setState(ActivityState.PERMANENTLY_FAILED); - LOGGER.log(Level.SEVERE, "Failed to stop the entity " + entityId, e); + LOGGER.log(Level.ERROR, "Failed to stop the entity " + entityId, e); throw HyracksDataException.create(e); } } else { @@ -470,7 +471,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl subscriber.sync(); } catch (Exception e) { synchronized (this) { - LOGGER.log(Level.SEVERE, "Failure while waiting for " + entityId + " to become suspended", e); + LOGGER.log(Level.ERROR, "Failure while waiting for " + entityId + " to become suspended", e); // failed to suspend if (state == ActivityState.SUSPENDING) { if (jobId != null) { @@ -506,7 +507,7 @@ public abstract class ActiveEntityEventsListener implements IActiveEntityControl try { rt.resumeOrRecover(metadataProvider); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failure while attempting to resume " + entityId, e); + LOGGER.log(Level.WARN, "Failure while attempting to resume " + entityId, e); } } finally { suspended = false; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java index ec0680f..da2c99a 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java @@ -22,8 +22,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.active.ActiveEvent; import org.apache.asterix.active.ActiveEvent.Kind; @@ -48,11 +46,14 @@ import org.apache.hyracks.api.job.JobId; import org.apache.hyracks.api.job.JobSpecification; import org.apache.hyracks.api.job.JobStatus; import org.apache.hyracks.api.util.SingleThreadEventProcessor; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ActiveNotificationHandler extends SingleThreadEventProcessor<ActiveEvent> implements IActiveNotificationHandler, IJobLifecycleListener { - private static final Logger LOGGER = Logger.getLogger(ActiveNotificationHandler.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final Level level = Level.INFO; public static final String ACTIVE_ENTITY_PROPERTY_NAME = "ActiveJob"; private final Map<EntityId, IActiveEntityEventsListener> entityEventListeners; @@ -83,7 +84,7 @@ public class ActiveNotificationHandler extends SingleThreadEventProcessor<Active listener.notify(event); } } else { - LOGGER.log(Level.SEVERE, "Entity not found for received message for job " + event.getJobId()); + LOGGER.log(Level.ERROR, "Entity not found for received message for job " + event.getJobId()); } } @@ -111,7 +112,7 @@ public class ActiveNotificationHandler extends SingleThreadEventProcessor<Active LOGGER.log(level, "Job was found to be: " + (found ? "Active" : "Inactive")); if (entityEventListeners.containsKey(entityId)) { if (jobId2EntityId.containsKey(jobId)) { - LOGGER.severe("Job is already being monitored for job: " + jobId); + LOGGER.error("Job is already being monitored for job: " + jobId); return; } LOGGER.log(level, "monitoring started for job id: " + jobId); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java index 0321ae4..ffef251 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/RecoveryTask.java @@ -19,8 +19,6 @@ package org.apache.asterix.app.active; import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.active.ActivityState; import org.apache.asterix.active.IRetryPolicy; @@ -36,10 +34,13 @@ import org.apache.asterix.metadata.utils.DatasetUtil; import org.apache.asterix.metadata.utils.MetadataLockUtil; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; 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 class RecoveryTask { - private static final Logger LOGGER = Logger.getLogger(RecoveryTask.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final Level level = Level.INFO; private final ActiveEntityEventsListener listener; private volatile boolean cancelRecovery = false; @@ -86,7 +87,7 @@ public class RecoveryTask { listener.setState(ActivityState.RUNNING); } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Attempt to resume " + listener.getEntityId() + " Failed", e); + LOGGER.log(Level.WARN, "Attempt to resume " + listener.getEntityId() + " Failed", e); synchronized (listener) { if (listener.getState() == ActivityState.RESUMING) { // This will be the case if compilation failure @@ -102,7 +103,7 @@ public class RecoveryTask { } } } else { - LOGGER.log(Level.WARNING, "Submitting recovery task for " + listener.getEntityId()); + LOGGER.log(Level.WARN, "Submitting recovery task for " + listener.getEntityId()); metadataProvider.getApplicationContext().getServiceContext().getControllerService().getExecutor() .submit(() -> doRecover(retryPolicyFactory.create(listener))); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java index 4271d55..b013c60 100755 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; @@ -50,10 +48,13 @@ import org.apache.asterix.metadata.entities.Function; import org.apache.asterix.metadata.entities.Library; import org.apache.asterix.metadata.utils.MetadataUtil; import org.apache.asterix.runtime.formats.NonTaggedDataFormat; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ExternalLibraryUtils { - private static final Logger LOGGER = Logger.getLogger(ExternalLibraryUtils.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final FilenameFilter nonHiddenFileNameFilter = (dir, name) -> !name.startsWith("."); private ExternalLibraryUtils() { @@ -210,7 +211,7 @@ public class ExternalLibraryUtils { // Add library MetadataManager.INSTANCE.addLibrary(mdTxnCtx, new Library(dataverse, libraryName)); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Added library " + libraryName + " to Metadata"); } @@ -249,13 +250,13 @@ public class ExternalLibraryUtils { args, function.getReturnType().trim(), function.getDefinition().trim(), library.getLanguage().trim(), function.getFunctionType().trim()); MetadataManager.INSTANCE.addFunction(mdTxnCtx, f); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Installed function: " + libraryName + "#" + function.getName().trim()); } } } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Installed functions in library :" + libraryName); } @@ -268,19 +269,19 @@ public class ExternalLibraryUtils { DatasourceAdapter dsa = new DatasourceAdapter(aid, adapterFactoryClass, IDataSourceAdapter.AdapterType.EXTERNAL); MetadataManager.INSTANCE.addAdapter(mdTxnCtx, dsa); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Installed adapter: " + adapterName); } } } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Installed adapters in library :" + libraryName); } MetadataManager.INSTANCE.commitTransaction(mdTxnCtx); } catch (Exception e) { - if (LOGGER.isLoggable(Level.SEVERE)) { - LOGGER.log(Level.SEVERE, "Exception in installing library " + libraryName, e); + if (LOGGER.isErrorEnabled()) { + LOGGER.log(Level.ERROR, "Exception in installing library " + libraryName, e); } MetadataManager.INSTANCE.abortTransaction(mdTxnCtx); } @@ -326,7 +327,7 @@ public class ExternalLibraryUtils { private static ClassLoader getLibraryClassLoader(String dataverse, String libraryName) throws Exception { // Get a reference to the library directory File installDir = getLibraryInstallDir(); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Installing lirbary " + libraryName + " in dataverse " + dataverse + "." + " Install Directory: " + installDir.getAbsolutePath()); } @@ -374,7 +375,7 @@ public class ExternalLibraryUtils { } } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { StringBuilder logMesg = new StringBuilder("Classpath for library " + libraryName + "\n"); for (URL url : urls) { logMesg.append(url.getFile() + "\n"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java index fb6ec37..7e76fc1 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/CancelQueryRequest.java @@ -27,12 +27,13 @@ import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobId; import org.apache.hyracks.control.cc.ClusterControllerService; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class CancelQueryRequest implements ICcAddressedMessage { - private static final Logger LOGGER = Logger.getLogger(CancelQueryRequest.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final long serialVersionUID = 1L; private final String nodeId; private final long reqId; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java index ed683dc..0b8c34c 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java @@ -24,8 +24,6 @@ import java.io.StringWriter; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.algebra.base.ILangExtension; import org.apache.asterix.api.http.server.ResultUtil; @@ -55,10 +53,13 @@ import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.exceptions.HyracksException; import org.apache.hyracks.control.cc.ClusterControllerService; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public final class ExecuteStatementRequestMessage implements ICcAddressedMessage { private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(ExecuteStatementRequestMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); //TODO: Make configurable: https://issues.apache.org/jira/browse/ASTERIXDB-2062 public static final long DEFAULT_NC_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(5); //TODO: Make configurable: https://issues.apache.org/jira/browse/ASTERIXDB-2063 @@ -130,16 +131,16 @@ public final class ExecuteStatementRequestMessage implements ICcAddressedMessage } catch (AlgebricksException | HyracksException | TokenMgrError | org.apache.asterix.aqlplus.parser.TokenMgrError pe) { // we trust that "our" exceptions are serializable and have a comprehensible error message - GlobalConfig.ASTERIX_LOGGER.log(Level.WARNING, pe.getMessage(), pe); + GlobalConfig.ASTERIX_LOGGER.log(Level.WARN, pe.getMessage(), pe); responseMsg.setError(pe); } catch (Exception e) { - GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, "Unexpected exception", e); + GlobalConfig.ASTERIX_LOGGER.log(Level.ERROR, "Unexpected exception", e); responseMsg.setError(new Exception(e.toString())); } try { messageBroker.sendApplicationMessageToNC(responseMsg, requestNodeId); } catch (Exception e) { - LOGGER.log(Level.WARNING, e.toString(), e); + LOGGER.log(Level.WARN, e.toString(), e); } } @@ -162,7 +163,7 @@ public final class ExecuteStatementRequestMessage implements ICcAddressedMessage try { messageBroker.sendApplicationMessageToNC(responseMsg, requestNodeId); } catch (Exception e) { - LOGGER.log(Level.WARNING, e.toString(), e); + LOGGER.log(Level.WARN, e.toString(), e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java index 446d04d..835de47 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/IndexCheckpointManager.java @@ -28,19 +28,19 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.storage.IIndexCheckpointManager; import org.apache.asterix.common.storage.IndexCheckpoint; import org.apache.asterix.common.utils.StorageConstants; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.util.annotations.ThreadSafe; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @ThreadSafe public class IndexCheckpointManager implements IIndexCheckpointManager { - private static final Logger LOGGER = Logger.getLogger(IndexCheckpointManager.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final int HISTORY_CHECKPOINTS = 1; private static final int MAX_CHECKPOINT_WRITE_ATTEMPTS = 5; private static final FilenameFilter CHECKPOINT_FILE_FILTER = @@ -56,7 +56,7 @@ public class IndexCheckpointManager implements IIndexCheckpointManager { public synchronized void init(long lsn) throws HyracksDataException { final List<IndexCheckpoint> checkpoints = getCheckpoints(); if (!checkpoints.isEmpty()) { - LOGGER.warning(() -> "Checkpoints found on initializing: " + indexPath); + LOGGER.warn(() -> "Checkpoints found on initializing: " + indexPath); delete(); } IndexCheckpoint firstCheckpoint = IndexCheckpoint.first(lsn); @@ -130,7 +130,7 @@ public class IndexCheckpointManager implements IIndexCheckpointManager { try { checkpoints.add(read(checkpointFile.toPath())); } catch (IOException e) { - LOGGER.log(Level.WARNING, e, () -> "Couldn't read index checkpoint file: " + e); + LOGGER.warn(() -> "Couldn't read index checkpoint file: " + checkpointFile, e); } } } @@ -154,7 +154,7 @@ public class IndexCheckpointManager implements IIndexCheckpointManager { if (i == MAX_CHECKPOINT_WRITE_ATTEMPTS) { throw HyracksDataException.create(e); } - LOGGER.log(Level.WARNING, e, () -> "Filed to write checkpoint at: " + indexPath); + LOGGER.warn(() -> "Filed to write checkpoint at: " + indexPath, e); int nextAttempt = i + 1; LOGGER.info(() -> "Checkpoint write attempt " + nextAttempt + "/" + MAX_CHECKPOINT_WRITE_ATTEMPTS); } @@ -176,7 +176,7 @@ public class IndexCheckpointManager implements IIndexCheckpointManager { } } } catch (Exception e) { - LOGGER.log(Level.WARNING, e, () -> "Couldn't delete history checkpoints at " + indexPath); + LOGGER.warn(() -> "Couldn't delete history checkpoints at " + indexPath, e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java index df3ca64..a0142d5 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.stream.Collectors; import org.apache.asterix.active.ActiveManager; @@ -106,9 +104,12 @@ import org.apache.hyracks.storage.common.buffercache.IPageReplacementStrategy; import org.apache.hyracks.storage.common.file.FileMapManager; import org.apache.hyracks.storage.common.file.ILocalResourceRepositoryFactory; import org.apache.hyracks.storage.common.file.IResourceIdFactory; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class NCAppRuntimeContext implements INcApplicationContext { - private static final Logger LOGGER = Logger.getLogger(NCAppRuntimeContext.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private ILSMMergePolicyFactory metadataMergePolicyFactory; private final INCServiceContext ncServiceContext; @@ -200,8 +201,8 @@ public class NCAppRuntimeContext implements INcApplicationContext { SystemState systemState = recoveryMgr.getSystemState(); if (initialRun || systemState == SystemState.PERMANENT_DATA_LOSS) { //delete any storage data before the resource factory is initialized - if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.log(Level.WARNING, + if (LOGGER.isWarnEnabled()) { + LOGGER.log(Level.WARN, "Deleting the storage dir. initialRun = " + initialRun + ", systemState = " + systemState); } localResourceRepository.deleteStorageData(); @@ -460,9 +461,7 @@ public class NCAppRuntimeContext implements INcApplicationContext { @Override public void initializeMetadata(boolean newUniverse) throws Exception { IAsterixStateProxy proxy; - if (LOGGER.isLoggable(Level.INFO)) { - LOGGER.info("Bootstrapping metadata"); - } + LOGGER.info("Bootstrapping metadata"); MetadataNode.INSTANCE.initialize(this, ncExtensionManager.getMetadataTupleTranslatorProvider(), ncExtensionManager.getMetadataExtensions()); @@ -478,10 +477,7 @@ public class NCAppRuntimeContext implements INcApplicationContext { MetadataBootstrap.startUniverse(getServiceContext(), newUniverse); MetadataBootstrap.startDDLRecovery(); ncExtensionManager.initializeMetadata(getServiceContext()); - - if (LOGGER.isLoggable(Level.INFO)) { - LOGGER.info("Metadata node bound"); - } + LOGGER.info("Metadata node bound"); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java index dc22342..f458688 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java @@ -39,8 +39,6 @@ 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.asterix.common.api.IDatasetLifecycleManager; import org.apache.asterix.common.api.INcApplicationContext; @@ -77,6 +75,8 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor; import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex; import org.apache.hyracks.storage.common.IIndex; import org.apache.hyracks.storage.common.LocalResource; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; /** * This is the Recovery Manager and is responsible for rolling back a @@ -85,7 +85,7 @@ import org.apache.hyracks.storage.common.LocalResource; public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { public static final boolean IS_DEBUG_MODE = false; - private static final Logger LOGGER = Logger.getLogger(RecoveryManager.class.getName()); + private static final Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); private final ITransactionSubsystem txnSubsystem; private final LogManager logMgr; private final boolean replicationEnabled; @@ -126,9 +126,7 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { //The checkpoint file doesn't exist => Failure happened during NC initialization. //Retry to initialize the NC by setting the state to PERMANENT_DATA_LOSS state = SystemState.PERMANENT_DATA_LOSS; - if (LOGGER.isLoggable(Level.INFO)) { - LOGGER.info("The checkpoint file doesn't exist: systemState = PERMANENT_DATA_LOSS"); - } + LOGGER.info("The checkpoint file doesn't exist: systemState = PERMANENT_DATA_LOSS"); return state; } @@ -147,7 +145,7 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { long readableSmallestLSN = logMgr.getReadableSmallestLSN(); if (logMgr.getAppendLSN() == readableSmallestLSN) { if (checkpointObject.getMinMCTFirstLsn() != AbstractCheckpointManager.SHARP_CHECKPOINT_LSN) { - LOGGER.warning("Some(or all) of transaction log files are lost."); + LOGGER.warn("Some(or all) of transaction log files are lost."); //No choice but continuing when the log files are lost. } state = SystemState.HEALTHY; @@ -164,9 +162,7 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { @Override public void startLocalRecovery(Set<Integer> partitions) throws IOException, ACIDException { state = SystemState.RECOVERING; - if (LOGGER.isLoggable(Level.INFO)) { - LOGGER.info("starting recovery ..."); - } + LOGGER.info("starting recovery ..."); long readableSmallestLSN = logMgr.getReadableSmallestLSN(); Checkpoint checkpointObject = checkpointManager.getLatest(); @@ -344,7 +340,7 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { * log record. *******************************************************************/ if (localResource == null) { - LOGGER.log(Level.WARNING, "resource was not found for resource id " + resourceId); + LOGGER.log(Level.WARN, "resource was not found for resource id " + resourceId); logRecord = logReader.next(); continue; } @@ -514,19 +510,19 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { throw new ACIDException(e); } long lastLSN = txnContext.getLastLSN(); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("rollbacking transaction log records from " + firstLSN + " to " + lastLSN); } // check if the transaction actually wrote some logs. if (firstLSN == TransactionManagementConstants.LogManagerConstants.TERMINAL_LSN || firstLSN > lastLSN) { - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("no need to roll back as there were no operations by the txn " + txnContext.getTxnId()); } return; } // While reading log records from firstLsn to lastLsn, collect uncommitted txn's Lsns - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("collecting loser transaction's LSNs from " + firstLSN + " to " + lastLSN); } @@ -636,7 +632,7 @@ public class RecoveryManager implements IRecoveryManager, ILifeCycleComponent { } } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("undone loser transaction's effect"); LOGGER.info("[RecoveryManager's rollback log count] update/entityCommit/undo:" + updateLogCount + "/" + entityCommitLogCount + "/" + undoCount); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java index 41a0c3b..cd9b617 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java @@ -19,8 +19,6 @@ package org.apache.asterix.app.nc; import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.config.ReplicationProperties; import org.apache.asterix.common.config.TransactionProperties; @@ -34,20 +32,21 @@ import org.apache.asterix.common.transactions.ILogManager; import org.apache.asterix.common.transactions.IRecoveryManager; import org.apache.asterix.common.transactions.ITransactionManager; import org.apache.asterix.common.transactions.ITransactionSubsystem; -import org.apache.asterix.common.utils.StorageConstants; import org.apache.asterix.transaction.management.service.locking.ConcurrentLockManager; import org.apache.asterix.transaction.management.service.logging.LogManager; import org.apache.asterix.transaction.management.service.logging.LogManagerWithReplication; import org.apache.asterix.transaction.management.service.recovery.CheckpointManagerFactory; import org.apache.asterix.transaction.management.service.transaction.TransactionManager; import org.apache.hyracks.api.application.INCServiceContext; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; /** * Provider for all the sub-systems (transaction/lock/log/recovery) managers. * Users of transaction sub-systems must obtain them from the provider. */ public class TransactionSubsystem implements ITransactionSubsystem { - private static final Logger LOGGER = Logger.getLogger(TransactionSubsystem.class.getName()); + private static final Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); private final String id; private final ILogManager logManager; private final ILockManager lockManager; @@ -74,7 +73,7 @@ public class TransactionSubsystem implements ITransactionSubsystem { final boolean replicationEnabled = repProperties.isReplicationEnabled(); final CheckpointProperties checkpointProperties = new CheckpointProperties(txnProperties, id); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.log(Level.INFO, "Checkpoint Properties: " + checkpointProperties); } checkpointManager = CheckpointManagerFactory.create(this, checkpointProperties, replicationEnabled); @@ -144,7 +143,7 @@ public class TransactionSubsystem implements ITransactionSubsystem { * However, the thread doesn't start reporting the count until the entityCommitCount > 0. */ static class EntityCommitProfiler implements Callable<Boolean> { - private static final Logger LOGGER = Logger.getLogger(EntityCommitProfiler.class.getName()); + private static final Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); private final long reportIntervalInMillisec; private long lastEntityCommitCount; private int reportIntervalInSeconds; @@ -179,7 +178,7 @@ public class TransactionSubsystem implements ITransactionSubsystem { long currentTimeStamp = System.currentTimeMillis(); long currentEntityCommitCount = txnSubsystem.profilerEntityCommitLogCount; - LOGGER.severe("EntityCommitProfiler ReportRound[" + reportRound + "], AbsoluteTimeStamp[" + currentTimeStamp + LOGGER.error("EntityCommitProfiler ReportRound[" + reportRound + "], AbsoluteTimeStamp[" + currentTimeStamp + "], ActualRelativeTimeStamp[" + (currentTimeStamp - startTimeStamp) + "], ExpectedRelativeTimeStamp[" + (reportIntervalInSeconds * reportRound) + "], IIPS[" + ((currentEntityCommitCount - lastEntityCommitCount) / reportIntervalInSeconds) + "], IPS[" http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/MigrateStorageResourcesTask.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/MigrateStorageResourcesTask.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/MigrateStorageResourcesTask.java index 503b8de..bd64ea5 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/MigrateStorageResourcesTask.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/MigrateStorageResourcesTask.java @@ -24,7 +24,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.function.Predicate; -import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -44,13 +43,15 @@ import org.apache.hyracks.api.io.IODeviceHandle; import org.apache.hyracks.api.service.IControllerService; import org.apache.hyracks.storage.common.ILocalResourceRepository; import org.apache.hyracks.storage.common.LocalResource; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Migrates a legacy storage structure to the current one */ public class MigrateStorageResourcesTask implements INCLifecycleTask { - private static final Logger LOGGER = Logger.getLogger(MigrateStorageResourcesTask.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final long serialVersionUID = 1L; public static final int LEGACY_RESOURCES_TREE_DEPTH_FROM_STORAGE_ROOT = 5; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/StartLifecycleComponentsTask.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/StartLifecycleComponentsTask.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/StartLifecycleComponentsTask.java index 87d3414..7db473e 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/StartLifecycleComponentsTask.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/StartLifecycleComponentsTask.java @@ -20,8 +20,6 @@ package org.apache.asterix.app.nc.task; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.api.INCLifecycleTask; import org.apache.asterix.common.api.INcApplicationContext; @@ -32,10 +30,12 @@ import org.apache.hyracks.api.lifecycle.ILifeCycleComponentManager; import org.apache.hyracks.api.lifecycle.LifeCycleComponentManager; import org.apache.hyracks.api.service.IControllerService; import org.apache.hyracks.control.nc.application.NCServiceContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class StartLifecycleComponentsTask implements INCLifecycleTask { - private static final Logger LOGGER = Logger.getLogger(StartLifecycleComponentsTask.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final long serialVersionUID = 1L; @Override @@ -43,19 +43,17 @@ public class StartLifecycleComponentsTask implements INCLifecycleTask { INcApplicationContext applicationContext = (INcApplicationContext) cs.getApplicationContext(); NCServiceContext serviceCtx = (NCServiceContext) cs.getContext(); MetadataProperties metadataProperties = applicationContext.getMetadataProperties(); - if (LOGGER.isLoggable(Level.INFO)) { - LOGGER.info("Starting lifecycle components"); - } + LOGGER.info("Starting lifecycle components"); Map<String, String> lifecycleMgmtConfiguration = new HashMap<>(); String dumpPathKey = LifeCycleComponentManager.Config.DUMP_PATH_KEY; String dumpPath = metadataProperties.getCoredumpPath(serviceCtx.getNodeId()); lifecycleMgmtConfiguration.put(dumpPathKey, dumpPath); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Coredump directory for NC is: " + dumpPath); } ILifeCycleComponentManager lccm = serviceCtx.getLifeCycleComponentManager(); lccm.configure(lifecycleMgmtConfiguration); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Configured:" + lccm); } serviceCtx.setStateDumpHandler(new AsterixStateDumpHandler(serviceCtx.getNodeId(), lccm.getDumpPath(), lccm)); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java index c00b1b6..37b4d4f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java @@ -26,8 +26,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.stream.Collectors; import org.apache.asterix.app.nc.task.BindMetadataNodeTask; @@ -54,7 +52,6 @@ import org.apache.asterix.common.api.IClusterManagementWork.ClusterState; import org.apache.asterix.common.api.INCLifecycleTask; import org.apache.asterix.common.cluster.ClusterPartition; import org.apache.asterix.common.cluster.IClusterStateManager; -import org.apache.asterix.common.config.ReplicationProperties; import org.apache.asterix.common.dataflow.ICcApplicationContext; import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; @@ -66,14 +63,16 @@ import org.apache.asterix.common.replication.Replica; import org.apache.asterix.common.transactions.IRecoveryManager.SystemState; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.util.FaultToleranceUtil; -import org.apache.commons.lang3.tuple.Pair; import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.application.IClusterLifecycleListener.ClusterEventType; 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 class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { - private static final Logger LOGGER = Logger.getLogger(AutoFaultToleranceStrategy.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private long clusterRequestId = 0; private Set<String> failedNodes = new HashSet<>(); @@ -159,7 +158,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { if (partitionRecoveryPlan.size() == 0) { //no active replicas were found for the failed node - LOGGER.severe("Could not find active replicas for the partitions " + lostPartitions); + LOGGER.error("Could not find active replicas for the partitions " + lostPartitions); return; } else { LOGGER.info("Partitions to recover: " + lostPartitions); @@ -179,7 +178,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { * has failed. When the failure notification arrives, we will send any pending request * that belongs to the failed NC to a different active replica. */ - LOGGER.log(Level.WARNING, "Failed to send takeover request: " + takeoverRequest, e); + LOGGER.log(Level.WARN, "Failed to send takeover request: " + takeoverRequest, e); } }); } @@ -224,7 +223,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { } } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Prepared Failback plan: " + plan.toString()); } @@ -291,7 +290,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { messageBroker.sendApplicationMessageToNC(request, request.getNodeID()); plan.addPendingRequest(request); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to send failback request to: " + request.getNodeID(), e); + LOGGER.log(Level.WARN, "Failed to send failback request to: " + request.getNodeID(), e); plan.notifyNodeFailure(request.getNodeID()); revertFailedFailbackPlanEffects(); break; @@ -374,7 +373,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { try { messageBroker.sendApplicationMessageToNC(request, request.getNodeId()); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to send complete failback request to: " + request.getNodeId(), e); + LOGGER.log(Level.WARN, "Failed to send complete failback request to: " + request.getNodeId(), e); notifyFailbackPlansNodeFailure(request.getNodeId()); revertFailedFailbackPlanEffects(); } @@ -417,7 +416,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { * has failed. When the failure notification arrives, a new NC will be assigned to * the metadata partition and a new metadata node takeover request will be sent to it. */ - LOGGER.log(Level.WARNING, + LOGGER.log(Level.WARN, "Failed to send metadata node takeover request to: " + metadataPartiton.getActiveNodeId(), e); } } @@ -477,7 +476,7 @@ public class AutoFaultToleranceStrategy implements IFaultToleranceStrategy { } clusterManager.refreshState(); } else { - LOGGER.log(Level.SEVERE, msg.getNodeId() + " failed to complete startup. ", msg.getException()); + LOGGER.log(Level.ERROR, msg.getNodeId() + " failed to complete startup. ", msg.getException()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java index 0080bbd..02174da 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java @@ -25,8 +25,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 java.util.stream.Collectors; import org.apache.asterix.app.nc.task.BindMetadataNodeTask; @@ -61,10 +59,13 @@ import org.apache.asterix.util.FaultToleranceUtil; import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.application.IClusterLifecycleListener.ClusterEventType; 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 class MetadataNodeFaultToleranceStrategy implements IFaultToleranceStrategy { - private static final Logger LOGGER = Logger.getLogger(MetadataNodeFaultToleranceStrategy.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private IClusterStateManager clusterManager; private String metadataNodeId; private IReplicationStrategy replicationStrategy; @@ -106,7 +107,7 @@ public class MetadataNodeFaultToleranceStrategy implements IFaultToleranceStrate try { messageBroker.sendApplicationMessageToNC(msg, replica.getId()); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed sending an application message to an NC", e); + LOGGER.log(Level.WARN, "Failed sending an application message to an NC", e); continue; } } @@ -170,7 +171,7 @@ public class MetadataNodeFaultToleranceStrategy implements IFaultToleranceStrate private synchronized void process(ReplayPartitionLogsResponseMessage msg) { hotStandbyMetadataReplica.add(msg.getNodeId()); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.info("Hot Standby Metadata Replicas: " + hotStandbyMetadataReplica); } } @@ -211,7 +212,7 @@ public class MetadataNodeFaultToleranceStrategy implements IFaultToleranceStrate } clusterManager.refreshState(); } else { - LOGGER.log(Level.SEVERE, msg.getNodeId() + " failed to complete startup. ", msg.getException()); + LOGGER.log(Level.ERROR, msg.getNodeId() + " failed to complete startup. ", msg.getException()); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java index a273845..3c5442e 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java @@ -23,8 +23,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.stream.Collectors; import org.apache.asterix.app.nc.task.BindMetadataNodeTask; @@ -50,10 +48,13 @@ import org.apache.asterix.common.transactions.IRecoveryManager.SystemState; import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.client.NodeStatus; 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 class NoFaultToleranceStrategy implements IFaultToleranceStrategy { - private static final Logger LOGGER = Logger.getLogger(NoFaultToleranceStrategy.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private IClusterStateManager clusterManager; private String metadataNodeId; private Set<String> pendingStartupCompletionNodes = new HashSet<>(); @@ -121,8 +122,8 @@ public class NoFaultToleranceStrategy implements IFaultToleranceStrategy { } clusterManager.refreshState(); } else { - if (LOGGER.isLoggable(Level.SEVERE)) { - LOGGER.log(Level.SEVERE, msg.getNodeId() + " failed to complete startup. ", msg.getException()); + if (LOGGER.isErrorEnabled()) { + LOGGER.log(Level.ERROR, msg.getNodeId() + " failed to complete startup. ", msg.getException()); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/CompleteFailbackRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/CompleteFailbackRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/CompleteFailbackRequestMessage.java index feca7e8..ad4afd0 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/CompleteFailbackRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/CompleteFailbackRequestMessage.java @@ -20,8 +20,6 @@ package org.apache.asterix.app.replication.message; import java.io.IOException; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.api.INcApplicationContext; import org.apache.asterix.common.messaging.api.INCMessageBroker; @@ -29,11 +27,14 @@ import org.apache.asterix.common.messaging.api.INcAddressedMessage; import org.apache.asterix.common.replication.IRemoteRecoveryManager; import org.apache.asterix.runtime.message.AbstractFailbackPlanMessage; 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 class CompleteFailbackRequestMessage extends AbstractFailbackPlanMessage implements INcAddressedMessage { private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(CompleteFailbackRequestMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final Set<Integer> partitions; private final String nodeId; @@ -69,7 +70,7 @@ public class CompleteFailbackRequestMessage extends AbstractFailbackPlanMessage IRemoteRecoveryManager remoteRecoeryManager = appContext.getRemoteRecoveryManager(); remoteRecoeryManager.completeFailbackProcess(); } catch (IOException | InterruptedException e) { - LOGGER.log(Level.SEVERE, "Failure during completion of failback process", e); + LOGGER.log(Level.ERROR, "Failure during completion of failback process", e); hde = HyracksDataException.create(e); } finally { CompleteFailbackResponseMessage reponse = @@ -77,7 +78,7 @@ public class CompleteFailbackRequestMessage extends AbstractFailbackPlanMessage try { broker.sendMessageToCC(reponse); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failure sending message to CC", e); + LOGGER.log(Level.ERROR, "Failure sending message to CC", e); hde = HyracksDataException.suppress(hde, e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeRequestMessage.java index bebd133..b0e1e06 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeRequestMessage.java @@ -18,19 +18,19 @@ */ package org.apache.asterix.app.replication.message; -import java.util.logging.Level; -import java.util.logging.Logger; - import org.apache.asterix.common.api.INcApplicationContext; import org.apache.asterix.common.messaging.api.INCMessageBroker; import org.apache.asterix.common.messaging.api.INcAddressedMessage; import org.apache.asterix.common.replication.INCLifecycleMessage; 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 class MetadataNodeRequestMessage implements INCLifecycleMessage, INcAddressedMessage { private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(MetadataNodeRequestMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final boolean export; public MetadataNodeRequestMessage(boolean export) { @@ -49,7 +49,7 @@ public class MetadataNodeRequestMessage implements INCLifecycleMessage, INcAddre appContext.unexportMetadataNodeStub(); } } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failed taking over metadata", e); + LOGGER.log(Level.ERROR, "Failed taking over metadata", e); hde = HyracksDataException.create(e); } finally { MetadataNodeResponseMessage reponse = @@ -57,7 +57,7 @@ public class MetadataNodeRequestMessage implements INCLifecycleMessage, INcAddre try { broker.sendMessageToCC(reponse); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failed taking over metadata", e); + LOGGER.log(Level.ERROR, "Failed taking over metadata", e); hde = HyracksDataException.suppress(hde, e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/PreparePartitionsFailbackRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/PreparePartitionsFailbackRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/PreparePartitionsFailbackRequestMessage.java index cefcf49..6b85050 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/PreparePartitionsFailbackRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/PreparePartitionsFailbackRequestMessage.java @@ -20,8 +20,6 @@ package org.apache.asterix.app.replication.message; import java.rmi.RemoteException; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.api.INcApplicationContext; import org.apache.asterix.common.messaging.api.INCMessageBroker; @@ -29,12 +27,15 @@ import org.apache.asterix.common.messaging.api.INcAddressedMessage; import org.apache.asterix.runtime.message.AbstractFailbackPlanMessage; import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepository; 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 class PreparePartitionsFailbackRequestMessage extends AbstractFailbackPlanMessage implements INcAddressedMessage { private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(PreparePartitionsFailbackRequestMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private final Set<Integer> partitions; private boolean releaseMetadataNode = false; private final String nodeID; @@ -86,7 +87,7 @@ public class PreparePartitionsFailbackRequestMessage extends AbstractFailbackPla try { appContext.unexportMetadataNodeStub(); } catch (RemoteException e) { - LOGGER.log(Level.SEVERE, "Failed unexporting metadata stub", e); + LOGGER.log(Level.ERROR, "Failed unexporting metadata stub", e); throw HyracksDataException.create(e); } } else { @@ -109,7 +110,7 @@ public class PreparePartitionsFailbackRequestMessage extends AbstractFailbackPla try { broker.sendMessageToCC(reponse); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failed sending message to cc", e); + LOGGER.log(Level.ERROR, "Failed sending message to cc", e); throw HyracksDataException.create(e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java index 075c415..b60ef8b 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java @@ -18,9 +18,6 @@ */ package org.apache.asterix.app.replication.message; -import java.util.logging.Level; -import java.util.logging.Logger; - import org.apache.asterix.common.dataflow.ICcApplicationContext; import org.apache.asterix.common.messaging.api.ICcAddressedMessage; import org.apache.asterix.common.messaging.api.INCMessageBroker; @@ -29,10 +26,13 @@ import org.apache.asterix.common.transactions.IRecoveryManager.SystemState; import org.apache.hyracks.api.client.NodeStatus; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.control.nc.NodeControllerService; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class RegistrationTasksRequestMessage implements INCLifecycleMessage, ICcAddressedMessage { - private static final Logger LOGGER = Logger.getLogger(RegistrationTasksRequestMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final long serialVersionUID = 1L; private final SystemState state; private final String nodeId; @@ -51,7 +51,7 @@ public class RegistrationTasksRequestMessage implements INCLifecycleMessage, ICc systemState); ((INCMessageBroker) cs.getContext().getMessageBroker()).sendMessageToCC(msg); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Unable to send RegistrationTasksRequestMessage to CC", e); + LOGGER.log(Level.ERROR, "Unable to send RegistrationTasksRequestMessage to CC", e); throw HyracksDataException.create(e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java index 13525e3..d4c2340 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java @@ -19,8 +19,6 @@ package org.apache.asterix.app.replication.message; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.api.INCLifecycleTask; import org.apache.asterix.common.api.INcApplicationContext; @@ -31,10 +29,13 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.service.IControllerService; import org.apache.hyracks.control.nc.NCShutdownHook; 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 RegistrationTasksResponseMessage implements INCLifecycleMessage, INcAddressedMessage { - private static final Logger LOGGER = Logger.getLogger(RegistrationTasksResponseMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final long serialVersionUID = 1L; private final String nodeId; private final List<INCLifecycleTask> tasks; @@ -53,16 +54,16 @@ public class RegistrationTasksResponseMessage implements INCLifecycleMessage, IN Throwable exception = null; try { for (INCLifecycleTask task : tasks) { - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.log(Level.INFO, "Starting startup task: " + task); } task.perform(cs); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isInfoEnabled()) { LOGGER.log(Level.INFO, "Completed startup task: " + task); } } } catch (Throwable e) { //NOSONAR all startup failures should be reported to CC - LOGGER.log(Level.SEVERE, "Failed during startup task", e); + LOGGER.log(Level.ERROR, "Failed during startup task", e); success = false; exception = e; } @@ -72,7 +73,7 @@ public class RegistrationTasksResponseMessage implements INCLifecycleMessage, IN broker.sendMessageToCC(result); } catch (Exception e) { success = false; - LOGGER.log(Level.SEVERE, "Failed sending message to cc", e); + LOGGER.log(Level.ERROR, "Failed sending message to cc", e); } } finally { if (!success) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/af4018dd/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/ReplayPartitionLogsRequestMessage.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/ReplayPartitionLogsRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/ReplayPartitionLogsRequestMessage.java index c8e2479..beac2b5 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/ReplayPartitionLogsRequestMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/ReplayPartitionLogsRequestMessage.java @@ -19,8 +19,6 @@ package org.apache.asterix.app.replication.message; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.asterix.common.api.INcApplicationContext; import org.apache.asterix.common.messaging.api.INCMessageBroker; @@ -28,10 +26,13 @@ import org.apache.asterix.common.messaging.api.INcAddressedMessage; import org.apache.asterix.common.replication.INCLifecycleMessage; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.control.nc.NodeControllerService; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ReplayPartitionLogsRequestMessage implements INCLifecycleMessage, INcAddressedMessage { - private static final Logger LOGGER = Logger.getLogger(ReplayPartitionLogsRequestMessage.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(); private static final long serialVersionUID = 1L; private final Set<Integer> partitions; @@ -50,7 +51,7 @@ public class ReplayPartitionLogsRequestMessage implements INCLifecycleMessage, I try { broker.sendMessageToCC(reponse); } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Failed sending message to cc", e); + LOGGER.log(Level.ERROR, "Failed sending message to cc", e); throw HyracksDataException.create(e); } }
