Skip to content

Hive: ensure unlock is called when new metadata cannot be deleted #1998

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
rdblue merged 1 commit into from
Dec 28, 2020
Merged

Hive: ensure unlock is called when new metadata cannot be deleted #1998

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
20 changes: 15 additions & 5 deletions hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,7 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
throw new RuntimeException("Interrupted during commit", e);

} finally {
if (threw) {
// if anything went wrong, clean up the uncommitted metadata file
io().deleteFile(newMetadataLocation);
}
unlock(lockId);
cleanupMetadataAndUnlock(threw, newMetadataLocation, lockId);
}
}

Expand Down Expand Up @@ -367,6 +363,20 @@ private long acquireLock() throws UnknownHostException, TException, InterruptedE
return lockId;
}

private void cleanupMetadataAndUnlock(boolean errorThrown, String metadataLocation, Optional<Long> lockId) {
try {
if (errorThrown) {
// if anything went wrong, clean up the uncommitted metadata file
io().deleteFile(metadataLocation);
}
} catch (RuntimeException e) {
LOG.error("Fail to cleanup metadata file at {}", metadataLocation, e);
throw e;
Copy link

@giovannifumarola giovannifumarola Dec 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a fan of Throw within a Catch.
Maybe you can wrap it in something else.

Copy link
Contributor

@rdblue rdblue Dec 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine because we don't want to wrap or modify the original exception, and it is helpful to log the metadata location that was not correctly deleted.

Copy link
Contributor

@aokolnychyi aokolnychyi Dec 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we may leverage runSafely that was added recently.

    ExceptionUtil.runSafely(
        () -> {
          if (errorThrown) {
            // if anything went wrong, clean up the uncommitted metadata file
            io().deleteFile(metadataLocation);
          }
          return Void.TYPE;
        },
        e -> LOG.error("Failed to cleanup metadata file at {}", metadataLocation, e),
        () -> unlock(lockId));

Copy link
Contributor

@aokolnychyi aokolnychyi Dec 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @rdblue @jackye1995 @giovannifumarola

} finally {
unlock(lockId);
}
}

private void unlock(Optional<Long> lockId) {
if (lockId.isPresent()) {
try {
Expand Down