[HUDI-2305] Add MARKERS.type and fix marker-based rollback (#3472)
- Rollback infers the directory structure and does rollback based on the strategy used while markers were written. "write markers type" in write config is used to determine marker strategy only for new writes.
This commit is contained in:
Y Ethan Guo
@@ -18,15 +18,15 @@
|
||||
|
||||
package org.apache.hudi.client.embedded;
|
||||
|
||||
import org.apache.hudi.common.engine.HoodieEngineContext;
|
||||
import org.apache.hudi.common.config.SerializableConfiguration;
|
||||
import org.apache.hudi.common.engine.HoodieEngineContext;
|
||||
import org.apache.hudi.common.fs.FSUtils;
|
||||
import org.apache.hudi.common.table.marker.MarkerType;
|
||||
import org.apache.hudi.common.table.view.FileSystemViewManager;
|
||||
import org.apache.hudi.common.table.view.FileSystemViewStorageConfig;
|
||||
import org.apache.hudi.common.table.view.FileSystemViewStorageType;
|
||||
import org.apache.hudi.common.util.NetworkUtils;
|
||||
import org.apache.hudi.config.HoodieWriteConfig;
|
||||
import org.apache.hudi.table.marker.MarkerType;
|
||||
import org.apache.hudi.timeline.service.TimelineService;
|
||||
|
||||
import org.apache.log4j.LogManager;
|
||||
|
||||
@@ -30,11 +30,12 @@ import org.apache.hudi.common.config.HoodieMetadataConfig;
|
||||
import org.apache.hudi.common.engine.EngineType;
|
||||
import org.apache.hudi.common.fs.ConsistencyGuardConfig;
|
||||
import org.apache.hudi.common.model.HoodieCleaningPolicy;
|
||||
import org.apache.hudi.common.model.HoodieFileFormat;
|
||||
import org.apache.hudi.common.model.HoodieFailedWritesCleaningPolicy;
|
||||
import org.apache.hudi.common.model.HoodieFileFormat;
|
||||
import org.apache.hudi.common.model.OverwriteWithLatestAvroPayload;
|
||||
import org.apache.hudi.common.model.WriteConcurrencyMode;
|
||||
import org.apache.hudi.common.table.HoodieTableConfig;
|
||||
import org.apache.hudi.common.table.marker.MarkerType;
|
||||
import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion;
|
||||
import org.apache.hudi.common.table.view.FileSystemViewStorageConfig;
|
||||
import org.apache.hudi.common.util.ReflectionUtils;
|
||||
@@ -46,7 +47,6 @@ import org.apache.hudi.metrics.MetricsReporterType;
|
||||
import org.apache.hudi.metrics.datadog.DatadogHttpClient.ApiSite;
|
||||
import org.apache.hudi.table.action.compact.CompactionTriggerStrategy;
|
||||
import org.apache.hudi.table.action.compact.strategy.CompactionStrategy;
|
||||
import org.apache.hudi.table.marker.MarkerType;
|
||||
|
||||
import org.apache.hadoop.hbase.io.compress.Compression;
|
||||
import org.apache.orc.CompressionKind;
|
||||
|
||||
@@ -24,6 +24,7 @@ import org.apache.hudi.common.fs.FSUtils;
|
||||
import org.apache.hudi.common.model.IOType;
|
||||
import org.apache.hudi.common.table.HoodieTableMetaClient;
|
||||
import org.apache.hudi.common.util.HoodieTimer;
|
||||
import org.apache.hudi.common.util.MarkerUtils;
|
||||
import org.apache.hudi.common.util.Option;
|
||||
import org.apache.hudi.exception.HoodieException;
|
||||
import org.apache.hudi.exception.HoodieIOException;
|
||||
@@ -149,7 +150,7 @@ public class DirectWriteMarkers extends WriteMarkers {
|
||||
}
|
||||
|
||||
private String translateMarkerToDataPath(String markerPath) {
|
||||
String rPath = stripMarkerFolderPrefix(markerPath);
|
||||
String rPath = MarkerUtils.stripMarkerFolderPrefix(markerPath, basePath, instantTime);
|
||||
return stripMarkerSuffix(rPath);
|
||||
}
|
||||
|
||||
@@ -158,7 +159,7 @@ public class DirectWriteMarkers extends WriteMarkers {
|
||||
Set<String> markerFiles = new HashSet<>();
|
||||
if (doesMarkerDirExist()) {
|
||||
FSUtils.processFiles(fs, markerDirPath.toString(), fileStatus -> {
|
||||
markerFiles.add(stripMarkerFolderPrefix(fileStatus.getPath().toString()));
|
||||
markerFiles.add(MarkerUtils.stripMarkerFolderPrefix(fileStatus.getPath().toString(), basePath, instantTime));
|
||||
return true;
|
||||
}, false);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
/*
|
||||
* 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.table.marker;
|
||||
|
||||
import org.apache.hudi.common.engine.HoodieEngineContext;
|
||||
import org.apache.hudi.common.table.marker.MarkerType;
|
||||
import org.apache.hudi.common.util.MarkerUtils;
|
||||
import org.apache.hudi.common.util.Option;
|
||||
import org.apache.hudi.exception.HoodieException;
|
||||
import org.apache.hudi.table.HoodieTable;
|
||||
|
||||
import org.apache.hadoop.fs.FileSystem;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* A utility class for marker-based rollback.
|
||||
*/
|
||||
public class MarkerBasedRollbackUtils {
|
||||
/**
|
||||
* Gets all marker paths.
|
||||
*
|
||||
* @param table instance of {@code HoodieTable} to use
|
||||
* @param context instance of {@code HoodieEngineContext} to use
|
||||
* @param instant instant of interest to rollback
|
||||
* @param parallelism parallelism to use
|
||||
* @return a list of all markers
|
||||
* @throws IOException
|
||||
*/
|
||||
public static List<String> getAllMarkerPaths(HoodieTable table, HoodieEngineContext context,
|
||||
String instant, int parallelism) throws IOException {
|
||||
String markerDir = table.getMetaClient().getMarkerFolderPath(instant);
|
||||
FileSystem fileSystem = table.getMetaClient().getFs();
|
||||
Option<MarkerType> markerTypeOption = MarkerUtils.readMarkerType(fileSystem, markerDir);
|
||||
|
||||
// If there is no marker type file "MARKERS.type", we assume "DIRECT" markers are used
|
||||
if (!markerTypeOption.isPresent()) {
|
||||
WriteMarkers writeMarkers = WriteMarkersFactory.get(MarkerType.DIRECT, table, instant);
|
||||
return new ArrayList<>(writeMarkers.allMarkerFilePaths());
|
||||
}
|
||||
|
||||
switch (markerTypeOption.get()) {
|
||||
case TIMELINE_SERVER_BASED:
|
||||
// Reads all markers written by the timeline server
|
||||
Map<String, Set<String>> markersMap =
|
||||
MarkerUtils.readTimelineServerBasedMarkersFromFileSystem(
|
||||
markerDir, fileSystem, context, parallelism);
|
||||
return markersMap.values().stream().flatMap(Collection::stream)
|
||||
.collect(Collectors.toCollection(ArrayList::new));
|
||||
default:
|
||||
throw new HoodieException(
|
||||
"The marker type \"" + markerTypeOption.get().name() + "\" is not supported.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
/*
|
||||
* 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.table.marker;
|
||||
|
||||
/**
|
||||
* Marker type indicating how markers are stored in the file system.
|
||||
*/
|
||||
public enum MarkerType {
|
||||
DIRECT,
|
||||
TIMELINE_SERVER_BASED
|
||||
}
|
||||
@@ -23,7 +23,6 @@ import org.apache.hudi.common.fs.FSUtils;
|
||||
import org.apache.hudi.common.model.IOType;
|
||||
import org.apache.hudi.common.table.HoodieTableMetaClient;
|
||||
import org.apache.hudi.common.util.Option;
|
||||
import org.apache.hudi.common.util.ValidationUtils;
|
||||
import org.apache.hudi.exception.HoodieIOException;
|
||||
|
||||
import org.apache.hadoop.fs.Path;
|
||||
@@ -127,23 +126,6 @@ public abstract class WriteMarkers implements Serializable {
|
||||
return new Path(path, markerFileName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Strips the folder prefix of the marker file path.
|
||||
*
|
||||
* @param fullMarkerPath the full path of the marker file
|
||||
* @return marker file name
|
||||
*/
|
||||
protected String stripMarkerFolderPrefix(String fullMarkerPath) {
|
||||
ValidationUtils.checkArgument(fullMarkerPath.contains(HoodieTableMetaClient.MARKER_EXTN));
|
||||
String markerRootPath = Path.getPathWithoutSchemeAndAuthority(
|
||||
new Path(String.format("%s/%s/%s", basePath, HoodieTableMetaClient.TEMPFOLDER_NAME, instantTime))).toString();
|
||||
int begin =
|
||||
fullMarkerPath.indexOf(markerRootPath);
|
||||
ValidationUtils.checkArgument(begin >= 0,
|
||||
"Not in marker dir. Marker Path=" + fullMarkerPath + ", Expected Marker Root=" + markerRootPath);
|
||||
return fullMarkerPath.substring(begin + markerRootPath.length() + 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes the marker directory.
|
||||
*
|
||||
|
||||
@@ -20,6 +20,7 @@ package org.apache.hudi.table.marker;
|
||||
|
||||
import org.apache.hudi.common.fs.FSUtils;
|
||||
import org.apache.hudi.common.fs.StorageSchemes;
|
||||
import org.apache.hudi.common.table.marker.MarkerType;
|
||||
import org.apache.hudi.exception.HoodieException;
|
||||
import org.apache.hudi.table.HoodieTable;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user