Skip to content

use correct identity to initiate delete in HDFS #13908

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
phd3 merged 1 commit into from
Sep 8, 2022
+4 −4
Merged

use correct identity to initiate delete in HDFS #13908

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
8 changes: 4 additions & 4 deletions ...n/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftHiveMetastore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ public class ThriftHiveMetastore

private static final String DEFAULT_METASTORE_USER = "presto";

private final HdfsContext hdfsContext = new HdfsContext(ConnectorIdentity.ofUser(DEFAULT_METASTORE_USER));

private final Optional<ConnectorIdentity> identity;
private final HdfsEnvironment hdfsEnvironment;
private final IdentityAwareMetastoreClientFactory metastoreClientFactory;
Expand Down Expand Up @@ -955,7 +953,7 @@ public void dropTable(String databaseName, String tableName, boolean deleteData)
client.dropTable(databaseName, tableName, deleteData);
String tableLocation = table.getSd().getLocation();
if (deleteFilesOnDrop && deleteData && isManagedTable(table) && !isNullOrEmpty(tableLocation)) {
deleteDirRecursive(hdfsContext, hdfsEnvironment, new Path(tableLocation));
deleteDirRecursive(new Path(tableLocation));
}
}
return null;
Expand All @@ -972,9 +970,11 @@ public void dropTable(String databaseName, String tableName, boolean deleteData)
}
}

private static void deleteDirRecursive(HdfsContext context, HdfsEnvironment hdfsEnvironment, Path path)
private void deleteDirRecursive(Path path)
{
try {
HdfsContext context = new HdfsContext(identity.orElseGet(() ->
ConnectorIdentity.ofUser(DEFAULT_METASTORE_USER)));
hdfsEnvironment.getFileSystem(context, path).delete(path, true);
}
catch (IOException | RuntimeException e) {
Expand Down