Skip to content

Nessie: Prevent accidental deletion of files which are still referenced by other branches/tags #5718

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

Merged
Fokko merged 1 commit into from
Sep 8, 2022
Merged

Nessie: Prevent accidental deletion of files which are still referenced by other branches/tags #5718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions nessie/src/main/java/org/apache/iceberg/nessie/NessieTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.iceberg.Snapshot;
import org.apache.iceberg.SnapshotRef;
import org.apache.iceberg.TableMetadata;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.exceptions.CommitFailedException;
import org.apache.iceberg.exceptions.CommitStateUnknownException;
import org.apache.iceberg.exceptions.NoSuchTableException;
Expand Down Expand Up @@ -84,6 +85,12 @@ private TableMetadata loadTableMetadata(String metadataLocation, Reference refer
NessieUtil.tableMetadataFromIcebergTable(io(), table, metadataLocation);
Map<String, String> newProperties = Maps.newHashMap(deserialized.properties());
newProperties.put(NESSIE_COMMIT_ID_PROPERTY, reference.getHash());
// To prevent accidental deletion of files that are still referenced by other branches/tags,
// setting GC_ENABLED to false. So that all Iceberg's gc operations like expire_snapshots,
// remove_orphan_files, drop_table with purge will fail with an error.
// Nessie CLI will provide a reference aware GC functionality for the expired/unreferenced
// files.
newProperties.put(TableProperties.GC_ENABLED, "false");
TableMetadata.Builder builder =
TableMetadata.buildFrom(deserialized)
.setPreviousFileLocation(null)
Expand Down
18 changes: 18 additions & 0 deletions nessie/src/test/java/org/apache/iceberg/nessie/TestNessieTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@
import org.apache.iceberg.Table;
import org.apache.iceberg.TableMetadataParser;
import org.apache.iceberg.TableOperations;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.avro.AvroSchemaUtil;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.exceptions.AlreadyExistsException;
import org.apache.iceberg.exceptions.CommitFailedException;
import org.apache.iceberg.exceptions.NotFoundException;
import org.apache.iceberg.exceptions.ValidationException;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.types.Types;
import org.assertj.core.api.Assertions;
Expand Down Expand Up @@ -548,6 +550,22 @@ public void testListTables() {
Assertions.assertThat(catalog.tableExists(TABLE_IDENTIFIER)).isTrue();
}

@Test
public void testGCEnabled() {
Table icebergTable = catalog.loadTable(TABLE_IDENTIFIER);

Assertions.assertThat(icebergTable.properties().get(TableProperties.GC_ENABLED))
.isNotNull()
.isEqualTo("false");

Assertions.assertThatThrownBy(
() ->
icebergTable.expireSnapshots().expireOlderThan(System.currentTimeMillis()).commit())
.isInstanceOf(ValidationException.class)
.hasMessage(
"Cannot expire snapshots: GC is disabled (deleting files may corrupt other tables)");
}

private String getTableBasePath(String tableName) {
String databasePath = temp.toString() + "/" + DB_NAME;
return Paths.get(databasePath, tableName).toAbsolutePath().toString();
Expand Down