You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2016/09/23 09:02:55 UTC

[1/3] hadoop git commit: HADOOP-13643. Math error in AbstractContractDistCpTest. Contributed by Aaron Fabbri.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 b58651d8d -> 247cdbb86
  refs/heads/branch-2.8 42f6f68c7 -> a2ce4d050
  refs/heads/trunk b8a2d7b8f -> e5ef51e71


HADOOP-13643. Math error in AbstractContractDistCpTest. Contributed by Aaron Fabbri.


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

Branch: refs/heads/branch-2
Commit: 247cdbb86a3a680556d8812244f8b0df6e2aaa98
Parents: b58651d
Author: Steve Loughran <st...@apache.org>
Authored: Fri Sep 23 10:00:32 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Sep 23 10:00:32 2016 +0100

----------------------------------------------------------------------
 .../apache/hadoop/tools/contract/AbstractContractDistCpTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/247cdbb8/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
index a4f50c7..21a14d3 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
@@ -160,7 +160,7 @@ public abstract class AbstractContractDistCpTest
     Path inputFile3 = new Path(inputDir, "file3");
     mkdirs(srcFS, inputDir);
     int fileSizeKb = conf.getInt("scale.test.distcp.file.size.kb", 10 * 1024);
-    int fileSizeMb = fileSizeKb * 1024;
+    int fileSizeMb = fileSizeKb / 1024;
     getLog().info("{} with file size {}", testName.getMethodName(), fileSizeMb);
     byte[] data1 = dataset((fileSizeMb + 1) * 1024 * 1024, 33, 43);
     createFile(srcFS, inputFile1, true, data1);


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


[3/3] hadoop git commit: HADOOP-13643. Math error in AbstractContractDistCpTest. Contributed by Aaron Fabbri.

Posted by st...@apache.org.
HADOOP-13643. Math error in AbstractContractDistCpTest. Contributed by Aaron Fabbri.


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

Branch: refs/heads/trunk
Commit: e5ef51e717647328db9f2b80f21fe44b99079d08
Parents: b8a2d7b
Author: Steve Loughran <st...@apache.org>
Authored: Fri Sep 23 10:00:32 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Sep 23 10:01:30 2016 +0100

----------------------------------------------------------------------
 .../apache/hadoop/tools/contract/AbstractContractDistCpTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5ef51e7/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
index a4f50c7..21a14d3 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
@@ -160,7 +160,7 @@ public abstract class AbstractContractDistCpTest
     Path inputFile3 = new Path(inputDir, "file3");
     mkdirs(srcFS, inputDir);
     int fileSizeKb = conf.getInt("scale.test.distcp.file.size.kb", 10 * 1024);
-    int fileSizeMb = fileSizeKb * 1024;
+    int fileSizeMb = fileSizeKb / 1024;
     getLog().info("{} with file size {}", testName.getMethodName(), fileSizeMb);
     byte[] data1 = dataset((fileSizeMb + 1) * 1024 * 1024, 33, 43);
     createFile(srcFS, inputFile1, true, data1);


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


[2/3] hadoop git commit: HADOOP-13643. Math error in AbstractContractDistCpTest. Contributed by Aaron Fabbri.

Posted by st...@apache.org.
HADOOP-13643. Math error in AbstractContractDistCpTest. Contributed by Aaron Fabbri.


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

Branch: refs/heads/branch-2.8
Commit: a2ce4d050372efe89af645a98124512e6018205b
Parents: 42f6f68
Author: Steve Loughran <st...@apache.org>
Authored: Fri Sep 23 10:00:32 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Sep 23 10:00:54 2016 +0100

----------------------------------------------------------------------
 .../apache/hadoop/tools/contract/AbstractContractDistCpTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2ce4d05/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
index 7aeab55..1776aa6 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
@@ -163,7 +163,7 @@ public abstract class AbstractContractDistCpTest
     Path inputFile3 = new Path(inputDir, "file3");
     mkdirs(srcFS, inputDir);
     int fileSizeKb = conf.getInt("scale.test.distcp.file.size.kb", 10 * 1024);
-    int fileSizeMb = fileSizeKb * 1024;
+    int fileSizeMb = fileSizeKb / 1024;
     getLog().info("{} with file size {}", testName.getMethodName(), fileSizeMb);
     byte[] data1 = dataset((fileSizeMb + 1) * 1024 * 1024, 33, 43);
     createFile(srcFS, inputFile1, true, data1);


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