[
https://issues.apache.org/jira/browse/HUDI-2072?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17373745#comment-17373745
]
ASF GitHub Bot commented on HUDI-2072:
--------------------------------------
bvaradar commented on a change in pull request #3153:
URL: https://github.com/apache/hudi/pull/3153#discussion_r663217611
##########
File path:
hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/utils/SparkValidatorUtils.java
##########
@@ -0,0 +1,169 @@
+/*
+ * 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.client.utils;
+
+import org.apache.hudi.client.WriteStatus;
+import org.apache.hudi.client.common.HoodieSparkEngineContext;
+import org.apache.hudi.client.validator.SparkPreCommitValidator;
+import org.apache.hudi.common.engine.HoodieEngineContext;
+import org.apache.hudi.common.table.view.HoodieTableFileSystemView;
+import org.apache.hudi.common.util.ReflectionUtils;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.config.HoodieWriteConfig;
+import org.apache.hudi.exception.HoodieValidationException;
+import org.apache.hudi.table.HoodieSparkTable;
+import org.apache.hudi.table.HoodieTable;
+import org.apache.hudi.table.action.HoodieWriteMetadata;
+import org.apache.hudi.table.action.commit.BaseSparkCommitActionExecutor;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.spark.api.java.JavaRDD;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
+import org.apache.spark.sql.SQLContext;
+import scala.collection.JavaConverters;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Spark validator utils to verify and run any precommit validators configured.
+ */
+public class SparkValidatorUtils {
+ private static final Logger LOG =
LogManager.getLogger(BaseSparkCommitActionExecutor.class);
+
+ /**
+ * Check configured pre-commit validators and run them. Note that this only
works for COW tables
+ *
+ * Throw error if there are validation failures.
+ */
+ public static void runValidators(HoodieWriteConfig config,
+ HoodieWriteMetadata<JavaRDD<WriteStatus>>
writeMetadata,
+ HoodieEngineContext context,
+ HoodieTable table,
+ String instantTime) {
+ if (StringUtils.isNullOrEmpty(config.getPreCommitValidators())) {
+ LOG.info("no validators configured.");
+ } else {
+ Set<String> partitionsModified;
+ if (writeMetadata.getWriteStats().isPresent()) {
+ partitionsModified = new
HashSet<>(writeMetadata.getWriteStats().get().stream().map(writeStats ->
+ writeStats.getPartitionPath()).collect(Collectors.toList()));
+ } else {
+ partitionsModified = new
HashSet<>(writeMetadata.getWriteStatuses().map(WriteStatus::getPartitionPath).collect());
+ }
+ SQLContext sqlContext = new
SQLContext(HoodieSparkEngineContext.getSparkContext(context));
+ // Refresh timeline to ensure validator sees the any other operations
done on timeline (async operations such as other clustering/compaction/rollback)
+ table.getMetaClient().reloadActiveTimeline();
+ Dataset<Row> beforeState = getRecordsFromCommittedFiles(sqlContext,
partitionsModified, table).cache();
+ Dataset<Row> afterState = getRecordsFromPendingCommits(sqlContext,
partitionsModified, writeMetadata.getPartitionToReplaceFileIds(),
table).cache();
+
+ Stream<SparkPreCommitValidator> validators =
Arrays.stream(config.getPreCommitValidators().split(","))
+ .map(validatorClass -> {
+ return ((SparkPreCommitValidator)
ReflectionUtils.loadClass(validatorClass,
+ new Class<?>[] {HoodieSparkTable.class,
HoodieEngineContext.class, HoodieWriteConfig.class},
+ table, context, config));
+ });
+
+ boolean allSuccess = validators.map(v -> runValidatorAsync(v,
writeMetadata, beforeState, afterState,
instantTime)).map(CompletableFuture::join)
+ .reduce(true, Boolean::logicalAnd);
+
+ if (allSuccess) {
+ LOG.info("All validations succeeded");
+ } else {
+ LOG.error("At least one pre-commit validation failed");
+ throw new HoodieValidationException("At least one pre-commit
validation failed");
+ }
+ }
+ }
+
+ /**
+ * Run validators in a separate threadpool for parallelism. Each of
validator can submit a distributed spark job if needed.
+ */
+ private static CompletableFuture<Boolean>
runValidatorAsync(SparkPreCommitValidator validator, HoodieWriteMetadata
writeMetadata,
+ Dataset<Row>
beforeState, Dataset<Row> afterState, String instantTime) {
+ return CompletableFuture.supplyAsync(() -> {
+ try {
+ validator.validate(instantTime, writeMetadata, beforeState,
afterState);
+ LOG.info("validation complete for " + validator.getClass().getName());
+ return true;
+ } catch (HoodieValidationException e) {
+ LOG.error("validation failed for " + validator.getClass().getName());
+ return false;
+ }
+ });
+ }
+
+ /**
+ * Get records from partitions modified as a dataset.
+ * Note that this only works for COW tables.
+ */
+ public static Dataset<Row> getRecordsFromCommittedFiles(SQLContext
sqlContext,
+ Set<String>
partitionsAffected, HoodieTable table) {
+
+ List<String> committedFiles = partitionsAffected.stream()
+ .flatMap(partition ->
table.getBaseFileOnlyView().getLatestBaseFiles(partition).map(bf ->
bf.getPath()))
+ .collect(Collectors.toList());
+
+ if (committedFiles.isEmpty()) {
+ return sqlContext.emptyDataFrame();
+ }
+ return readRecordsForBaseFiles(sqlContext, committedFiles);
+ }
+
+ /**
+ * Get records from specified list of data files.
+ */
+ public static Dataset<Row> readRecordsForBaseFiles(SQLContext sqlContext,
List<String> baseFilePaths) {
+ return
sqlContext.read().parquet(JavaConverters.asScalaBufferConverter(baseFilePaths).asScala());
+ }
+
+ /**
+ * Get reads from paritions modified including any inflight commits.
+ * Note that this only works for COW tables
+ */
+ public static Dataset<Row> getRecordsFromPendingCommits(SQLContext
sqlContext,
+ Set<String>
partitionsAffected,
+ Map<String,
List<String>> partitionToReplacedFileIds,
+ HoodieTable table) {
+
+ // build file system view with pending commits
+ HoodieTableFileSystemView fsView = new
HoodieTableFileSystemView(table.getMetaClient(),
+ table.getActiveTimeline().getCommitsTimeline());
+
+ List<String> newFiles = partitionsAffected.stream().flatMap(partition -> {
+ return fsView.getLatestBaseFiles(partition)
+ .filter(bf -> !partitionToReplacedFileIds.getOrDefault(partition,
Collections.emptyList()).contains(bf.getFileId()))
Review comment:
@satishkotha : You can pass HoodieCommitMetadata and
partitionToReplaceFileIds directly as constructor arguments to
HoodieTablePreCommitFileSystemView. As the current setup wont work with
concurrent writers, this change is needed for correctness. Implementing at the
filesystemView abstraction is safe and clean as it would hide the callers from
needing to worry about inflights. Also, we can have this view be reused.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@hudi.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Add Precommit validator framework
> ---------------------------------
>
> Key: HUDI-2072
> URL: https://issues.apache.org/jira/browse/HUDI-2072
> Project: Apache Hudi
> Issue Type: New Feature
> Reporter: satish
> Assignee: satish
> Priority: Major
> Labels: pull-request-available
>
> We want to run pre-commit validators before 'promoting' a inflight operation
> to commit.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
