github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-03 17:41:49 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2802: Sqoop2: Logging level should be debug for integration tests

Browse Source 
(Abraham Fine via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2016-01-29 12:52:02 -08:00
parent 66a86353ca
commit 0c20d1f069
7 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/src/main/conf/sqoop.properties vendored
View File

@ -143,6 +143,9 @@ org.apache.sqoop.submission.engine=org.apache.sqoop.submission.mapreduce.Mapredu
# Hadoop configuration directory
org.apache.sqoop.submission.engine.mapreduce.configuration.directory=/etc/hadoop/conf/
# Log level for Sqoop Mapper/Reducer
org.apache.sqoop.submission.engine.mapreduce.configuration.loglevel=INFO
#
# Execution engine configuration
#

2
execution/mapreduce/src/main/java/org/apache/sqoop/job/MRJobConstants.java
View File

@ -72,6 +72,8 @@ public final class MRJobConstants extends Constants {
public static final String JOB_CONNECTOR_TO_NAME = PREFIX_JOB_CONFIG
+ "connector.to.name";
public static final String SYSPROP_MR_LOG_LEVEL = "sqoop.mr.loglevel";
// Hadoop specific constants
// We're using constants from Hadoop 1. Hadoop 2 has different names, but
// provides backward compatibility layer for those names as well.

3
execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/MRConfigurationUtils.java
View File

@ -268,6 +268,9 @@ private MRConfigurationUtils() {
}
public static void configureLogging() {
if (System.getProperty(MRJobConstants.SYSPROP_MR_LOG_LEVEL) == null) {
System.setProperty(MRJobConstants.SYSPROP_MR_LOG_LEVEL, "INFO");
}
try (InputStream resourceAsStream =
SqoopMapper.class.getResourceAsStream("/META-INF/log4j.properties")) {
Properties props = new Properties();

2
execution/mapreduce/src/main/resources/META-INF/log4j.properties
View File

@ -14,7 +14,7 @@
# limitations under the License.
# Set root logger level to INFO and its only appender to A1.
log4j.logger.org.apache.sqoop=INFO, A1
log4j.logger.org.apache.sqoop=${sqoop.mr.loglevel}, A1
# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender

3
submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/Constants.java
View File

@ -27,6 +27,9 @@ public class Constants {
public static final String CONF_CONFIG_DIR =
PREFIX_MAPREDUCE + "configuration.directory";
public static final String CONF_SQOOP_MR_LOG_LEVEL =
PREFIX_MAPREDUCE + "configuration.loglevel";
public static final String SQOOP_JOB = "sqoop.job";
private Constants() {

10
submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java
View File

@ -34,6 +34,7 @@
import org.apache.hadoop.mapred.JobStatus;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.log4j.Logger;
import org.apache.sqoop.common.Direction;
import org.apache.sqoop.common.MapContext;
@ -107,6 +108,15 @@ public void initialize(MapContext context, String prefix) {
}
}
// Log level for sqoop mapper and reducer
String mrLogLevel = context.getString(prefix + Constants.CONF_SQOOP_MR_LOG_LEVEL);
if (globalConfiguration.get(MRJobConfig.MR_AM_COMMAND_OPTS) == null) {
globalConfiguration.set(MRJobConfig.MR_AM_COMMAND_OPTS, MRJobConfig.DEFAULT_MR_AM_COMMAND_OPTS + " -Dsqoop.mr.loglevel=" + mrLogLevel);
} else {
globalConfiguration.set(MRJobConfig.MR_AM_COMMAND_OPTS, globalConfiguration.get(MRJobConfig.MR_AM_COMMAND_OPTS) + " -Dsqoop.mr.loglevel=" + mrLogLevel);
}
// Save our own property inside the job to easily identify Sqoop jobs
globalConfiguration.setBoolean(Constants.SQOOP_JOB, true);

1
test/src/main/java/org/apache/sqoop/test/minicluster/SqoopMiniCluster.java
View File

@ -193,6 +193,7 @@ protected Map<String, String> getSubmissionEngineConfiguration() {
properties.put("org.apache.sqoop.submission.engine", "org.apache.sqoop.submission.mapreduce.MapreduceSubmissionEngine");
properties.put("org.apache.sqoop.submission.engine.mapreduce.configuration.directory", getConfigurationPath());
properties.put("org.apache.sqoop.submission.engine.mapreduce.configuration.loglevel", "DEBUG");
return properties;
}