This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 71a945ac869 MAPREDUCE-7504. Remove terminally deprecated
Thread.suspend from TestMergeManager (#7519) Contributed by Istvan Toth.
71a945ac869 is described below
commit 71a945ac869c932c7991ce573e6b72aaeed152fc
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Mar 19 02:18:17 2025 +0100
MAPREDUCE-7504. Remove terminally deprecated Thread.suspend from
TestMergeManager (#7519) Contributed by Istvan Toth.
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../mapreduce/task/reduce/TestMergeManager.java | 46 +++++++++++-----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
index d8aa02e6cf7..a76825c8b2d 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
@@ -209,7 +209,7 @@ public void testIoSortDefaults() {
assertEquals(100, jobConf.getInt(MRJobConfig.IO_SORT_MB, 10));
}
- @SuppressWarnings({ "unchecked", "deprecation" })
+ @SuppressWarnings({ "unchecked" })
@Test
@Timeout(value = 10)
public void testOnDiskMerger() throws IOException {
@@ -229,29 +229,29 @@ public void testOnDiskMerger() throws IOException {
// make sure the io.sort.factor is set properly
assertEquals(mergeFactor, SORT_FACTOR);
- // Stop the onDiskMerger thread so that we can intercept the list of files
- // waiting to be merged.
- onDiskMerger.suspend();
-
- //Send the list of fake files waiting to be merged
- Random rand = new Random();
- for(int i = 0; i < 2*SORT_FACTOR; ++i) {
- Path path = new Path("somePath");
- CompressAwarePath cap = new CompressAwarePath(path, 1L, rand.nextInt());
- manager.closeOnDiskFile(cap);
- }
+ // Suspend the onDiskMerger thread main loop so that we can intercept the
+ // list of files waiting to be merged.
+ synchronized (onDiskMerger.getPendingToBeMerged()) {
+ //Send the list of fake files waiting to be merged
+ Random rand = new Random();
+ for(int i = 0; i < 2*SORT_FACTOR; ++i) {
+ Path path = new Path("somePath");
+ CompressAwarePath cap = new CompressAwarePath(path, 1L,
rand.nextInt());
+ manager.closeOnDiskFile(cap);
+ }
- //Check that the files pending to be merged are in sorted order.
- LinkedList<List<CompressAwarePath>> pendingToBeMerged =
onDiskMerger.getPendingToBeMerged();
- assertTrue(pendingToBeMerged.size() > 0,
- "No inputs were added to list pending to merge");
- for(int i = 0; i < pendingToBeMerged.size(); ++i) {
- List<CompressAwarePath> inputs = pendingToBeMerged.get(i);
- for(int j = 1; j < inputs.size(); ++j) {
- assertTrue(inputs.size() > 0 && inputs.size() <= SORT_FACTOR,
- "Not enough / too many inputs were going to be merged");
- assertTrue(inputs.get(j).getCompressedSize() >= inputs.get(j -
1).getCompressedSize(),
- "Inputs to be merged were not sorted according to size: ");
+ //Check that the files pending to be merged are in sorted order.
+ LinkedList<List<CompressAwarePath>> pendingToBeMerged =
onDiskMerger.getPendingToBeMerged();
+ assertTrue(pendingToBeMerged.size() > 0,
+ "No inputs were added to list pending to merge");
+ for(int i = 0; i < pendingToBeMerged.size(); ++i) {
+ List<CompressAwarePath> inputs = pendingToBeMerged.get(i);
+ for(int j = 1; j < inputs.size(); ++j) {
+ assertTrue(inputs.size() > 0 && inputs.size() <= SORT_FACTOR,
+ "Not enough / too many inputs were going to be merged");
+ assertTrue(inputs.get(j).getCompressedSize() >= inputs.get(j -
1).getCompressedSize(),
+ "Inputs to be merged were not sorted according to size: ");
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
