YARN-3641. NodeManager: stopRecoveryStore() shouldn't be skipped when exceptions happen in stopping NM's sub-services. Contributed by Junping Du
(cherry picked from commit 711d77cc54
)
This commit is contained in:
parent
aefc2bae9e
commit
a81ad81461
|
@ -446,6 +446,9 @@ Release 2.7.1 - UNRELEASED
|
|||
YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore
|
||||
invoked (Brahma Reddy Battula via jlowe)
|
||||
|
||||
YARN-3641. NodeManager: stopRecoveryStore() shouldn't be skipped when
|
||||
exceptions happen in stopping NM's sub-services. (Junping Du via jlowe)
|
||||
|
||||
Release 2.7.0 - 2015-04-20
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -326,9 +326,14 @@ public class NodeManager extends CompositeService
|
|||
if (isStopping.getAndSet(true)) {
|
||||
return;
|
||||
}
|
||||
super.serviceStop();
|
||||
stopRecoveryStore();
|
||||
DefaultMetricsSystem.shutdown();
|
||||
try {
|
||||
super.serviceStop();
|
||||
DefaultMetricsSystem.shutdown();
|
||||
} finally {
|
||||
// YARN-3641: NM's services stop get failed shouldn't block the
|
||||
// release of NMLevelDBStore.
|
||||
stopRecoveryStore();
|
||||
}
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
|
|
Loading…
Reference in New Issue