[#1398] fix(mr,tez): Make attempId computable and move it to taskAttemptId in BlockId layout. #1418
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,10 +27,12 @@ | |
| import org.apache.hadoop.mapred.MapTaskCompletionEventsUpdate; | ||
| import org.apache.hadoop.mapred.TaskCompletionEvent; | ||
| import org.apache.hadoop.mapred.TaskUmbilicalProtocol; | ||
| import org.apache.hadoop.mapreduce.MRJobConfig; | ||
| import org.apache.hadoop.mapreduce.RssMRUtils; | ||
| import org.apache.hadoop.mapreduce.TaskAttemptID; | ||
| import org.roaringbitmap.longlong.Roaring64NavigableMap; | ||
|
|
||
| import org.apache.uniffle.client.util.ClientUtils; | ||
| import org.apache.uniffle.common.exception.RssException; | ||
|
|
||
| public class RssEventFetcher<K, V> { | ||
|
|
@@ -75,7 +77,11 @@ public Roaring64NavigableMap fetchAllRssTaskIds() { | |
| String errMsg = "TaskAttemptIDs are inconsistent with map tasks"; | ||
| for (TaskAttemptID taskAttemptID : successMaps) { | ||
| if (!obsoleteMaps.contains(taskAttemptID)) { | ||
| int maxFailures = jobConf.getInt(MRJobConfig.MAP_MAX_ATTEMPTS, 4); | ||
| boolean speculation = jobConf.getBoolean(MRJobConfig.MAP_SPECULATIVE, true); | ||
qijiale76 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| int maxAttemptNo = ClientUtils.getMaxAttemptNo(maxFailures, speculation); | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId(taskAttemptID, appAttemptId, maxAttemptNo); | ||
qijiale76 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| int mapIndex = taskAttemptID.getTaskID().getId(); | ||
| // There can be multiple successful attempts on same map task. | ||
| // So we only need to accept one of them. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -75,7 +75,7 @@ public void testWriteException() throws Exception { | |
| manager = | ||
| new SortWriteBufferManager<BytesWritable, BytesWritable>( | ||
| 10240, | ||
| 1, | ||
| 10, | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
|
|
@@ -139,7 +139,7 @@ public void testWriteException() throws Exception { | |
| manager = | ||
| new SortWriteBufferManager<BytesWritable, BytesWritable>( | ||
| 100, | ||
| 1, | ||
| 10, | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
|
|
@@ -191,7 +191,7 @@ public void testOnePartition() throws Exception { | |
| manager = | ||
| new SortWriteBufferManager<BytesWritable, BytesWritable>( | ||
| 10240, | ||
| 1, | ||
| 10, | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
|
|
@@ -243,7 +243,7 @@ public void testWriteNormal() throws Exception { | |
| manager = | ||
| new SortWriteBufferManager<BytesWritable, BytesWritable>( | ||
| 10240, | ||
| 1, | ||
| 10, | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
|
|
@@ -310,7 +310,7 @@ public void testCommitBlocksWhenMemoryShuffleDisabled() throws Exception { | |
| manager = | ||
| new SortWriteBufferManager<BytesWritable, BytesWritable>( | ||
| 10240, | ||
| 1, | ||
| 10, | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
| serializationFactory.getSerializer(BytesWritable.class), | ||
|
|
@@ -390,7 +390,7 @@ public void testCombineBuffer() throws Exception { | |
| SortWriteBufferManager<Text, IntWritable> manager = | ||
| new SortWriteBufferManager<Text, IntWritable>( | ||
| 10240, | ||
| 1, | ||
| 10, | ||
| keySerializer, | ||
| valueSerializer, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,26 +39,27 @@ public class RssMRUtilsTest { | |
|
|
||
| @Test | ||
| public void baskAttemptIdTest() { | ||
| int taskAttemptId = 0x1000ad12; | ||
| JobID jobID = new JobID(); | ||
| TaskID taskId = new TaskID(jobID, TaskType.MAP, (int) taskAttemptId); | ||
| TaskAttemptID mrTaskAttemptId = new TaskAttemptID(taskId, 3); | ||
| boolean isException = false; | ||
| try { | ||
| RssMRUtils.createRssTaskAttemptId(mrTaskAttemptId, 1, 4); | ||
| } catch (RssException e) { | ||
| isException = true; | ||
| } | ||
| assertTrue(isException); | ||
| taskAttemptId = (0x123 << 3) + 1; | ||
| mrTaskAttemptId = | ||
| RssMRUtils.createMRTaskAttemptId(new JobID(), TaskType.MAP, taskAttemptId, 1, 4); | ||
| int testId = RssMRUtils.createRssTaskAttemptId(mrTaskAttemptId, 1, 4); | ||
| assertEquals(taskAttemptId, testId); | ||
| TaskID taskID = new TaskID(new org.apache.hadoop.mapred.JobID(), TaskType.MAP, (int) (1 << 21)); | ||
| mrTaskAttemptId = new TaskAttemptID(taskID, 2); | ||
| isException = false; | ||
| try { | ||
| RssMRUtils.createRssTaskAttemptId(mrTaskAttemptId, 1, 4); | ||
| } catch (RssException e) { | ||
| isException = true; | ||
| } | ||
|
|
@@ -70,7 +71,7 @@ public void blockConvertTest() { | |
| JobID jobID = new JobID(); | ||
| TaskID taskId = new TaskID(jobID, TaskType.MAP, 233); | ||
| TaskAttemptID taskAttemptID = new TaskAttemptID(taskId, 1); | ||
| int taskAttemptId = RssMRUtils.createRssTaskAttemptId(taskAttemptID, 1, 4); | ||
| long blockId = RssMRUtils.getBlockId(1, taskAttemptId, 0); | ||
| long newTaskAttemptId = RssMRUtils.getTaskAttemptId(blockId); | ||
| assertEquals(taskAttemptId, newTaskAttemptId); | ||
|
|
@@ -85,7 +86,7 @@ public void partitionIdConvertBlockTest() { | |
| JobID jobID = new JobID(); | ||
| TaskID taskId = new TaskID(jobID, TaskType.MAP, 233); | ||
| TaskAttemptID taskAttemptID = new TaskAttemptID(taskId, 1); | ||
| int taskAttemptId = RssMRUtils.createRssTaskAttemptId(taskAttemptID, 1, 4); | ||
| long mask = (1L << layout.partitionIdBits) - 1; | ||
| for (int partitionId = 0; partitionId <= 3000; partitionId++) { | ||
| for (int seqNo = 0; seqNo <= 10; seqNo++) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,9 +58,9 @@ public void singlePassEventFetch() throws IOException { | |
| RssEventFetcher ef = new RssEventFetcher(1, tid, umbilical, jobConf, MAX_EVENTS_TO_FETCH); | ||
| Roaring64NavigableMap expected = Roaring64NavigableMap.bitmapOf(); | ||
| for (int mapIndex = 0; mapIndex < mapTaskNum; mapIndex++) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 0), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
|
|
||
|
|
@@ -88,9 +88,9 @@ public void singlePassWithRepeatedSuccessEventFetch() throws IOException { | |
| RssEventFetcher ef = new RssEventFetcher(1, tid, umbilical, jobConf, MAX_EVENTS_TO_FETCH); | ||
| Roaring64NavigableMap expected = Roaring64NavigableMap.bitmapOf(); | ||
| for (int mapIndex = 0; mapIndex < mapTaskNum; mapIndex++) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 0), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
|
|
||
|
|
@@ -120,9 +120,9 @@ public void multiPassEventFetch() throws IOException { | |
|
|
||
| Roaring64NavigableMap expected = Roaring64NavigableMap.bitmapOf(); | ||
| for (int mapIndex = 0; mapIndex < mapTaskNum; mapIndex++) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 0), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
| Roaring64NavigableMap taskIdBitmap = ef.fetchAllRssTaskIds(); | ||
|
|
@@ -145,9 +145,9 @@ public void missingEventFetch() throws IOException { | |
| RssEventFetcher ef = new RssEventFetcher(1, tid, umbilical, jobConf, MAX_EVENTS_TO_FETCH); | ||
| Roaring64NavigableMap expected = Roaring64NavigableMap.bitmapOf(); | ||
| for (int mapIndex = 0; mapIndex < mapTaskNum; mapIndex++) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 0), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
| IllegalStateException ex = | ||
|
|
@@ -171,9 +171,9 @@ public void extraEventFetch() throws IOException { | |
| RssEventFetcher ef = new RssEventFetcher(1, tid, umbilical, jobConf, MAX_EVENTS_TO_FETCH); | ||
| Roaring64NavigableMap expected = Roaring64NavigableMap.bitmapOf(); | ||
| for (int mapIndex = 0; mapIndex < mapTaskNum; mapIndex++) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 0), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
| IllegalStateException ex = | ||
|
|
@@ -204,15 +204,15 @@ public void obsoletedAndTipFailedEventFetch() throws IOException { | |
| Roaring64NavigableMap expected = Roaring64NavigableMap.bitmapOf(); | ||
| for (int mapIndex = 0; mapIndex < mapTaskNum; mapIndex++) { | ||
| if (!tipFailed.contains(mapIndex) && !obsoleted.contains(mapIndex)) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 0), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
| if (obsoleted.contains(mapIndex)) { | ||
| int rssTaskId = | ||
| RssMRUtils.createRssTaskAttemptId( | ||
| new TaskAttemptID("12345", 1, TaskType.MAP, mapIndex, 1), 1, 4); | ||
| expected.addLong(rssTaskId); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -290,7 +290,8 @@ public void testCodecIsDuplicated() throws Exception { | |
| null, | ||
| new Progress(), | ||
| new MROutputFiles()); | ||
| TaskAttemptID taskAttemptID = | ||
| RssMRUtils.createMRTaskAttemptId(new JobID(), TaskType.MAP, 1, 1, 4); | ||
| byte[] buffer = new byte[10]; | ||
| MapOutput mapOutput1 = merger.reserve(taskAttemptID, 10, 1); | ||
| RssBypassWriter.write(mapOutput1, buffer); | ||
|
|
@@ -349,7 +350,7 @@ private static byte[] writeMapOutputRss(Configuration conf, Map<String, String> | |
| SortWriteBufferManager<Text, Text> manager = | ||
| new SortWriteBufferManager( | ||
| 10240, | ||
| 1, | ||
| 10, | ||
| serializationFactory.getSerializer(Text.class), | ||
| serializationFactory.getSerializer(Text.class), | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure about restricting
taskAttemptIdstointin such places.Here is the situation:
longtask attempt ids (for Tez and MR, (taskId, attemptId) constitutes alongtask attempt id, which we restrict tointfor similar reasons as in 2.)longtask attempt ids toint, since we allow only less that 32 bits for itintbecause of thatlongtask attempt ids if that makes no difference for that code, up-castinginttask attempt ids tolongdoes not harm, as long as the code works withlong.This allows to support truly
longtask attempt ids without reverting such code changes in the future.@zuston @jerqi @zhengchenyu what do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@EnricoMi
I think the original taskattemptid is long because it comes from TaskContext::taskAttemptId of spark, which is the unique id of attempt at the app level. MR and Tez inherited the long type, but implemented taskattemptid by bit concatenation of taskid and attemptid in this task.
I think you have changed taskattemptid to the concatenation of taskid and attemptid in #731, and limited it to no more than 32 bits, so int is enough.
What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Preferring using long for some common methods.