-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Retrying with a backward compatible task type on unknown task type error in parallel indexing #8905
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
68 changes: 68 additions & 0 deletions
68
...n/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.druid.indexing.common.task.batch.parallel; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JacksonInject; | ||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.apache.druid.client.indexing.IndexingServiceClient; | ||
| import org.apache.druid.indexing.common.task.IndexTaskClientFactory; | ||
| import org.apache.druid.indexing.common.task.TaskResource; | ||
| import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.Map; | ||
|
|
||
| public class LegacySinglePhaseSubTask extends SinglePhaseSubTask | ||
| { | ||
| @JsonCreator | ||
| public LegacySinglePhaseSubTask( | ||
| @JsonProperty("id") @Nullable final String id, | ||
| @JsonProperty("groupId") final String groupId, | ||
| @JsonProperty("resource") final TaskResource taskResource, | ||
| @JsonProperty("supervisorTaskId") final String supervisorTaskId, | ||
| @JsonProperty("numAttempts") final int numAttempts, // zero-based counting | ||
| @JsonProperty("spec") final ParallelIndexIngestionSpec ingestionSchema, | ||
| @JsonProperty("context") final Map<String, Object> context, | ||
| @JacksonInject IndexingServiceClient indexingServiceClient, | ||
| @JacksonInject IndexTaskClientFactory<ParallelIndexSupervisorTaskClient> taskClientFactory, | ||
| @JacksonInject AppenderatorsManager appenderatorsManager | ||
| ) | ||
| { | ||
| super( | ||
| id, | ||
| groupId, | ||
| taskResource, | ||
| supervisorTaskId, | ||
| numAttempts, | ||
| ingestionSchema, | ||
| context, | ||
| indexingServiceClient, | ||
| taskClientFactory, | ||
| appenderatorsManager | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public String getType() | ||
| { | ||
| return SinglePhaseSubTask.OLD_TYPE_NAME; | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
39 changes: 39 additions & 0 deletions
39
...rvice/src/test/java/org/apache/druid/indexing/common/task/NoopIndexTaskClientFactory.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.druid.indexing.common.task; | ||
|
|
||
| import org.apache.druid.indexing.common.IndexTaskClient; | ||
| import org.apache.druid.indexing.common.TaskInfoProvider; | ||
| import org.joda.time.Duration; | ||
|
|
||
| public class NoopIndexTaskClientFactory implements IndexTaskClientFactory | ||
| { | ||
| @Override | ||
| public IndexTaskClient build( | ||
| TaskInfoProvider taskInfoProvider, | ||
| String callerId, | ||
| int numThreads, | ||
| Duration httpTimeout, | ||
| long numRetries | ||
| ) | ||
| { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
| } |
91 changes: 91 additions & 0 deletions
91
...java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTaskSpecTest.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.druid.indexing.common.task.batch.parallel; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.apache.druid.data.input.InputSplit; | ||
| import org.apache.druid.data.input.impl.DimensionsSpec; | ||
| import org.apache.druid.data.input.impl.JsonInputFormat; | ||
| import org.apache.druid.data.input.impl.LocalInputSource; | ||
| import org.apache.druid.data.input.impl.TimestampSpec; | ||
| import org.apache.druid.indexing.common.TestUtils; | ||
| import org.apache.druid.query.aggregation.AggregatorFactory; | ||
| import org.apache.druid.segment.indexing.DataSchema; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.Map; | ||
|
|
||
| public class SinglePhaseSubTaskSpecTest | ||
| { | ||
| private static final SinglePhaseSubTaskSpec SPEC = new SinglePhaseSubTaskSpec( | ||
| "id", | ||
| "groupId", | ||
| "supervisorTaskId", | ||
| new ParallelIndexIngestionSpec( | ||
| new DataSchema( | ||
| "dataSource", | ||
| new TimestampSpec(null, null, null), | ||
| new DimensionsSpec(null), | ||
| new AggregatorFactory[0], | ||
| null, | ||
| null | ||
| ), | ||
| new ParallelIndexIOConfig( | ||
| null, | ||
| new LocalInputSource(new File("baseDir"), "filter"), | ||
| new JsonInputFormat(null, null), | ||
| null | ||
| ), | ||
| null | ||
| ), | ||
| null, | ||
| new InputSplit<>("string split") | ||
| ); | ||
|
|
||
| private ObjectMapper mapper; | ||
|
|
||
| @Before | ||
| public void setup() | ||
| { | ||
| mapper = new TestUtils().getTestObjectMapper(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNewSubTaskType() throws IOException | ||
| { | ||
| final SinglePhaseSubTask expected = SPEC.newSubTask(0); | ||
| final byte[] json = mapper.writeValueAsBytes(expected); | ||
| final Map<String, Object> actual = mapper.readValue(json, Map.class); | ||
| Assert.assertEquals(SinglePhaseSubTask.TYPE, actual.get("type")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNewSubTaskWithBackwardCompatibleType() throws IOException | ||
| { | ||
| final SinglePhaseSubTask expected = SPEC.newSubTaskWithBackwardCompatibleType(0); | ||
| final byte[] json = mapper.writeValueAsBytes(expected); | ||
| final Map<String, Object> actual = mapper.readValue(json, Map.class); | ||
| Assert.assertEquals(SinglePhaseSubTask.OLD_TYPE_NAME, actual.get("type")); | ||
| } | ||
| } |
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.
Will this approach be able to retry immediately, or will it have to exhaust retries in the
indexingServiceClientfirst? (The loop in DruidLeaderClient)Ideally, this detects a problem on the first submission, and doesn't need to exhaust retries before it moves on to trying the backwards-compatible type.
Could you check it, if you haven't already?
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.
This won't retry immediately but will exhaust retries in DruidLeaderClient. Yes, ideally it should be able to detect the problem before it retries, but I'm not sure whether that refactoring is worth to do because 1) it's not easy to teach the logic of the caller to DruidLeaderClient, 2) it will happen only during a particular type of rolling update, 3) and retries won't take much time compared to the total indexing time.