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

HDFS-14924. RenameSnapshot not updating new modification time. Contributed by hemanthboyina

This commit is contained in:
Takanobu Asanuma 2019-11-22 13:48:02 +09:00
parent 9b6906fe91
commit b25e94ce29
10 changed files with 72 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirSnapshotOp.java
View File

@ -129,15 +129,17 @@ class FSDirSnapshotOp {
fsd.checkOwner(pc, iip);
}
verifySnapshotName(fsd, snapshotNewName, path);
// time of snapshot modification
final long now = Time.now();
fsd.writeLock();
try {
snapshotManager.renameSnapshot(iip, path, snapshotOldName,
snapshotNewName);
snapshotNewName, now);
} finally {
fsd.writeUnlock();
}
fsd.getEditLog().logRenameSnapshot(path, snapshotOldName,
snapshotNewName, logRetryCache);
snapshotNewName, logRetryCache, now);
}
static SnapshottableDirectoryStatus[] getSnapshottableDirListing(

12
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
View File

@ -1140,11 +1140,19 @@ public class FSEditLog implements LogsPurgeable {
logEdit(op);
}
/**
* Log that a snapshot is renamed.
* @param path Root of the snapshot.
* @param snapOldName Old name of the snapshot.
* @param snapNewName New name the snapshot will be renamed to.
* @param toLogRpcIds If it is logging RPC ids.
* @param mtime The snapshot modification time set by Time.now().
*/
void logRenameSnapshot(String path, String snapOldName, String snapNewName,
boolean toLogRpcIds) {
boolean toLogRpcIds, long mtime) {
RenameSnapshotOp op = RenameSnapshotOp.getInstance(cache.get())
.setSnapshotRoot(path).setSnapshotOldName(snapOldName)
.setSnapshotNewName(snapNewName);
.setSnapshotNewName(snapNewName).setSnapshotMTime(mtime);
logRpcIds(op, toLogRpcIds);
logEdit(op);
}

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
View File

@ -841,7 +841,7 @@ public class FSEditLogLoader {
INodesInPath iip = fsDir.getINodesInPath(snapshotRoot, DirOp.WRITE);
fsNamesys.getSnapshotManager().renameSnapshot(iip,
snapshotRoot, renameSnapshotOp.snapshotOldName,
renameSnapshotOp.snapshotNewName);
renameSnapshotOp.snapshotNewName, renameSnapshotOp.mtime);
if (toAddRetryCache) {
fsNamesys.addCacheEntry(renameSnapshotOp.rpcClientId,

22
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java
View File

@ -3606,6 +3606,9 @@ public abstract class FSEditLogOp {
String snapshotRoot;
String snapshotOldName;
String snapshotNewName;
/** Modification time of the edit set by Time.now(). */
long mtime;
RenameSnapshotOp() {
super(OP_RENAME_SNAPSHOT);
@ -3620,13 +3623,16 @@ public abstract class FSEditLogOp {
snapshotRoot = null;
snapshotOldName = null;
snapshotNewName = null;
mtime = 0L;
}
/* set the old name of the snapshot. */
RenameSnapshotOp setSnapshotOldName(String snapshotOldName) {
this.snapshotOldName = snapshotOldName;
return this;
}
/* set the new name of the snapshot. */
RenameSnapshotOp setSnapshotNewName(String snapshotNewName) {
this.snapshotNewName = snapshotNewName;
return this;
@ -3637,11 +3643,18 @@ public abstract class FSEditLogOp {
return this;
}
/* The snapshot rename time set by Time.now(). */
RenameSnapshotOp setSnapshotMTime(long mTime) {
this.mtime = mTime;
return this;
}
@Override
void readFields(DataInputStream in, int logVersion) throws IOException {
snapshotRoot = FSImageSerialization.readString(in);
snapshotOldName = FSImageSerialization.readString(in);
snapshotNewName = FSImageSerialization.readString(in);
mtime = FSImageSerialization.readLong(in);
// read RPC ids if necessary
readRpcIds(in, logVersion);
@ -3652,6 +3665,7 @@ public abstract class FSEditLogOp {
FSImageSerialization.writeString(snapshotRoot, out);
FSImageSerialization.writeString(snapshotOldName, out);
FSImageSerialization.writeString(snapshotNewName, out);
FSImageSerialization.writeLong(mtime, out);
writeRpcIds(rpcClientId, rpcCallId, out);
}
@ -3661,6 +3675,7 @@ public abstract class FSEditLogOp {
XMLUtils.addSaxString(contentHandler, "SNAPSHOTROOT", snapshotRoot);
XMLUtils.addSaxString(contentHandler, "SNAPSHOTOLDNAME", snapshotOldName);
XMLUtils.addSaxString(contentHandler, "SNAPSHOTNEWNAME", snapshotNewName);
XMLUtils.addSaxString(contentHandler, "MTIME", Long.toString(mtime));
appendRpcIdsToXml(contentHandler, rpcClientId, rpcCallId);
}
@ -3669,6 +3684,7 @@ public abstract class FSEditLogOp {
snapshotRoot = st.getValue("SNAPSHOTROOT");
snapshotOldName = st.getValue("SNAPSHOTOLDNAME");
snapshotNewName = st.getValue("SNAPSHOTNEWNAME");
this.mtime = Long.parseLong(st.getValue("MTIME"));
readRpcIdsFromXml(st);
}
@ -3681,7 +3697,9 @@ public abstract class FSEditLogOp {
.append(", snapshotOldName=")
.append(snapshotOldName)
.append(", snapshotNewName=")
.append(snapshotNewName);
.append(snapshotNewName)
.append(", mtime=")
.append(mtime);
appendRpcIdsToString(builder, rpcClientId, rpcCallId);
builder.append("]");
return builder.toString();

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
View File

@ -296,9 +296,17 @@ public class INodeDirectory extends INodeWithAdditionalFields
reclaimContext, this, snapshotName);
}
public void renameSnapshot(String path, String oldName, String newName)
throws SnapshotException {
getDirectorySnapshottableFeature().renameSnapshot(path, oldName, newName);
/**
* Rename a snapshot.
* @param path The directory path where the snapshot was taken.
* @param oldName Old name of the snapshot
* @param newName New name the snapshot will be renamed to
* @param mtime The snapshot modification time set by Time.now().
*/
public void renameSnapshot(String path, String oldName, String newName,
long mtime) throws SnapshotException {
getDirectorySnapshottableFeature().renameSnapshot(path, oldName, newName,
mtime);
}
/** add DirectorySnapshottableFeature */

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
View File

@ -112,12 +112,14 @@ public class DirectorySnapshottableFeature extends DirectoryWithSnapshotFeature
* Old name of the snapshot
* @param newName
* New name the snapshot will be renamed to
* @param mtime The snapshot modification time set by Time.now().
* @throws SnapshotException
* Throw SnapshotException when either the snapshot with the old
* name does not exist or a snapshot with the new name already
* exists
*/
public void renameSnapshot(String path, String oldName, String newName)
public void renameSnapshot(String path, String oldName, String newName,
long mtime)
throws SnapshotException {
final int indexOfOld = searchSnapshot(DFSUtil.string2Bytes(oldName));
if (indexOfOld < 0) {
@ -137,6 +139,7 @@ public class DirectorySnapshottableFeature extends DirectoryWithSnapshotFeature
Snapshot snapshot = snapshotsByNames.remove(indexOfOld);
final INodeDirectory ssRoot = snapshot.getRoot();
ssRoot.setLocalName(newNameBytes);
ssRoot.setModificationTime(mtime, Snapshot.CURRENT_STATE_ID);
indexOfNew = -indexOfNew - 1;
if (indexOfNew <= indexOfOld) {
snapshotsByNames.add(indexOfNew, snapshot);

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotManager.java
View File

@ -362,6 +362,7 @@ public class SnapshotManager implements SnapshotStatsMXBean {
* Old name of the snapshot
* @param newSnapshotName
* New name of the snapshot
* @param now is the snapshot modification time set by Time.now().
* @throws IOException
* Throw IOException when 1) the given path does not lead to an
* existing snapshottable directory, and/or 2) the snapshot with the
@ -369,10 +370,10 @@ public class SnapshotManager implements SnapshotStatsMXBean {
* a snapshot with the new name for the directory
*/
public void renameSnapshot(final INodesInPath iip, final String snapshotRoot,
final String oldSnapshotName, final String newSnapshotName)
final String oldSnapshotName, final String newSnapshotName, long now)
throws IOException {
final INodeDirectory srcRoot = getSnapshottableRoot(iip);
srcRoot.renameSnapshot(snapshotRoot, oldSnapshotName, newSnapshotName);
srcRoot.renameSnapshot(snapshotRoot, oldSnapshotName, newSnapshotName, now);
}
public int getNumSnapshottableDirs() {

18
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
View File

@ -19,6 +19,7 @@ package org.apache.hadoop.hdfs.server.namenode.snapshot;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@ -472,6 +473,23 @@ public class TestSnapshot {
newSnapshotStatus.getModificationTime());
}
@Test(timeout = 60000)
public void testRenameSnapshotMtime() throws Exception {
Path dir = new Path("/dir");
Path sub = new Path(dir, "sub");
Path subFile = new Path(sub, "file");
DFSTestUtil.createFile(hdfs, subFile, BLOCKSIZE, REPLICATION, seed);
hdfs.allowSnapshot(dir);
Path snapshotPath = hdfs.createSnapshot(dir, "s1");
FileStatus oldSnapshotStatus = hdfs.getFileStatus(snapshotPath);
hdfs.renameSnapshot(dir, "s1", "s2");
Path snapshotRenamePath = new Path("/dir/.snapshot/s2");
FileStatus newSnapshotStatus = hdfs.getFileStatus(snapshotRenamePath);
assertNotEquals(oldSnapshotStatus.getModificationTime(),
newSnapshotStatus.getModificationTime());
}
/**
* Prepare a list of modifications. A modification may be a file creation,
* file deletion, or a modification operation such as appending to an existing

BIN
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored
View File

Binary file not shown.

1
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
View File

@ -288,6 +288,7 @@
<SNAPSHOTROOT>/directory_mkdir</SNAPSHOTROOT>
<SNAPSHOTOLDNAME>snapshot1</SNAPSHOTOLDNAME>
<SNAPSHOTNEWNAME>snapshot2</SNAPSHOTNEWNAME>
<MTIME>1512607197715</MTIME>
<RPC_CLIENTID>cab1aa2d-e08a-4d2f-8216-76e167eccd94</RPC_CLIENTID>
<RPC_CALLID>55</RPC_CALLID>
</DATA>