hadoop git commit: Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7285-merge babc5182c - b2049f95a (forced update)
Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b2049f95
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b2049f95
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b2049f95
Branch: refs/heads/HDFS-7285-merge
Commit: b2049f95a657333ab50431656d43927604c2c1d5
Parents: cc10933
Author: Zhe Zhang zhezh...@cloudera.com
Authored: Thu Aug 20 11:33:55 2015 -0700
Committer: Zhe Zhang zhezh...@cloudera.com
Committed: Mon Aug 24 09:52:56 2015 -0700
--
.../src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java| 1 -
.../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 4 +---
.../apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java| 2 +-
.../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSDirTruncateOp.java | 5 ++---
.../apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java| 2 +-
.../java/org/apache/hadoop/hdfs/protocol/TestLayoutVersion.java | 3 ++-
.../org/apache/hadoop/hdfs/server/balancer/TestBalancer.java| 1 +
10 files changed, 14 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2049f95/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index abc37c9..35c4f9a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -44,7 +44,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.ByteBufferReadable;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2049f95/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index 5d03fd2..00f3a65 100755
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -24,8 +24,6 @@ import java.nio.channels.ClosedChannelException;
import java.util.EnumSet;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
@@ -358,7 +356,7 @@ public class DFSOutputStream extends FSOutputSummer
String[] favoredNodes) throws IOException {
TraceScope scope =
dfsClient.getPathTraceScope(newStreamForAppend, src);
-if(stat.getReplication() == 0) {
+if(stat.getErasureCodingPolicy() != null) {
throw new IOException(Not support appending to a striping layout file
yet.);
}
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2049f95/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
index 9387176..bf11914 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.util.LightWeightGSet;
* where the replicas of the block, or blocks belonging to the erasure coding
* block group, are stored.
*/
-public
hadoop git commit: Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7285-merge 6fed3c5f0 - babc5182c (forced update)
Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/babc5182
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/babc5182
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/babc5182
Branch: refs/heads/HDFS-7285-merge
Commit: babc5182c2f646bdb69061e8e04c61cb2e149b18
Parents: cc10933
Author: Zhe Zhang zhezh...@cloudera.com
Authored: Thu Aug 20 11:33:55 2015 -0700
Committer: Zhe Zhang zhezh...@cloudera.com
Committed: Sun Aug 23 22:46:47 2015 -0700
--
.../src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java| 1 -
.../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 4 +---
.../apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java| 2 +-
.../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSDirTruncateOp.java | 5 ++---
.../apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java| 2 +-
.../java/org/apache/hadoop/hdfs/protocol/TestLayoutVersion.java | 3 ++-
9 files changed, 13 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/babc5182/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index abc37c9..35c4f9a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -44,7 +44,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.ByteBufferReadable;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/babc5182/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index 5d03fd2..00f3a65 100755
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -24,8 +24,6 @@ import java.nio.channels.ClosedChannelException;
import java.util.EnumSet;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
@@ -358,7 +356,7 @@ public class DFSOutputStream extends FSOutputSummer
String[] favoredNodes) throws IOException {
TraceScope scope =
dfsClient.getPathTraceScope(newStreamForAppend, src);
-if(stat.getReplication() == 0) {
+if(stat.getErasureCodingPolicy() != null) {
throw new IOException(Not support appending to a striping layout file
yet.);
}
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/babc5182/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
index 9387176..bf11914 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.util.LightWeightGSet;
* where the replicas of the block, or blocks belonging to the erasure coding
* block group, are stored.
*/
-public abstract class BlockInfo extends Block
+public abstract class BlockInfo
hadoop git commit: Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7285-merge 601ca5375 - 6fed3c5f0 (forced update)
Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6fed3c5f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6fed3c5f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6fed3c5f
Branch: refs/heads/HDFS-7285-merge
Commit: 6fed3c5f034e487cf34730469d9427e101bfd102
Parents: cc10933
Author: Zhe Zhang zhezh...@cloudera.com
Authored: Thu Aug 20 11:33:55 2015 -0700
Committer: Zhe Zhang zhezh...@cloudera.com
Committed: Fri Aug 21 00:47:02 2015 -0700
--
.../src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java| 1 -
.../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 4 +---
.../apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java| 2 +-
.../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSDirTruncateOp.java | 5 ++---
.../apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java| 2 +-
8 files changed, 11 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6fed3c5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index abc37c9..35c4f9a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -44,7 +44,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.ByteBufferReadable;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6fed3c5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index 5d03fd2..00f3a65 100755
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -24,8 +24,6 @@ import java.nio.channels.ClosedChannelException;
import java.util.EnumSet;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
@@ -358,7 +356,7 @@ public class DFSOutputStream extends FSOutputSummer
String[] favoredNodes) throws IOException {
TraceScope scope =
dfsClient.getPathTraceScope(newStreamForAppend, src);
-if(stat.getReplication() == 0) {
+if(stat.getErasureCodingPolicy() != null) {
throw new IOException(Not support appending to a striping layout file
yet.);
}
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6fed3c5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
index 9387176..bf11914 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.util.LightWeightGSet;
* where the replicas of the block, or blocks belonging to the erasure coding
* block group, are stored.
*/
-public abstract class BlockInfo extends Block
+public abstract class BlockInfo extends Block
implements LightWeightGSet.LinkedElement {
public static
hadoop git commit: Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7285-merge cc10933a0 - d94493b69
Fix minor issues when merging trunk (DFS-6407) to HDFS-7285 branch.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d94493b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d94493b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d94493b6
Branch: refs/heads/HDFS-7285-merge
Commit: d94493b69fd8eef585e454fd6aa61b20c3195fe3
Parents: cc10933
Author: Zhe Zhang zhezh...@cloudera.com
Authored: Thu Aug 20 11:33:55 2015 -0700
Committer: Zhe Zhang zhezh...@cloudera.com
Committed: Thu Aug 20 11:40:07 2015 -0700
--
.../src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java| 1 -
.../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 4 +---
.../apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java| 2 +-
.../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSDirTruncateOp.java | 5 ++---
.../apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java| 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java| 2 +-
8 files changed, 11 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d94493b6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index abc37c9..35c4f9a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -44,7 +44,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.ByteBufferReadable;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d94493b6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index 5d03fd2..6381bf3 100755
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -24,8 +24,6 @@ import java.nio.channels.ClosedChannelException;
import java.util.EnumSet;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
@@ -358,7 +356,7 @@ public class DFSOutputStream extends FSOutputSummer
String[] favoredNodes) throws IOException {
TraceScope scope =
dfsClient.getPathTraceScope(newStreamForAppend, src);
-if(stat.getReplication() == 0) {
+if(stat.getErasureCodingPolicy() == null) {
throw new IOException(Not support appending to a striping layout file
yet.);
}
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d94493b6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
index 9387176..bf11914 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.util.LightWeightGSet;
* where the replicas of the block, or blocks belonging to the erasure coding
* block group, are stored.
*/
-public abstract class BlockInfo extends Block
+public abstract class BlockInfo extends Block
implements LightWeightGSet.LinkedElement {
public static final
