[FLINK-28767][sql-gateway] Fix unstable SqlGatewayServiceITCase.testC…

…ancelOperation
liuyongvs · Aug 12, 2022 · 8813a5a · 8813a5a
1 parent 4ebb787
commit 8813a5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...link-sql-gateway-test/src/test/java/org/apache/flink/table/gateway/SqlGatewayE2ECase.java b/...link-sql-gateway-test/src/test/java/org/apache/flink/table/gateway/SqlGatewayE2ECase.java
@@ -62,7 +62,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static org.apache.flink.table.catalog.hive.HiveCatalog.isEmbeddedMetastore;
 import static org.apache.flink.table.endpoint.hive.HiveServer2EndpointConfigOptions.CATALOG_HIVE_CONF_DIR;
 import static org.apache.flink.table.endpoint.hive.HiveServer2EndpointConfigOptions.THRIFT_PORT;
 import static org.apache.flink.tests.util.TestUtils.readCsvResultFiles;
@@ -134,7 +133,7 @@ private static File createHiveConf() {
                                         .toURI()))) {
             hiveConf.addResource(inputStream, HiveCatalog.HIVE_SITE_FILE);
             // trigger a read from the conf so that the input stream is read
-            isEmbeddedMetastore(hiveConf);
+            hiveConf.getVar(HiveConf.ConfVars.METASTOREURIS);
         } catch (Exception e) {
             throw new RuntimeException("Failed to load hive-site.xml from specified path", e);
         }

diff --git a/...eway/src/main/java/org/apache/flink/table/gateway/service/operation/OperationManager.java b/...eway/src/main/java/org/apache/flink/table/gateway/service/operation/OperationManager.java
@@ -238,6 +238,12 @@ public void run() {
                                 runBefore();
                                 resultFetcher = resultSupplier.call();
                                 runAfter();
+                            } catch (InterruptedException e) {
+                                // User cancel the execution.
+                                LOG.error(
+                                        String.format(
+                                                "Operation %s is interrupted.", operationHandle),
+                                        e);
                             } catch (Throwable t) {
                                 processThrowable(t);
                             }