Skip to content

Don't throw from finally block #5222

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
Jul 12, 2022
Merged

Don't throw from finally block #5222

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
3 changes: 1 addition & 2 deletions aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
io().deleteFile(newMetadataLocation);
}
} catch (RuntimeException e) {
LOG.error("Fail to cleanup metadata file at {}", newMetadataLocation, e);
throw e;
LOG.error("Failed to cleanup metadata file at {}", newMetadataLocation, e);
Copy link
Contributor

@dimas-b dimas-b Jul 7, 2022

Choose a reason for hiding this comment

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

Would you consider adding e as a "suppressed" exception to any previous exception?

It's a bit more refactoring, but often having more information in the thrown exception is more useful than logs.

Copy link
Contributor Author

@nastra nastra Jul 7, 2022

Choose a reason for hiding this comment

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

that might be a good option. Let's see what others think

Copy link
Contributor

@kbendick kbendick Jul 7, 2022

Choose a reason for hiding this comment

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

I like this option as well. As we lose the CommitFailedException, other than the log... but the exception is the most likely thing to be seen.

But I'd personally wait a bit to see if we hear from somebody at AWS.

Copy link
Contributor

@rdblue rdblue Jul 12, 2022

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. If it were easier, I'd opt to suppress the exception (maybe we should consider using runSafely for that) but since this is just warning that a file wasn't cleaned up, the important thing is not to throw.

}
}
}
Expand Down
3 changes: 1 addition & 2 deletions aws/src/main/java/org/apache/iceberg/aws/glue/GlueTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,7 @@ void cleanupMetadataAndUnlock(CommitStatus commitStatus, String metadataLocation
io().deleteFile(metadataLocation);
}
} catch (RuntimeException e) {
LOG.error("Fail to cleanup metadata file at {}", metadataLocation, e);
throw e;
LOG.error("Failed to cleanup metadata file at {}", metadataLocation, e);
} finally {
if (lockManager != null) {
lockManager.release(commitLockEntityId, metadataLocation);
Expand Down
3 changes: 1 addition & 2 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 @@ -578,8 +578,7 @@ private void cleanupMetadataAndUnlock(CommitStatus commitStatus, String metadata
io().deleteFile(metadataLocation);
}
} catch (RuntimeException e) {
LOG.error("Fail to cleanup metadata file at {}", metadataLocation, e);
throw e;
LOG.error("Failed to cleanup metadata file at {}", metadataLocation, e);
} finally {
unlock(lockId);
tableLevelMutex.unlock();
Expand Down