HDFS-7939. Two fsimage_rollback_* files are created which are not deleted after rollback. (Contributed by J.Andreina)

This commit is contained in:
Vinayakumar B 2015-04-10 11:12:07 +05:30
parent 0959b67f1a
commit 987c9e12e1
2 changed files with 5 additions and 0 deletions

View File

@ -466,6 +466,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8091: ACLStatus and XAttributes should be presented to HDFS-8091: ACLStatus and XAttributes should be presented to
INodeAttributesProvider before returning to client (asuresh) INodeAttributesProvider before returning to client (asuresh)
HDFS-7939. Two fsimage_rollback_* files are created which are not deleted
after rollback. (J.Andreina via vinayakumarb)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -707,6 +707,8 @@ private void rollingRollback(long discardSegmentTxId, long ckptId)
true); true);
// purge all the checkpoints after the marker // purge all the checkpoints after the marker
archivalManager.purgeCheckpoinsAfter(NameNodeFile.IMAGE, ckptId); archivalManager.purgeCheckpoinsAfter(NameNodeFile.IMAGE, ckptId);
// HDFS-7939: purge all old fsimage_rollback_*
archivalManager.purgeCheckpoints(NameNodeFile.IMAGE_ROLLBACK);
String nameserviceId = DFSUtil.getNamenodeNameServiceId(conf); String nameserviceId = DFSUtil.getNamenodeNameServiceId(conf);
if (HAUtil.isHAEnabled(conf, nameserviceId)) { if (HAUtil.isHAEnabled(conf, nameserviceId)) {
// close the editlog since it is currently open for write // close the editlog since it is currently open for write