Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[HUDI-4501] Throwing exception when restore is attempted with hoodie.arhive.beyond.savepoint is enabled #6239

Merged
merged 3 commits into from
Aug 2, 2022
Merged

[HUDI-4501] Throwing exception when restore is attempted with hoodie.arhive.beyond.savepoint is enabled #6239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a3c6e
throwing exception when restore is attempted with hoodie.arhive.beyon…
nsivabalan Jul 29, 2022
bff48a4
addressing comments
nsivabalan Aug 1, 2022
7df35ac
fixing tests
nsivabalan Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieWriteClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.ValidationUtils;
import org.apache.hudi.common.util.collection.Pair;
import org.apache.hudi.config.HoodieArchivalConfig;
import org.apache.hudi.config.HoodieClusteringConfig;
import org.apache.hudi.config.HoodieCompactionConfig;
import org.apache.hudi.config.HoodieWriteConfig;
Expand Down Expand Up @@ -721,6 +722,8 @@ public void restoreToSavepoint(String savepointTime) {

HoodieTable<T, I, K, O> table = initTable(WriteOperationType.UNKNOWN, Option.empty(), initialMetadataTableIfNecessary);
SavepointHelpers.validateSavepointPresence(table, savepointTime);
ValidationUtils.checkArgument(!config.shouldArchiveBeyondSavepoint(), "Restore is not supported when " + HoodieArchivalConfig.ARCHIVE_BEYOND_SAVEPOINT.key()
+ " is enabled");
restoreToInstant(savepointTime, initialMetadataTableIfNecessary);
SavepointHelpers.validateSavepointRestore(table, savepointTime);
}
Expand Down
57 changes: 57 additions & 0 deletions ...src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.StringUtils;
import org.apache.hudi.common.util.collection.Pair;
import org.apache.hudi.config.HoodieArchivalConfig;
import org.apache.hudi.config.HoodieCompactionConfig;
import org.apache.hudi.config.HoodieIndexConfig;
import org.apache.hudi.config.HoodieClusteringConfig;
Expand Down Expand Up @@ -675,6 +676,62 @@ private void testUpsertsInternal(HoodieWriteConfig config,
}).collect();
}

@Test
public void testRestoreWithSavepointBeyondArchival() throws Exception {
HoodieWriteConfig config = getConfigBuilder().withRollbackUsingMarkers(true).build();
HoodieWriteConfig hoodieWriteConfig = getConfigBuilder(EAGER)
.withRollbackUsingMarkers(true)
.withArchivalConfig(HoodieArchivalConfig.newBuilder().withArchiveBeyondSavepoint(true).build())
.withProps(config.getProps()).withTimelineLayoutVersion(
VERSION_0).build();

HoodieTableMetaClient.withPropertyBuilder()
.fromMetaClient(metaClient)
.setTimelineLayoutVersion(VERSION_0)
.setPopulateMetaFields(config.populateMetaFields())
.initTable(metaClient.getHadoopConf(), metaClient.getBasePath());

SparkRDDWriteClient client = getHoodieWriteClient(hoodieWriteConfig);

// Write 1 (only inserts)
String newCommitTime = "001";
String initCommitTime = "000";
int numRecords = 200;
insertFirstBatch(hoodieWriteConfig, client, newCommitTime, initCommitTime, numRecords, SparkRDDWriteClient::insert,
false, true, numRecords, config.populateMetaFields());

// Write 2 (updates)
String prevCommitTime = newCommitTime;
newCommitTime = "004";
numRecords = 100;
String commitTimeBetweenPrevAndNew = "002";
updateBatch(hoodieWriteConfig, client, newCommitTime, prevCommitTime,
Option.of(Arrays.asList(commitTimeBetweenPrevAndNew)), initCommitTime, numRecords, SparkRDDWriteClient::upsert, false, true,
numRecords, 200, 2, config.populateMetaFields());

// Delete 1
prevCommitTime = newCommitTime;
newCommitTime = "005";
numRecords = 50;

deleteBatch(hoodieWriteConfig, client, newCommitTime, prevCommitTime,
initCommitTime, numRecords, SparkRDDWriteClient::delete, false, true,
0, 150, config.populateMetaFields());

HoodieWriteConfig newConfig = getConfigBuilder().withProps(config.getProps()).withTimelineLayoutVersion(
TimelineLayoutVersion.CURR_VERSION)
.withArchivalConfig(HoodieArchivalConfig.newBuilder().withArchiveBeyondSavepoint(true).build()).build();
client = getHoodieWriteClient(newConfig);

client.savepoint("004", "user1", "comment1");

// verify that restore fails when "hoodie.archive.beyond.savepoint" is enabled.
SparkRDDWriteClient finalClient = client;
assertThrows(IllegalArgumentException.class, () -> {
finalClient.restoreToSavepoint("004");
}, "Restore should not be supported when " + HoodieArchivalConfig.ARCHIVE_BEYOND_SAVEPOINT.key() + " is enabled");
}

/**
* Test Insert API for HoodieConcatHandle.
*/
Expand Down