HDFS-13799. TestEditLogTailer#testTriggersLogRollsForAllStandbyNN fails due to missing synchronization
between rollEditsRpcExecutor and tailerThread shutdown. Contributed by Hrishikesh Gadre.
This commit is contained in:
parent
e4b75ad583
commit
754069906b
|
@ -234,7 +234,6 @@ public class EditLogTailer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() throws IOException {
|
public void stop() throws IOException {
|
||||||
rollEditsRpcExecutor.shutdown();
|
|
||||||
tailerThread.setShouldRun(false);
|
tailerThread.setShouldRun(false);
|
||||||
tailerThread.interrupt();
|
tailerThread.interrupt();
|
||||||
try {
|
try {
|
||||||
|
@ -242,6 +241,8 @@ public class EditLogTailer {
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
LOG.warn("Edit log tailer thread exited with an exception");
|
LOG.warn("Edit log tailer thread exited with an exception");
|
||||||
throw new IOException(e);
|
throw new IOException(e);
|
||||||
|
} finally {
|
||||||
|
rollEditsRpcExecutor.shutdown();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue