-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[HUDI-2686] Proccess record after all bootstrap operator ready #3925
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ | |
| import org.apache.hudi.config.HoodieWriteConfig; | ||
| import org.apache.hudi.configuration.FlinkOptions; | ||
| import org.apache.hudi.exception.HoodieException; | ||
| import org.apache.hudi.sink.bootstrap.aggregate.BootstrapAggFunction; | ||
| import org.apache.hudi.table.HoodieTable; | ||
| import org.apache.hudi.table.format.FormatUtils; | ||
| import org.apache.hudi.util.FlinkTables; | ||
|
|
@@ -48,6 +49,7 @@ | |
| import org.apache.flink.runtime.state.KeyGroupRangeAssignment; | ||
| import org.apache.flink.runtime.state.StateInitializationContext; | ||
| import org.apache.flink.runtime.state.StateSnapshotContext; | ||
| import org.apache.flink.runtime.taskexecutor.GlobalAggregateManager; | ||
| import org.apache.flink.streaming.api.operators.AbstractStreamOperator; | ||
| import org.apache.flink.streaming.api.operators.OneInputStreamOperator; | ||
| import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; | ||
|
|
@@ -58,6 +60,7 @@ | |
| import java.util.Collections; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import static java.util.stream.Collectors.toList; | ||
|
|
@@ -71,7 +74,7 @@ | |
| * | ||
| * <p>The output records should then shuffle by the recordKey and thus do scalable write. | ||
| */ | ||
| public class BootstrapOperator<I, O extends HoodieRecord> | ||
| public class BootstrapOperator<I, O extends HoodieRecord<?>> | ||
| extends AbstractStreamOperator<O> implements OneInputStreamOperator<I, O> { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(BootstrapOperator.class); | ||
|
|
@@ -83,6 +86,8 @@ public class BootstrapOperator<I, O extends HoodieRecord> | |
| protected transient org.apache.hadoop.conf.Configuration hadoopConf; | ||
| protected transient HoodieWriteConfig writeConfig; | ||
|
|
||
| private transient GlobalAggregateManager aggregateManager; | ||
|
|
||
| private transient ListState<String> instantState; | ||
| private final Pattern pattern; | ||
| private String lastInstantTime; | ||
|
|
@@ -117,6 +122,7 @@ public void initializeState(StateInitializationContext context) throws Exception | |
| this.hadoopConf = StreamerUtil.getHadoopConf(); | ||
| this.writeConfig = StreamerUtil.getHoodieClientConfig(this.conf, true); | ||
| this.hoodieTable = FlinkTables.createTable(writeConfig, hadoopConf, getRuntimeContext()); | ||
| this.aggregateManager = getRuntimeContext().getGlobalAggregateManager(); | ||
|
|
||
| preLoadIndexRecords(); | ||
| } | ||
|
|
@@ -135,6 +141,27 @@ protected void preLoadIndexRecords() throws Exception { | |
| } | ||
|
|
||
| LOG.info("Finish sending index records, taskId = {}.", getRuntimeContext().getIndexOfThisSubtask()); | ||
|
|
||
| // wait for the other bootstrap tasks finish bootstrapping. | ||
| waitForBootstrapReady(getRuntimeContext().getIndexOfThisSubtask()); | ||
|
||
| } | ||
|
|
||
| /** | ||
| * Wait for other bootstrap tasks to finish the index bootstrap. | ||
| */ | ||
| private void waitForBootstrapReady(int taskID) { | ||
| int taskNum = getRuntimeContext().getNumberOfParallelSubtasks(); | ||
| int readyTaskNum = 1; | ||
| while (taskNum != readyTaskNum) { | ||
| try { | ||
| readyTaskNum = aggregateManager.updateGlobalAggregate(BootstrapAggFunction.NAME, taskID, new BootstrapAggFunction()); | ||
| LOG.info("Waiting for other bootstrap tasks to complete, taskId = {}.", taskID); | ||
|
|
||
| TimeUnit.SECONDS.sleep(5); | ||
| } catch (Exception e) { | ||
| LOG.warn("Update global task bootstrap summary error", e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
53 changes: 53 additions & 0 deletions
53
hudi-flink/src/main/java/org/apache/hudi/sink/bootstrap/aggregate/BootstrapAccumulator.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,53 @@ | ||
| /* | ||
| * 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.hudi.sink.bootstrap.aggregate; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Bootstrap ready task id accumulator. | ||
| */ | ||
| public class BootstrapAccumulator implements Serializable { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private final Set<Integer> readyTaskSet; | ||
|
|
||
| public BootstrapAccumulator() { | ||
| this.readyTaskSet = new HashSet<>(); | ||
| } | ||
|
|
||
| public void update(int taskId) { | ||
| readyTaskSet.add(taskId); | ||
| } | ||
|
|
||
| public int readyTaskNum() { | ||
| return readyTaskSet.size(); | ||
| } | ||
|
|
||
| public BootstrapAccumulator merge(BootstrapAccumulator acc) { | ||
| if (acc == null) { | ||
| return this; | ||
| } | ||
|
|
||
| readyTaskSet.addAll(acc.readyTaskSet); | ||
| return this; | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
hudi-flink/src/main/java/org/apache/hudi/sink/bootstrap/aggregate/BootstrapAggFunction.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,50 @@ | ||
| /* | ||
| * 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.hudi.sink.bootstrap.aggregate; | ||
|
|
||
| import org.apache.flink.api.common.functions.AggregateFunction; | ||
|
|
||
| /** | ||
| * Aggregate function that accumulates the loaded task number of | ||
| * function {@link org.apache.hudi.sink.bootstrap.BootstrapOperator}. | ||
| */ | ||
|
||
| public class BootstrapAggFunction implements AggregateFunction<Integer, BootstrapAccumulator, Integer> { | ||
| public static final String NAME = BootstrapAggFunction.class.getSimpleName(); | ||
|
|
||
| @Override | ||
| public BootstrapAccumulator createAccumulator() { | ||
| return new BootstrapAccumulator(); | ||
| } | ||
|
|
||
| @Override | ||
| public BootstrapAccumulator add(Integer taskId, BootstrapAccumulator bootstrapAccumulator) { | ||
| bootstrapAccumulator.update(taskId); | ||
| return bootstrapAccumulator; | ||
| } | ||
|
|
||
| @Override | ||
| public Integer getResult(BootstrapAccumulator bootstrapAccumulator) { | ||
| return bootstrapAccumulator.readyTaskNum(); | ||
| } | ||
|
|
||
| @Override | ||
| public BootstrapAccumulator merge(BootstrapAccumulator bootstrapAccumulator, BootstrapAccumulator acc) { | ||
| return bootstrapAccumulator.merge(acc); | ||
| } | ||
| } | ||
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
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.
transient