[HUDI-6481] Support run multi tables services in a single spark job #9558
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
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 |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * 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.utilities.multitable; | ||
|
|
||
| import org.apache.hudi.client.SparkRDDWriteClient; | ||
| import org.apache.hudi.client.common.HoodieSparkEngineContext; | ||
| import org.apache.hudi.common.config.TypedProperties; | ||
| import org.apache.hudi.config.HoodieWriteConfig; | ||
| import org.apache.hudi.utilities.UtilHelpers; | ||
|
|
||
| import org.apache.spark.api.java.JavaSparkContext; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Archive task to run in TableServicePipeline. | ||
| * | ||
| * @see HoodieMultiTableServicesMain | ||
| */ | ||
| class ArchiveTask extends TableServiceTask { | ||
|
There was a problem hiding this comment. Added javadoc for all new classes |
||
| private static final Logger LOG = LoggerFactory.getLogger(ArchiveTask.class); | ||
|
|
||
| @Override | ||
| void run() { | ||
| LOG.info("Run Archive with props: " + props); | ||
| HoodieWriteConfig hoodieCfg = HoodieWriteConfig.newBuilder().withPath(basePath).withProps(props).build(); | ||
| try (SparkRDDWriteClient client = new SparkRDDWriteClient<>(new HoodieSparkEngineContext(jsc), hoodieCfg)) { | ||
| UtilHelpers.retry(retry, () -> { | ||
| client.archive(); | ||
| return 0; | ||
| }, "Archive Failed"); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Utility to create builder for {@link ArchiveTask}. | ||
| * | ||
| * @return Builder for {@link ArchiveTask}. | ||
| */ | ||
| public static Builder newBuilder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Add doc for each |
||
| /** | ||
| * Builder class for {@link ArchiveTask}. | ||
| */ | ||
| public static final class Builder { | ||
| /** | ||
| * Properties for running archive task which are already consolidated w/ CLI provided config-overrides. | ||
| */ | ||
| private TypedProperties props; | ||
|
|
||
| /** | ||
| * Hoodie table path for running archive task. | ||
| */ | ||
| private String basePath; | ||
|
|
||
| /** | ||
| * Number of retries. | ||
| */ | ||
| private int retry; | ||
|
|
||
| /** | ||
| * JavaSparkContext to run spark job. | ||
| */ | ||
| private JavaSparkContext jsc; | ||
|
|
||
| public Builder withProps(TypedProperties props) { | ||
| this.props = props; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withBasePath(String basePath) { | ||
| this.basePath = basePath; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withJsc(JavaSparkContext jsc) { | ||
| this.jsc = jsc; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withRetry(int retry) { | ||
| this.retry = retry; | ||
| return this; | ||
| } | ||
|
|
||
| public ArchiveTask build() { | ||
| ArchiveTask archiveTask = new ArchiveTask(); | ||
| archiveTask.jsc = this.jsc; | ||
| archiveTask.retry = this.retry; | ||
| archiveTask.props = this.props; | ||
| archiveTask.basePath = this.basePath; | ||
| return archiveTask; | ||
| } | ||
| } | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * 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.utilities.multitable; | ||
|
|
||
| import org.apache.hudi.common.config.TypedProperties; | ||
| import org.apache.hudi.utilities.HoodieCleaner; | ||
| import org.apache.hudi.utilities.UtilHelpers; | ||
|
|
||
| import org.apache.spark.api.java.JavaSparkContext; | ||
|
|
||
| /** | ||
| * Clean task to run in TableServicePipeline. | ||
| * | ||
| * @see HoodieMultiTableServicesMain | ||
| */ | ||
| class CleanTask extends TableServiceTask { | ||
|
|
||
|
|
||
| @Override | ||
| void run() { | ||
| HoodieCleaner.Config cleanConfig = new HoodieCleaner.Config(); | ||
| cleanConfig.basePath = basePath; | ||
| UtilHelpers.retry(retry, () -> { | ||
| new HoodieCleaner(cleanConfig, jsc, props).run(); | ||
| return 0; | ||
| }, "Clean Failed"); | ||
| } | ||
|
|
||
| /** | ||
| * Utility to create builder for {@link CleanTask}. | ||
| * | ||
| * @return Builder for {@link CleanTask}. | ||
| */ | ||
| public static Builder newBuilder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| /** | ||
| * Builder class for {@link CleanTask}. | ||
| */ | ||
| public static final class Builder { | ||
| /** | ||
| * Properties for running clean task which are already consolidated w/ CLI provided config-overrides. | ||
| */ | ||
| private TypedProperties props; | ||
|
|
||
| /** | ||
| * Hoodie table path for running clean task. | ||
| */ | ||
| private String basePath; | ||
|
|
||
| /** | ||
| * Number of retries. | ||
| */ | ||
| private int retry; | ||
|
|
||
| /** | ||
| * JavaSparkContext to run spark job. | ||
| */ | ||
| private JavaSparkContext jsc; | ||
|
|
||
| public Builder withProps(TypedProperties props) { | ||
| this.props = props; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withBasePath(String basePath) { | ||
| this.basePath = basePath; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withJsc(JavaSparkContext jsc) { | ||
| this.jsc = jsc; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder withRetry(int retry) { | ||
| this.retry = retry; | ||
| return this; | ||
| } | ||
|
|
||
| public CleanTask build() { | ||
| CleanTask cleanTask = new CleanTask(); | ||
| cleanTask.jsc = this.jsc; | ||
| cleanTask.retry = this.retry; | ||
| cleanTask.basePath = this.basePath; | ||
| cleanTask.props = this.props; | ||
| return cleanTask; | ||
| } | ||
| } | ||
| } | ||
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.
The original code fetches the props either from cmd line or global options, what is the purpose to support custom props per-service then?
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.
Yes in multi-table services we also fetch the props either from cmd line or global options. And we do not want each service to fetch the props by themselves. So here I add a new constructor to use the props that all services shared.
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.
The existing constructor already satisfy the needs.
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.
Yes, however if we want to reuse existing constructor, we need pass the prop file path and the cmd line config from
HoodieMultiTableServicesMaintoHoodieCleaner. And we will parse the config(read props file and use cmd line config to override it) for everyTableServiceTask, which is redundant. Current implementation will do the config parsing inHoodieMultiTableServicesMainonly, and all theTableServiceTaskwill use the final config parsed byHoodieMultiTableServicesMain. 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.
Fine with it.
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.
Then we can force one constructor to invoke the other one.
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.
Thanks for your suggestions~ I have slightly refactored the code and make it cleaner, PTAL