hadoop git commit: HDFS-10712. TestDataNodeVolumeFailure should pass not null BlockReportContext. Contributed by Vinitha Gankidi.

2016-10-17 Thread shv
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 f8b2d7720 -> ae972dd08


HDFS-10712. TestDataNodeVolumeFailure should pass not null BlockReportContext. 
Contributed by Vinitha Gankidi.

(cherry picked from commit 278eeb105611444bee0261ce7a0e6ea983a5c615)

Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ae972dd0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae972dd0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae972dd0

Branch: refs/heads/branch-2.8
Commit: ae972dd08006a76a08e2a34dab73b8a211246cec
Parents: f8b2d77
Author: Vinitha Reddy Gankidi 
Authored: Mon Oct 17 18:55:26 2016 -0700
Committer: Konstantin V Shvachko 
Committed: Mon Oct 17 19:02:29 2016 -0700

--
 .../hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae972dd0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
index 379e9e6..aa1e5e5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
@@ -67,6 +67,7 @@ import 
org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
 import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeSpi;
 import org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetTestUtil;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.protocol.BlockReportContext;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocols;
@@ -192,7 +193,8 @@ public class TestDataNodeVolumeFailure {
 new StorageBlockReport(dnStorage, blockList);
 }
 
-cluster.getNameNodeRpc().blockReport(dnR, bpid, reports, null);
+cluster.getNameNodeRpc().blockReport(dnR, bpid, reports,
+new BlockReportContext(1, 0, System.nanoTime(), 0));
 
 // verify number of blocks and files...
 verify(filename, filesize);


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



hadoop git commit: HDFS-10712. TestDataNodeVolumeFailure should pass not null BlockReportContext. Contributed by Vinitha Gankidi.

2016-10-17 Thread shv
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 1fcaba9b1 -> 86f291f05


HDFS-10712. TestDataNodeVolumeFailure should pass not null BlockReportContext. 
Contributed by Vinitha Gankidi.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86f291f0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86f291f0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86f291f0

Branch: refs/heads/branch-2.7
Commit: 86f291f057d3479d06cbfc1f77ed38d36154fcf9
Parents: 1fcaba9
Author: Vinitha Reddy Gankidi 
Authored: Mon Oct 17 18:55:26 2016 -0700
Committer: Konstantin V Shvachko 
Committed: Mon Oct 17 19:08:52 2016 -0700

--
 .../hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/86f291f0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
index 41e8d7b..c265679 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
@@ -186,7 +186,8 @@ public class TestDataNodeVolumeFailure {
 new StorageBlockReport(dnStorage, blockList);
 }
 
-cluster.getNameNodeRpc().blockReport(dnR, bpid, reports, null);
+cluster.getNameNodeRpc().blockReport(dnR, bpid, reports,
+new BlockReportContext(1, 0, System.nanoTime()));
 
 // verify number of blocks and files...
 verify(filename, filesize);


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



hadoop git commit: HDFS-10712. TestDataNodeVolumeFailure should pass not null BlockReportContext. Contributed by Vinitha Gankidi.

2016-10-17 Thread shv
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d55a7f893 -> 278eeb105


HDFS-10712. TestDataNodeVolumeFailure should pass not null BlockReportContext. 
Contributed by Vinitha Gankidi.

Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/278eeb10
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/278eeb10
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/278eeb10

Branch: refs/heads/branch-2
Commit: 278eeb105611444bee0261ce7a0e6ea983a5c615
Parents: d55a7f8
Author: Vinitha Reddy Gankidi 
Authored: Mon Oct 17 18:55:26 2016 -0700
Committer: Konstantin V Shvachko 
Committed: Mon Oct 17 18:55:26 2016 -0700

--
 .../hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/278eeb10/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
index 379e9e6..aa1e5e5 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
@@ -67,6 +67,7 @@ import 
org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
 import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeSpi;
 import org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetTestUtil;
 import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.protocol.BlockReportContext;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeRegistration;
 import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage;
 import org.apache.hadoop.hdfs.server.protocol.NamenodeProtocols;
@@ -192,7 +193,8 @@ public class TestDataNodeVolumeFailure {
 new StorageBlockReport(dnStorage, blockList);
 }
 
-cluster.getNameNodeRpc().blockReport(dnR, bpid, reports, null);
+cluster.getNameNodeRpc().blockReport(dnR, bpid, reports,
+new BlockReportContext(1, 0, System.nanoTime(), 0));
 
 // verify number of blocks and files...
 verify(filename, filesize);


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