Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12313. NPE in JvmPauseMonitor when calling stop() before start(). Contributed by Gabor Liptak.

This commit is contained in:
Haohui Mai 2015-11-22 23:07:43 -08:00
parent 8228697857
commit 817ae221ac
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -1463,6 +1463,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11677. Add cookie flags for logs and static contexts. HADOOP-11677. Add cookie flags for logs and static contexts.
(nijel via wheat9) (nijel via wheat9)
HADOOP-12313. NPE in JvmPauseMonitor when calling stop() before start().
(Gabor Liptak via wheat9)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
View File

@ -78,12 +78,16 @@ public class JvmPauseMonitor {
Preconditions.checkState(monitorThread == null, Preconditions.checkState(monitorThread == null,
"Already started"); "Already started");
monitorThread = new Daemon(new Monitor()); monitorThread = new Daemon(new Monitor());
if (shouldRun) {
monitorThread.start(); monitorThread.start();
} else {
LOG.warn("stop() was called before start() completed");
}
} }
public void stop() { public void stop() {
shouldRun = false; shouldRun = false;
if (monitorThread != null) { if (isStarted()) {
monitorThread.interrupt(); monitorThread.interrupt();
try { try {
monitorThread.join(); monitorThread.join();