hadoop git commit: HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck. Contributed by Anu Engineer and Haohui Mai.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 530c2ef91 -> 86c0c6b04
HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck.
Contributed by Anu Engineer and Haohui Mai.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86c0c6b0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86c0c6b0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86c0c6b0
Branch: refs/heads/branch-2.7
Commit: 86c0c6b0446a29e2551a2b207ddfc25051a0cd47
Parents: 530c2ef
Author: Haohui Mai
Authored: Mon Mar 30 11:59:21 2015 -0700
Committer: Haohui Mai
Committed: Mon Mar 30 12:16:25 2015 -0700
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 2 +-
.../hdfs/protocol/datatransfer/PipelineAck.java | 31 ---
.../hdfs/server/datanode/BlockReceiver.java | 2 +-
.../src/main/proto/datatransfer.proto | 3 +-
.../hadoop/hdfs/TestDataTransferProtocol.java | 32
6 files changed, 59 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/86c0c6b0/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index b96b24e..90efc99 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -941,6 +941,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7963. Fix expected tracing spans in TestTracing along with HDFS-7054.
(Masatake Iwasaki via kihwal)
+HDFS-7748. Separate ECN flags from the Status in the
DataTransferPipelineAck.
+(Anu Engineer and Haohui Mai via wheat9)
+
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
http://git-wip-us.apache.org/repos/asf/hadoop/blob/86c0c6b0/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 a1b220a..f105530 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
@@ -747,7 +747,7 @@ public class DFSOutputStream extends FSOutputSummer
// processes response status from datanodes.
for (int i = ack.getNumOfReplies()-1; i >=0 &&
dfsClient.clientRunning; i--) {
final Status reply = PipelineAck.getStatusFromHeader(ack
-.getReply(i));
+.getHeaderFlag(i));
// Restart will not be treated differently unless it is
// the local node or the only one in the pipeline.
if (PipelineAck.isRestartOOBStatus(reply) &&
http://git-wip-us.apache.org/repos/asf/hadoop/blob/86c0c6b0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
index 35e5bb8..9bd4115 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
@@ -130,13 +130,16 @@ public class PipelineAck {
*/
public PipelineAck(long seqno, int[] replies,
long downstreamAckTimeNanos) {
-ArrayList replyList = Lists.newArrayList();
+ArrayList statusList = Lists.newArrayList();
+ArrayList flagList = Lists.newArrayList();
for (int r : replies) {
- replyList.add(r);
+ statusList.add(StatusFormat.getStatus(r));
+ flagList.add(r);
}
proto = PipelineAckProto.newBuilder()
.setSeqno(seqno)
- .addAllReply(replyList)
+ .addAllReply(statusList)
+ .addAllFlag(flagList)
.setDownstreamAckTimeNanos(downstreamAckTimeNanos)
.build();
}
@@ -158,11 +161,18 @@ public class PipelineAck {
}
/**
- * get the ith reply
- * @return the the ith reply
+ * get the header flag of ith reply
*/
- public int getReply(int i) {
-return proto.getReply(i);
+ public int getHeaderFlag(int i) {
+if (pr
hadoop git commit: HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck. Contributed by Anu Engineer and Haohui Mai.
Repository: hadoop
Updated Branches:
refs/heads/trunk 90e07d55a -> b80457158
HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck.
Contributed by Anu Engineer and Haohui Mai.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b8045715
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b8045715
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b8045715
Branch: refs/heads/trunk
Commit: b80457158daf0dc712fbe5695625cc17d70d4bb4
Parents: 90e07d5
Author: Haohui Mai
Authored: Mon Mar 30 11:59:21 2015 -0700
Committer: Haohui Mai
Committed: Mon Mar 30 11:59:21 2015 -0700
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../org/apache/hadoop/hdfs/DataStreamer.java| 2 +-
.../hdfs/protocol/datatransfer/PipelineAck.java | 31 +---
.../hdfs/server/datanode/BlockReceiver.java | 2 +-
.../src/main/proto/datatransfer.proto | 3 +-
.../hadoop/hdfs/TestDataTransferProtocol.java | 31
6 files changed, 58 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8045715/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 79a81c6..2f42db2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1313,6 +1313,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7963. Fix expected tracing spans in TestTracing along with HDFS-7054.
(Masatake Iwasaki via kihwal)
+HDFS-7748. Separate ECN flags from the Status in the
DataTransferPipelineAck.
+(Anu Engineer and Haohui Mai via wheat9)
+
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8045715/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
index 6047825..9c437ba 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
@@ -817,7 +817,7 @@ class DataStreamer extends Daemon {
// processes response status from datanodes.
for (int i = ack.getNumOfReplies()-1; i >=0 &&
dfsClient.clientRunning; i--) {
final Status reply = PipelineAck.getStatusFromHeader(ack
-.getReply(i));
+.getHeaderFlag(i));
// Restart will not be treated differently unless it is
// the local node or the only one in the pipeline.
if (PipelineAck.isRestartOOBStatus(reply) &&
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8045715/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
index 35e5bb8..9bd4115 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
@@ -130,13 +130,16 @@ public class PipelineAck {
*/
public PipelineAck(long seqno, int[] replies,
long downstreamAckTimeNanos) {
-ArrayList replyList = Lists.newArrayList();
+ArrayList statusList = Lists.newArrayList();
+ArrayList flagList = Lists.newArrayList();
for (int r : replies) {
- replyList.add(r);
+ statusList.add(StatusFormat.getStatus(r));
+ flagList.add(r);
}
proto = PipelineAckProto.newBuilder()
.setSeqno(seqno)
- .addAllReply(replyList)
+ .addAllReply(statusList)
+ .addAllFlag(flagList)
.setDownstreamAckTimeNanos(downstreamAckTimeNanos)
.build();
}
@@ -158,11 +161,18 @@ public class PipelineAck {
}
/**
- * get the ith reply
- * @return the the ith reply
+ * get the header flag of ith reply
*/
- public int getReply(int i) {
-return proto.getReply(i);
+ public int getHeaderFlag(int i) {
+if (proto.getFlagCount() > 0) {
+ return proto.getF
hadoop git commit: HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck. Contributed by Anu Engineer and Haohui Mai.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 24d879026 -> dd5b2dac5
HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck.
Contributed by Anu Engineer and Haohui Mai.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd5b2dac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd5b2dac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd5b2dac
Branch: refs/heads/branch-2
Commit: dd5b2dac5a81952f579906ddd1c95a2e915b513e
Parents: 24d8790
Author: Haohui Mai
Authored: Mon Mar 30 11:59:21 2015 -0700
Committer: Haohui Mai
Committed: Mon Mar 30 11:59:32 2015 -0700
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../org/apache/hadoop/hdfs/DataStreamer.java| 2 +-
.../hdfs/protocol/datatransfer/PipelineAck.java | 31 +---
.../hdfs/server/datanode/BlockReceiver.java | 2 +-
.../src/main/proto/datatransfer.proto | 3 +-
.../hadoop/hdfs/TestDataTransferProtocol.java | 31
6 files changed, 58 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd5b2dac/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index b3cc6b7..667aa05 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1009,6 +1009,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7963. Fix expected tracing spans in TestTracing along with HDFS-7054.
(Masatake Iwasaki via kihwal)
+HDFS-7748. Separate ECN flags from the Status in the
DataTransferPipelineAck.
+(Anu Engineer and Haohui Mai via wheat9)
+
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd5b2dac/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
index 6047825..9c437ba 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
@@ -817,7 +817,7 @@ class DataStreamer extends Daemon {
// processes response status from datanodes.
for (int i = ack.getNumOfReplies()-1; i >=0 &&
dfsClient.clientRunning; i--) {
final Status reply = PipelineAck.getStatusFromHeader(ack
-.getReply(i));
+.getHeaderFlag(i));
// Restart will not be treated differently unless it is
// the local node or the only one in the pipeline.
if (PipelineAck.isRestartOOBStatus(reply) &&
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd5b2dac/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
index 35e5bb8..9bd4115 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
@@ -130,13 +130,16 @@ public class PipelineAck {
*/
public PipelineAck(long seqno, int[] replies,
long downstreamAckTimeNanos) {
-ArrayList replyList = Lists.newArrayList();
+ArrayList statusList = Lists.newArrayList();
+ArrayList flagList = Lists.newArrayList();
for (int r : replies) {
- replyList.add(r);
+ statusList.add(StatusFormat.getStatus(r));
+ flagList.add(r);
}
proto = PipelineAckProto.newBuilder()
.setSeqno(seqno)
- .addAllReply(replyList)
+ .addAllReply(statusList)
+ .addAllFlag(flagList)
.setDownstreamAckTimeNanos(downstreamAckTimeNanos)
.build();
}
@@ -158,11 +161,18 @@ public class PipelineAck {
}
/**
- * get the ith reply
- * @return the the ith reply
+ * get the header flag of ith reply
*/
- public int getReply(int i) {
-return proto.getReply(i);
+ public int getHeaderFlag(int i) {
+if (proto.getFlagCount() > 0) {
+ return prot
