Clone
Anu Engineer
committed
on 15 Feb 18
Merge branch 'trunk' into HDFS-7240
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
hadoop-hdfs-project… Show more
Merge branch 'trunk' into HDFS-7240

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java

Added the following code in:

hadoop/ozone/container/common/impl/ContainerManagerImpl.java

 @Override

 public void readLockInterruptibly() throws InterruptedException {

   this.lock.readLock().lockInterruptibly();

 }

and Manually updated  the value of version in

modified: hadoop-tools/hadoop-ozone/pom.xml

to

<version>3.2.0-SNAPSHOT</version>

Show less