HDFS-7340. Make rollingUpgrade start/finalize idempotent. Contributed by Jing Zhao.
This commit is contained in:
parent
2bb327eb93
commit
3dfd6e68fe
|
@ -996,6 +996,8 @@ Release 2.6.0 - UNRELEASED
|
|||
HDFS-7147. Update archival storage user documentation.
|
||||
(Tsz Wo Nicholas Sze via wheat9)
|
||||
|
||||
HDFS-7340. Make rollingUpgrade start/finalize idempotent. (jing9)
|
||||
|
||||
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
|
||||
|
||||
HDFS-6387. HDFS CLI admin tool for creating & deleting an
|
||||
|
|
|
@ -8293,6 +8293,9 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
|||
writeLock();
|
||||
try {
|
||||
checkOperation(OperationCategory.WRITE);
|
||||
if (isRollingUpgrade()) {
|
||||
return rollingUpgradeInfo;
|
||||
}
|
||||
long startTime = now();
|
||||
if (!haEnabled) { // for non-HA, we require NN to be in safemode
|
||||
startRollingUpgradeInternalForNonHA(startTime);
|
||||
|
@ -8401,13 +8404,16 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
|||
}
|
||||
}
|
||||
|
||||
RollingUpgradeInfo finalizeRollingUpgrade() throws IOException {
|
||||
void finalizeRollingUpgrade() throws IOException {
|
||||
checkSuperuserPrivilege();
|
||||
checkOperation(OperationCategory.WRITE);
|
||||
writeLock();
|
||||
final RollingUpgradeInfo returnInfo;
|
||||
try {
|
||||
checkOperation(OperationCategory.WRITE);
|
||||
if (!isRollingUpgrade()) {
|
||||
return;
|
||||
}
|
||||
checkNameNodeSafeMode("Failed to finalize rolling upgrade");
|
||||
|
||||
returnInfo = finalizeRollingUpgradeInternal(now());
|
||||
|
@ -8431,16 +8437,11 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
|
|||
if (auditLog.isInfoEnabled() && isExternalInvocation()) {
|
||||
logAuditEvent(true, "finalizeRollingUpgrade", null, null, null);
|
||||
}
|
||||
return returnInfo;
|
||||
return;
|
||||
}
|
||||
|
||||
RollingUpgradeInfo finalizeRollingUpgradeInternal(long finalizeTime)
|
||||
throws RollingUpgradeException {
|
||||
if (!isRollingUpgrade()) {
|
||||
throw new RollingUpgradeException(
|
||||
"Failed to finalize rolling upgrade since there is no rolling upgrade in progress.");
|
||||
}
|
||||
|
||||
final long startTime = rollingUpgradeInfo.getStartTime();
|
||||
rollingUpgradeInfo = null;
|
||||
return new RollingUpgradeInfo(blockPoolId, false, startTime, finalizeTime);
|
||||
|
|
|
@ -959,7 +959,8 @@ class NameNodeRpcServer implements NamenodeProtocols {
|
|||
case PREPARE:
|
||||
return namesystem.startRollingUpgrade();
|
||||
case FINALIZE:
|
||||
return namesystem.finalizeRollingUpgrade();
|
||||
namesystem.finalizeRollingUpgrade();
|
||||
return null;
|
||||
default:
|
||||
throw new UnsupportedActionException(action + " is not yet supported.");
|
||||
}
|
||||
|
|
|
@ -334,7 +334,8 @@ public class DFSAdmin extends FsShell {
|
|||
out.println(info);
|
||||
}
|
||||
} else {
|
||||
out.println("There is no rolling upgrade in progress.");
|
||||
out.println("There is no rolling upgrade in progress or rolling " +
|
||||
"upgrade has already been finalized.");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -356,7 +357,7 @@ public class DFSAdmin extends FsShell {
|
|||
Preconditions.checkState(info.isStarted());
|
||||
break;
|
||||
case FINALIZE:
|
||||
Preconditions.checkState(info.isFinalized());
|
||||
Preconditions.checkState(info == null || info.isFinalized());
|
||||
break;
|
||||
}
|
||||
printMessage(info, System.out);
|
||||
|
|
|
@ -239,9 +239,9 @@ public class TestRollingUpgrade {
|
|||
Assert.assertTrue(dfs2.exists(baz));
|
||||
|
||||
//finalize rolling upgrade
|
||||
final RollingUpgradeInfo finalize = dfs2.rollingUpgrade(RollingUpgradeAction.FINALIZE);
|
||||
LOG.info("FINALIZE: " + finalize);
|
||||
Assert.assertEquals(info1.getStartTime(), finalize.getStartTime());
|
||||
final RollingUpgradeInfo finalize = dfs2.rollingUpgrade(
|
||||
RollingUpgradeAction.FINALIZE);
|
||||
Assert.assertNull(finalize);
|
||||
|
||||
LOG.info("RESTART cluster 2 with regular startup option");
|
||||
cluster2.getNameNodeInfos()[0].setStartOpt(StartupOption.REGULAR);
|
||||
|
@ -385,7 +385,7 @@ public class TestRollingUpgrade {
|
|||
Assert.assertTrue(fsimage.hasRollbackFSImage());
|
||||
|
||||
info = dfs.rollingUpgrade(RollingUpgradeAction.FINALIZE);
|
||||
Assert.assertTrue(info.isFinalized());
|
||||
Assert.assertNull(info);
|
||||
Assert.assertTrue(dfs.exists(foo));
|
||||
|
||||
// Once finalized, there should be no more fsimage for rollbacks.
|
||||
|
|
Loading…
Reference in New Issue