[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-31 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r373685220
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SwapBlockListOp.java
 ##
 @@ -130,15 +129,10 @@ private static void validateInode(INodesInPath srcIIP)
 
 String errorPrefix = "DIR* FSDirectory.swapBlockList: ";
 String error = "Swap Block List input ";
-final INode srcInode = srcIIP.getLastINode();
 
-// Check if INode is null.
-if (srcInode == null) {
-  error  += srcIIP.getPath() + " is not found.";
-  NameNode.stateChangeLog.warn(errorPrefix + error);
-  throw new FileNotFoundException(error);
-}
+FSDirectory.resolveLastINode(srcIIP);
 
+final INode srcInode = srcIIP.getLastINode();
 
 Review comment:
   Thanks, good catch. Missed it.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org



[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-30 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r373237177
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SwapBlockListOp.java
 ##
 @@ -0,0 +1,190 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileAlreadyExistsException;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp;
+import org.apache.hadoop.hdfs.server.namenode.INodeFile.HeaderFormat;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
+import org.apache.hadoop.util.Time;
+
+/**
+ * Class to carry out the operation of swapping blocks from one file to 
another.
+ * Along with swapping blocks, we can also optionally swap the block layout
+ * of a file header, which is useful for client operations like converting
+ * replicated to EC file.
+ */
+public final class SwapBlockListOp {
+
+  private SwapBlockListOp() {
+  }
+
+  static SwapBlockListResult swapBlocks(FSDirectory fsd, FSPermissionChecker 
pc,
+  String src, String dst, long genTimestamp)
+  throws IOException {
+
+final INodesInPath srcIIP = fsd.resolvePath(pc, src, DirOp.WRITE);
+final INodesInPath dstIIP = fsd.resolvePath(pc, dst, DirOp.WRITE);
+if (fsd.isPermissionEnabled()) {
+  fsd.checkAncestorAccess(pc, srcIIP, FsAction.WRITE);
+  fsd.checkAncestorAccess(pc, dstIIP, FsAction.WRITE);
+}
+if (NameNode.stateChangeLog.isDebugEnabled()) {
+  NameNode.stateChangeLog.debug("DIR* FSDirectory.swapBlockList: "
+  + srcIIP.getPath() + " and " + dstIIP.getPath());
+}
+SwapBlockListResult result = null;
+fsd.writeLock();
+try {
+  result = swapBlockList(fsd, srcIIP, dstIIP, genTimestamp);
+} finally {
+  fsd.writeUnlock();
+}
+return result;
+  }
+
+  private static SwapBlockListResult swapBlockList(FSDirectory fsd,
+final INodesInPath srcIIP,
+final INodesInPath dstIIP,
+long genTimestamp)
+  throws IOException {
+
+assert fsd.hasWriteLock();
+validateInode(srcIIP);
+validateInode(dstIIP);
+fsd.ezManager.checkMoveValidity(srcIIP, dstIIP);
+
+final String src = srcIIP.getPath();
+final String dst = dstIIP.getPath();
+if (dst.equals(src)) {
+  throw new FileAlreadyExistsException("The source " + src +
+  " and destination " + dst + " are the same");
+}
+
+INodeFile srcINodeFile = (INodeFile) srcIIP.getLastINode();
+INodeFile dstINodeFile = (INodeFile) dstIIP.getLastINode();
+
+String errorPrefix = "DIR* FSDirectory.swapBlockList: ";
+String error = "Swap Block List destination file ";
+BlockInfo lastBlock = dstINodeFile.getLastBlock();
+if (lastBlock != null && lastBlock.getGenerationStamp() != genTimestamp) {
+  error  += dstIIP.getPath() +
+  " has last block with different gen timestamp.";
+  NameNode.stateChangeLog.warn(errorPrefix + error);
+  throw new IOException(error);
+}
+
+long mtime = Time.now();
+BlockInfo[] dstINodeFileBlocks = dstINodeFile.getBlocks();
+dstINodeFile.replaceBlocks(srcINodeFile.getBlocks());
+srcINodeFile.replaceBlocks(dstINodeFileBlocks);
 
 Review comment:
   @ayushtkn I had to store dstINodeFile.getBlocks() into a variable because 
without that, after line 101, I would have lost the original dstINodeFile 
blocks. For scrInodeFile, I don't need that. So I left that out. 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact 

[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-30 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r373236453
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 ##
 @@ -2667,4 +2667,15 @@ public Long getNextSPSPath() throws IOException {
 }
 return namesystem.getBlockManager().getSPSManager().getNextPathId();
   }
+
+  public boolean swapBlockList(String src, String dst, long maxTimestamp)
+  throws IOException {
+checkNNStartup();
+if (stateChangeLog.isDebugEnabled()) {
+  stateChangeLog.debug("*DIR* NameNode.swapBlockList: {} and {}", src, 
dst);
+}
+namesystem.checkOperation(OperationCategory.WRITE);
 
 Review comment:
   Fixed this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org



[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-30 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r373236481
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SwapBlockListOp.java
 ##
 @@ -0,0 +1,190 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileAlreadyExistsException;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp;
+import org.apache.hadoop.hdfs.server.namenode.INodeFile.HeaderFormat;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
+import org.apache.hadoop.util.Time;
+
+/**
+ * Class to carry out the operation of swapping blocks from one file to 
another.
+ * Along with swapping blocks, we can also optionally swap the block layout
+ * of a file header, which is useful for client operations like converting
+ * replicated to EC file.
+ */
+public final class SwapBlockListOp {
+
+  private SwapBlockListOp() {
+  }
+
+  static SwapBlockListResult swapBlocks(FSDirectory fsd, FSPermissionChecker 
pc,
+  String src, String dst, long genTimestamp)
+  throws IOException {
+
+final INodesInPath srcIIP = fsd.resolvePath(pc, src, DirOp.WRITE);
+final INodesInPath dstIIP = fsd.resolvePath(pc, dst, DirOp.WRITE);
+if (fsd.isPermissionEnabled()) {
+  fsd.checkAncestorAccess(pc, srcIIP, FsAction.WRITE);
+  fsd.checkAncestorAccess(pc, dstIIP, FsAction.WRITE);
+}
+if (NameNode.stateChangeLog.isDebugEnabled()) {
+  NameNode.stateChangeLog.debug("DIR* FSDirectory.swapBlockList: "
+  + srcIIP.getPath() + " and " + dstIIP.getPath());
+}
+SwapBlockListResult result = null;
 
 Review comment:
   Fixed this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org



[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-30 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r373236528
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SwapBlockListOp.java
 ##
 @@ -0,0 +1,190 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileAlreadyExistsException;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp;
+import org.apache.hadoop.hdfs.server.namenode.INodeFile.HeaderFormat;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
+import org.apache.hadoop.util.Time;
+
+/**
+ * Class to carry out the operation of swapping blocks from one file to 
another.
+ * Along with swapping blocks, we can also optionally swap the block layout
+ * of a file header, which is useful for client operations like converting
+ * replicated to EC file.
+ */
+public final class SwapBlockListOp {
+
+  private SwapBlockListOp() {
+  }
+
+  static SwapBlockListResult swapBlocks(FSDirectory fsd, FSPermissionChecker 
pc,
+  String src, String dst, long genTimestamp)
+  throws IOException {
+
+final INodesInPath srcIIP = fsd.resolvePath(pc, src, DirOp.WRITE);
+final INodesInPath dstIIP = fsd.resolvePath(pc, dst, DirOp.WRITE);
+if (fsd.isPermissionEnabled()) {
+  fsd.checkAncestorAccess(pc, srcIIP, FsAction.WRITE);
+  fsd.checkAncestorAccess(pc, dstIIP, FsAction.WRITE);
+}
+if (NameNode.stateChangeLog.isDebugEnabled()) {
+  NameNode.stateChangeLog.debug("DIR* FSDirectory.swapBlockList: "
+  + srcIIP.getPath() + " and " + dstIIP.getPath());
+}
+SwapBlockListResult result = null;
+fsd.writeLock();
+try {
+  result = swapBlockList(fsd, srcIIP, dstIIP, genTimestamp);
+} finally {
+  fsd.writeUnlock();
+}
+return result;
+  }
+
+  private static SwapBlockListResult swapBlockList(FSDirectory fsd,
+final INodesInPath srcIIP,
+final INodesInPath dstIIP,
+long genTimestamp)
+  throws IOException {
+
+assert fsd.hasWriteLock();
+validateInode(srcIIP);
+validateInode(dstIIP);
+fsd.ezManager.checkMoveValidity(srcIIP, dstIIP);
+
+final String src = srcIIP.getPath();
+final String dst = dstIIP.getPath();
+if (dst.equals(src)) {
+  throw new FileAlreadyExistsException("The source " + src +
+  " and destination " + dst + " are the same");
+}
+
+INodeFile srcINodeFile = (INodeFile) srcIIP.getLastINode();
 
 Review comment:
   Fixed this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org



[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-30 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r373236566
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSwapBlockList.java
 ##
 @@ -0,0 +1,257 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.INodeFile.HeaderFormat;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotTestHelper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test SwapBlockListOp working.
+ */
+public class TestSwapBlockList {
+
+  private static final short REPLICATION = 3;
+
+  private static final long SEED = 0;
+  private final Path rootDir = new Path("/" + getClass().getSimpleName());
+
+  private final Path subDir1 = new Path(rootDir, "dir1");
+  private final Path file1 = new Path(subDir1, "file1");
+  private final Path file2 = new Path(subDir1, "file2");
+
+  private final Path subDir11 = new Path(subDir1, "dir11");
+  private final Path file3 = new Path(subDir11, "file3");
+
+  private final Path subDir2 = new Path(rootDir, "dir2");
+  private final Path file4 = new Path(subDir2, "file4");
+
+  private Configuration conf;
+  private MiniDFSCluster cluster;
+  private FSNamesystem fsn;
+  private FSDirectory fsdir;
+
+  private DistributedFileSystem hdfs;
+
+  @Before
+  public void setUp() throws Exception {
+conf = new Configuration();
+conf.setInt(DFSConfigKeys.DFS_NAMENODE_MAX_XATTRS_PER_INODE_KEY, 2);
+cluster = new MiniDFSCluster.Builder(conf)
+.numDataNodes(REPLICATION)
+.build();
+cluster.waitActive();
+
+fsn = cluster.getNamesystem();
+fsdir = fsn.getFSDirectory();
+
+hdfs = cluster.getFileSystem();
+
+hdfs.mkdirs(subDir2);
+
+DFSTestUtil.createFile(hdfs, file1, 1024, REPLICATION, SEED);
+DFSTestUtil.createFile(hdfs, file2, 1024, REPLICATION, SEED);
+DFSTestUtil.createFile(hdfs, file3, 1024, REPLICATION, SEED);
+DFSTestUtil.createFile(hdfs, file4, 1024, REPLICATION, SEED);
+
+  }
+
+  @After
+  public void tearDown() throws Exception {
+if (cluster != null) {
+  cluster.shutdown();
+}
+  }
+
+  @Test
+  public void testInputValidation() throws Exception {
+
+// Source file not found.
+try {
+  fsn.swapBlockList("/TestSwapBlockList/dir1/fileXYZ",
+  "/TestSwapBlockList/dir1/dir11/file3", 0L);
+  Assert.fail();
+} catch (IOException ioEx) {
+  Assert.assertTrue(ioEx instanceof FileNotFoundException);
+  Assert.assertTrue(
+  ioEx.getMessage().contains("/TestSwapBlockList/dir1/fileXYZ"));
+}
 
 Review comment:
   Fixed this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org



[GitHub] [hadoop] avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 'swapBlockList' operation to Namenode.

2020-01-29 Thread GitBox
avijayanhwx commented on a change in pull request #1819: HDFS-14989. Add a 
'swapBlockList' operation to Namenode.
URL: https://github.com/apache/hadoop/pull/1819#discussion_r372649126
 
 

 ##
 File path: 
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SwapBlockListOp.java
 ##
 @@ -0,0 +1,190 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdfs.server.namenode;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.hadoop.fs.FileAlreadyExistsException;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.permission.FsAction;
+import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo;
+import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp;
+import org.apache.hadoop.hdfs.server.namenode.INodeFile.HeaderFormat;
+import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
+import org.apache.hadoop.util.Time;
+
+/**
+ * Class to carry out the operation of swapping blocks from one file to 
another.
+ * Along with swapping blocks, we can also optionally swap the block layout
+ * of a file header, which is useful for client operations like converting
+ * replicated to EC file.
+ */
+public final class SwapBlockListOp {
+
+  private SwapBlockListOp() {
+  }
+
+  static SwapBlockListResult swapBlocks(FSDirectory fsd, FSPermissionChecker 
pc,
+  String src, String dst, long genTimestamp)
+  throws IOException {
+
+final INodesInPath srcIIP = fsd.resolvePath(pc, src, DirOp.WRITE);
+final INodesInPath dstIIP = fsd.resolvePath(pc, dst, DirOp.WRITE);
+if (fsd.isPermissionEnabled()) {
+  fsd.checkAncestorAccess(pc, srcIIP, FsAction.WRITE);
+  fsd.checkAncestorAccess(pc, dstIIP, FsAction.WRITE);
+}
+if (NameNode.stateChangeLog.isDebugEnabled()) {
+  NameNode.stateChangeLog.debug("DIR* FSDirectory.swapBlockList: "
+  + srcIIP.getPath() + " and " + dstIIP.getPath());
+}
+SwapBlockListResult result = null;
+fsd.writeLock();
+try {
+  result = swapBlockList(fsd, srcIIP, dstIIP, genTimestamp);
+} finally {
+  fsd.writeUnlock();
+}
+return result;
+  }
+
+  private static SwapBlockListResult swapBlockList(FSDirectory fsd,
+final INodesInPath srcIIP,
+final INodesInPath dstIIP,
+long genTimestamp)
+  throws IOException {
+
+assert fsd.hasWriteLock();
+validateInode(srcIIP);
+validateInode(dstIIP);
+fsd.ezManager.checkMoveValidity(srcIIP, dstIIP);
+
+final String src = srcIIP.getPath();
+final String dst = dstIIP.getPath();
+if (dst.equals(src)) {
+  throw new FileAlreadyExistsException("The source " + src +
+  " and destination " + dst + " are the same");
+}
+
+INodeFile srcINodeFile = (INodeFile) srcIIP.getLastINode();
+INodeFile dstINodeFile = (INodeFile) dstIIP.getLastINode();
+
+String errorPrefix = "DIR* FSDirectory.swapBlockList: ";
+String error = "Swap Block List destination file ";
+BlockInfo lastBlock = dstINodeFile.getLastBlock();
+if (lastBlock != null && lastBlock.getGenerationStamp() != genTimestamp) {
+  error  += dstIIP.getPath() +
+  " has last block with different gen timestamp.";
+  NameNode.stateChangeLog.warn(errorPrefix + error);
+  throw new IOException(error);
+}
+
+long mtime = Time.now();
+BlockInfo[] dstINodeFileBlocks = dstINodeFile.getBlocks();
+dstINodeFile.replaceBlocks(srcINodeFile.getBlocks());
+srcINodeFile.replaceBlocks(dstINodeFileBlocks);
 
 Review comment:
   @ayushtkn I don't quite understand the issue here. I implemented a temp 
variable based swap mechanism. Could you explain it more?


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services