github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-10 15:21:07 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-813: LoaderExecutor might get into deadlock when exception is raised outside Loader itself

Browse Source 
(Jarek Jarcec Cecho via Cheolsoo Park)
This commit is contained in:
Cheolsoo Park 2013-01-22 16:06:29 -08:00
parent 612060139a
commit 5be8eb6808
1 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopOutputFormatLoadExecutor.java
View File

@ -175,13 +175,13 @@ private class ConsumerThread implements Runnable {
@Override @Override
public void run() { public void run() {
LOG.info("SqoopOutputFormatLoadExecutor consumer thread is starting");
try {
DataReader reader = new OutputFormatDataReader(); DataReader reader = new OutputFormatDataReader();
Configuration conf = null; Configuration conf = null;
if (!isTest) { if (!isTest) {
conf = context.getConfiguration(); conf = context.getConfiguration();
loaderName = conf.get(JobConstants.JOB_ETL_LOADER); loaderName = conf.get(JobConstants.JOB_ETL_LOADER);
} }
Loader loader = (Loader) ClassUtils.instantiate(loaderName); Loader loader = (Loader) ClassUtils.instantiate(loaderName);
@ -204,15 +204,10 @@ public void run() {
configJob = ConfigurationUtils.getFrameworkJob(conf); configJob = ConfigurationUtils.getFrameworkJob(conf);
break; break;
default: default:
readerFinished = true;
// Release so that the writer can tell the framework something went
// wrong.
free.release();
throw new SqoopException(MapreduceExecutionError.MAPRED_EXEC_0023); throw new SqoopException(MapreduceExecutionError.MAPRED_EXEC_0023);
} }
} }
try {
LOG.info("Running loader class " + loaderName); LOG.info("Running loader class " + loaderName);
loader.load(subContext, configConnection, configJob, reader); loader.load(subContext, configConnection, configJob, reader);
LOG.info("Loader has finished"); LOG.info("Loader has finished");