fix

Author: dengzhhu653

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AbstractAsyncOperationHandler.java

@@ -65,6 +65,7 @@ public abstract class AbstractAsyncOperationHandler <T extends TBase, A> {
   protected T request;
   protected IHMSHandler handler;
   protected final String id;
+  private long timeout;
 
   private AbstractAsyncOperationHandler(String id) {
     this.id = id;
@@ -75,6 +76,7 @@ private AbstractAsyncOperationHandler(String id) {
     this.handler = handler;
     this.request = request;
     this.async = async;
+    this.timeout = MetastoreConf.getBoolVar(handler.getConf(), HIVE_IN_TEST) ? 10 : 5000;
     OPID_TO_HANDLER.put(id, this);
     if (async) {
       this.executor = Executors.newFixedThreadPool(1, r -> {
@@ -86,14 +88,15 @@ private AbstractAsyncOperationHandler(String id) {
     } else {
       this.executor = MoreExecutors.newDirectExecutorService();
     }
-    this.future = executor.submit(() -> {
-      try {
-        return execute();
-      } finally {
-        destroy();
-        OPID_CLEANER.schedule(() -> OPID_TO_HANDLER.remove(id), 1, TimeUnit.HOURS);
-      }
-    });
+    this.future =
+        executor.submit(() -> {
+          try {
+            return execute();
+          } finally {
+            destroy();
+            OPID_CLEANER.schedule(() -> OPID_TO_HANDLER.remove(id), 1, TimeUnit.HOURS);
+          }
+        });
     this.executor.shutdown();
   }
 
@@ -155,8 +158,7 @@ public OperationStatus getOperationStatus() throws TException {
       throw new IllegalStateException(logMsgPrefix + " hasn't started yet");
     }
     try {
-      long interval = MetastoreConf.getBoolVar(handler.getConf(), HIVE_IN_TEST) ? 10 : 5000;
-      result = async ? future.get(interval, TimeUnit.MILLISECONDS) : future.get();
+      result = async ? future.get(timeout, TimeUnit.MILLISECONDS) : future.get();
     } catch (TimeoutException e) {
       // No Op, return to the caller since long polling timeout has expired
       LOG.trace("{} Long polling timed out", logMsgPrefix);
@@ -165,7 +167,7 @@ public OperationStatus getOperationStatus() throws TException {
       LOG.trace("{} The background operation was cancelled", logMsgPrefix);
     } catch (ExecutionException | InterruptedException e) {
       // No op, we will deal with this exception later
-      LOG.error(logMsgPrefix + " Failed", e);
+      LOG.error("{} Failed", logMsgPrefix, e);
       if (e.getCause() instanceof Exception ex && !aborted.get()) {
         throw handleException(ex).throwIfInstance(TException.class).defaultMetaException();
       }
@@ -214,7 +216,7 @@ public void setFinished(boolean finished) {
 
   public void cancelOperation() {
     if (!future.isDone()) {
-      LOG.warn("Drop operation: {} is still running, but a close signal is triggered", id);
+      LOG.warn("Operation: {} is still running, but a close signal is triggered", id);
       future.cancel(true);
       aborted.set(true);
     }
@@ -269,7 +271,6 @@ public void checkInterrupted() throws MetaException {
    */
   void destroy() {
     request = null;
-    executor = null;
     handler = null;
   }
 

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/AsyncDropTableHandler.java

@@ -41,6 +41,7 @@
 
 import static org.apache.hadoop.hive.metastore.HMSHandler.checkTableDataShouldBeDeleted;
 import static org.apache.hadoop.hive.metastore.HMSHandler.isDbReplicationTarget;
+import static org.apache.hadoop.hive.metastore.HMSHandler.isMustPurge;
 import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog;
 import static org.apache.hadoop.hive.metastore.utils.StringUtils.normalizeIdentifier;
 
@@ -111,7 +112,8 @@ public DropTableResult dropTable() throws TException {
         }
         success = ms.commitTransaction();
       }
-      return new DropTableResult(tbl, success, tableDataShouldBeDeleted,
+      return new DropTableResult(tblPath, success,
+          tableDataShouldBeDeleted, isMustPurge(request.getEnvContext(), tbl),
           partPaths, ReplChangeManager.shouldEnableCm(db, tbl));
     } finally {
       if (!success) {
@@ -172,12 +174,12 @@ public String getOperationProgress() {
   void destroy() {
     super.destroy();
     tbl = null;
-    tblPath = null;
   }
 
-  public record DropTableResult(Table table,
+  public record DropTableResult(Path tablePath,
                                 boolean success,
                                 boolean tableDataShouldBeDeleted,
+                                boolean ifPurge,
                                 List<Path> partPaths,
                                 boolean shouldEnableCm) {
 

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java

@@ -3087,16 +3087,13 @@ public AsyncOperationResp drop_table_req(DropTableRequest dropTableReq) throws M
         // to ensure the data is deleted on the transaction committed,
         // regardless of whether the operation has been aborted or not.
         if (result != null && result.success() && result.tableDataShouldBeDeleted()) {
-          boolean ifPurge = isMustPurge(dropTableReq.getEnvContext(), result.table());
+          boolean ifPurge = result.ifPurge();
           boolean shouldEnableCm = result.shouldEnableCm();
           // Data needs deletion. Check if trash may be skipped.
           // Delete the data in the partitions which have other locations
           deletePartitionData(result.partPaths(), ifPurge, shouldEnableCm);
           // Delete the data in the table
-          if (result.table().getSd().getLocation() != null) {
-            Path tablePath = new Path(result.table().getSd().getLocation());
-            deleteTableData(tablePath, ifPurge, shouldEnableCm);
-          }
+          deleteTableData(result.tablePath(), ifPurge, shouldEnableCm);
         }
       }
       AsyncOperationResp resp = new AsyncOperationResp(status.getId());