diff --git a/pom.xml b/pom.xml index 6b595053ef..9ec121a32b 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.8 - 1.7.3 + 1.8.1 5.5.0 1.9.1 3.5.2 @@ -129,7 +129,7 @@ 3.2.2 1.9 1.1 - 3.0.1 + 3.1 2.4 2.6 3.2 @@ -178,7 +178,7 @@ 3.0.3 0.9.3 0.9.3 - 2.6.2 + 2.8.2 2.3 1.3.3 1.10.19 diff --git a/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppender.java b/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppender.java index c6a5341007..360751778f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppender.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppender.java @@ -17,9 +17,6 @@ */ package org.apache.hadoop.hive.ql.log; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Map; import java.util.regex.Pattern; import org.apache.hadoop.hive.common.LogUtils; @@ -28,14 +25,12 @@ import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.session.OperationLog; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.RandomAccessFileAppender; import org.apache.logging.log4j.core.appender.routing.Route; import org.apache.logging.log4j.core.appender.routing.Routes; import org.apache.logging.log4j.core.appender.routing.RoutingAppender; -import org.apache.logging.log4j.core.config.AppenderControl; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.config.Node; @@ -114,7 +109,7 @@ public NameFilter(OperationLog.LoggingLevel loggingMode) { public Result filter(LogEvent event) { boolean excludeMatches = (loggingMode == OperationLog.LoggingLevel.VERBOSE); - String logLevel = event.getContextMap().get(LogUtils.OPERATIONLOG_LEVEL_KEY); + String logLevel = event.getContextData().getValue(LogUtils.OPERATIONLOG_LEVEL_KEY); logLevel = logLevel == null ? "" : logLevel; OperationLog.LoggingLevel currentLoggingMode = OperationLog.getLoggingLevel(logLevel); // If logging is disabled, deny everything. @@ -236,18 +231,20 @@ public static void registerRoutingAppender(org.apache.hadoop.conf.Configuration childNode.getChildren().add(layoutNode); Route mdcRoute = Route.createRoute(null, null, node); - Routes routes = Routes.createRoutes("${ctx:queryId}", defaultRoute, mdcRoute); + Routes routes = Routes.newBuilder() + .withPattern("${ctx:queryId}") + .withRoutes(new Route[]{defaultRoute, mdcRoute}) + .build(); LoggerContext context = (LoggerContext) LogManager.getContext(false); Configuration configuration = context.getConfiguration(); - RoutingAppender routingAppender = RoutingAppender.createAppender(QUERY_ROUTING_APPENDER, - "true", - routes, - configuration, - null, - null, - null); + RoutingAppender routingAppender = RoutingAppender.newBuilder() + .withName(QUERY_ROUTING_APPENDER) + .withIgnoreExceptions(true) + .withRoutes(routes) + .setConfiguration(configuration) + .build(); LoggerConfig loggerConfig = configuration.getRootLogger(); loggerConfig.addAppender(routingAppender, null, null); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppenderForTest.java b/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppenderForTest.java index e8da18bc66..c5cfa0522b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppenderForTest.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/log/LogDivertAppenderForTest.java @@ -169,19 +169,21 @@ public static void registerRoutingAppenderIfInTest(org.apache.hadoop.conf.Config Route defaultRoute = Route.createRoute(null, "${ctx:queryId}", defaultRouteNode); Route mdcRoute = Route.createRoute(null, null, queryIdRouteNode); // Create the routes group - Routes routes = Routes.createRoutes("${ctx:queryId}", defaultRoute, mdcRoute); + Routes routes = Routes.newBuilder() + .withPattern("${ctx:queryId}") + .withRoutes(new Route[]{defaultRoute, mdcRoute}) + .build(); LoggerContext context = (LoggerContext)LogManager.getContext(false); Configuration configuration = context.getConfiguration(); // Create the appender - RoutingAppender routingAppender = RoutingAppender.createAppender(TEST_QUERY_ROUTING_APPENDER, - "true", - routes, - configuration, - null, - null, - null); + RoutingAppender routingAppender = RoutingAppender.newBuilder() + .withName(TEST_QUERY_ROUTING_APPENDER) + .withIgnoreExceptions(true) + .withRoutes(routes) + .setConfiguration(configuration) + .build(); LoggerConfig loggerConfig = configuration.getRootLogger(); loggerConfig.addAppender(routingAppender, null, null);