HDFS-6291. FSImage may be left unclosed in BootstrapStandby#doRun() ( Contributed by Sanghyun Yun)

(cherry picked from commit e5e492a963)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
This commit is contained in:
Vinayakumar B 2015-05-08 11:25:24 +05:30 committed by Konstantin V Shvachko
parent 61ba70c978
commit b6afb4a951
2 changed files with 5 additions and 1 deletions

View File

@ -317,6 +317,9 @@ Release 2.7.4 - UNRELEASED
HDFS-11377. Balancer hung due to no available mover threads. (yunjiong zhao)
HDFS-6291. FSImage may be left unclosed in BootstrapStandby#doRun()
(Sanghyun Yun via vinayakumarb)
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES

View File

@ -322,8 +322,9 @@ public class BootstrapStandby implements Tool, Configurable {
// Write seen_txid to the formatted image directories.
storage.writeTransactionIdFileToStorage(imageTxId, NameNodeDirType.IMAGE);
} catch (IOException ioe) {
image.close();
throw ioe;
} finally {
image.close();
}
return 0;
}