HDFS-8305: HDFS INotify: the destination field of RenameOp should always end with the file name (cmccabe)
This commit is contained in:
parent
b7dd3a4f04
commit
fcd4cb7516
|
@ -682,6 +682,9 @@ Release 2.7.1 - UNRELEASED
|
|||
HDFS-8091: ACLStatus and XAttributes should be presented to
|
||||
INodeAttributesProvider before returning to client (asuresh)
|
||||
|
||||
HDFS-8305: HDFS INotify: the destination field of RenameOp should always
|
||||
end with the file name (cmccabe)
|
||||
|
||||
Release 2.7.0 - 2015-04-20
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -476,7 +476,7 @@ class FSDirRenameOp {
|
|||
fsd.writeUnlock();
|
||||
}
|
||||
if (stat) {
|
||||
fsd.getEditLog().logRename(src, dst, mtime, logRetryCache);
|
||||
fsd.getEditLog().logRename(src, actualDst, mtime, logRetryCache);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -815,7 +815,9 @@ public class FSEditLog implements LogsPurgeable {
|
|||
}
|
||||
|
||||
/**
|
||||
* Add rename record to edit log
|
||||
* Add rename record to edit log.
|
||||
*
|
||||
* The destination should be the file name, not the destination directory.
|
||||
* TODO: use String parameters until just before writing to disk
|
||||
*/
|
||||
void logRename(String src, String dst, long timestamp, boolean toLogRpcIds) {
|
||||
|
@ -826,9 +828,11 @@ public class FSEditLog implements LogsPurgeable {
|
|||
logRpcIds(op, toLogRpcIds);
|
||||
logEdit(op);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Add rename record to edit log
|
||||
* Add rename record to edit log.
|
||||
*
|
||||
* The destination should be the file name, not the destination directory.
|
||||
*/
|
||||
void logRename(String src, String dst, long timestamp, boolean toLogRpcIds,
|
||||
Options.Rename... options) {
|
||||
|
|
|
@ -135,6 +135,7 @@ public class TestDFSInotifyEventInputStream {
|
|||
client.setAcl("/file5", AclEntry.parseAclSpec(
|
||||
"user::rwx,user:foo:rw-,group::r--,other::---", true));
|
||||
client.removeAcl("/file5"); // SetAclOp -> MetadataUpdateEvent
|
||||
client.rename("/file5", "/dir"); // RenameOldOp -> RenameEvent
|
||||
|
||||
EventBatch batch = null;
|
||||
|
||||
|
@ -343,6 +344,16 @@ public class TestDFSInotifyEventInputStream {
|
|||
Event.MetadataUpdateEvent.MetadataType.ACLS);
|
||||
Assert.assertTrue(mue8.getAcls() == null);
|
||||
|
||||
// RenameOp (2)
|
||||
batch = waitForNextEvents(eis);
|
||||
Assert.assertEquals(1, batch.getEvents().length);
|
||||
txid = checkTxid(batch, txid);
|
||||
Assert.assertTrue(batch.getEvents()[0].getEventType() == Event.EventType.RENAME);
|
||||
Event.RenameEvent re3 = (Event.RenameEvent) batch.getEvents()[0];
|
||||
Assert.assertTrue(re3.getDstPath().equals("/dir/file5"));
|
||||
Assert.assertTrue(re3.getSrcPath().equals("/file5"));
|
||||
Assert.assertTrue(re.getTimestamp() > 0);
|
||||
|
||||
// Returns null when there are no further events
|
||||
Assert.assertTrue(eis.poll() == null);
|
||||
|
||||
|
|
Loading…
Reference in New Issue