jprdonnelly/impala
1
0
Fork 0
mirror of https://github.com/apache/impala.git synced 2025-12-19 18:12:08 -05:00
Code Issues Projects Releases Wiki Activity

IMPALA-14470: Migrate fair scheduler to slf4j

Browse Source 
Moves our fair scheduler code off commons-logging to use slf4j like the
rest of Impala. Relies on the reload4j implementation to add an appender
for message capture.

Change-Id: Ia94d512f61c7e959c17e1139dceac31ad1a01bf2
Reviewed-on: http://gerrit.cloudera.org:8080/23478
Reviewed-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
This commit is contained in:
Michael Smith
2025-09-30 15:45:42 -07:00
committed by Impala Public Jenkins
parent 6aa4df4443
commit 17b3f9ee88
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fe/src/test/java/org/apache/impala/util/TestRequestPoolService.java
View File

@@ -31,10 +31,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import org.junit.After;
import org.junit.AfterClass;
@@ -293,10 +291,9 @@ public class TestRequestPoolService {
@Test
public void testVerifyConfiguration() throws Exception {
// Capture log messages
Log log = LogFactory.getLog(AllocationFileLoaderService.class.getName());
Log4JLogger log4JLogger = (Log4JLogger) log;
Logger logger = Logger.getLogger(AllocationFileLoaderService.class);
ReadableAppender logAppender = new ReadableAppender();
log4JLogger.getLogger().addAppender(logAppender);
logger.addAppender(logAppender);
try {
List<String> expected_messages = Arrays.asList(
@@ -323,7 +320,7 @@ public class TestRequestPoolService {
Assert.assertTrue("missing message: " + expected_warning + " in " + messages,
containsSubstring(messages, expected_warning));
}
} finally { log4JLogger.getLogger().removeAppender(logAppender); }
} finally { logger.removeAppender(logAppender); }
}
/**

8
java/yarn-extras/src/main/java/org/apache/impala/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
View File

@@ -33,8 +33,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
@@ -46,6 +44,8 @@ import org.apache.hadoop.yarn.util.Clock;
import org.apache.hadoop.yarn.util.SystemClock;
import org.apache.hadoop.yarn.util.resource.Resources;
import org.apache.impala.yarn.server.resourcemanager.resource.ResourceWeights;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -60,8 +60,8 @@ import com.google.common.annotations.VisibleForTesting;
@Unstable
public class AllocationFileLoaderService extends AbstractService {
public static final Log LOG = LogFactory.getLog(
AllocationFileLoaderService.class.getName());
public static final Logger LOG =
LoggerFactory.getLogger(AllocationFileLoaderService.class);
/** Time to wait between checks of the allocation file */
public static final long ALLOC_RELOAD_INTERVAL_MS = 10 * 1000;

7
java/yarn-extras/src/main/java/org/apache/impala/yarn/server/resourcemanager/scheduler/fair/QueuePlacementRule.java
View File

@@ -24,12 +24,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.security.Groups;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -41,8 +41,7 @@ import com.google.common.annotations.VisibleForTesting;
@Unstable
public abstract class QueuePlacementRule {
protected boolean create;
public static final Log LOG =
LogFactory.getLog(QueuePlacementRule.class.getName());
public static final Logger LOG = LoggerFactory.getLogger(QueuePlacementRule.class);
/**
* Initializes the rule with any arguments.