[impala] branch master updated: IMPALA-11633: Use longer ctas timeout for S3/Ozone

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ebf35cd5 IMPALA-11633: Use longer ctas timeout for S3/Ozone
6ebf35cd5 is described below

commit 6ebf35cd5d9d8762147b73bd99b53fd2ffc426d3
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Mon Feb 13 14:25:28 2023 -0800

    IMPALA-11633: Use longer ctas timeout for S3/Ozone
    
    File reads can be slower with S3 and Ozone in minicluster because
    they're not using shortcircuiting to directly access the file on disk.
    Allow more time for CTAS operations to complete when using a non-HDFS
    filesystem.
    
    Change-Id: I7a49cd44fc0fdc238313b92341467818a8f37fd1
    Reviewed-on: http://gerrit.cloudera.org:8080/19497
    Reviewed-by: Andrew Sherman <as...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 tests/metadata/test_ddl.py  | 4 +++-
 tests/metadata/test_load.py | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/metadata/test_ddl.py b/tests/metadata/test_ddl.py
index 06ef7fbc7..f633ad48a 100644
--- a/tests/metadata/test_ddl.py
+++ b/tests/metadata/test_ddl.py
@@ -1110,8 +1110,10 @@ class TestAsyncDDLTiming(TestDdlBase):
       assert client.get_state(handle) == pending_state
 
       # Wait for the statement to finish with a timeout of 20 seconds
+      # (30 seconds without shortcircuit reads)
+      wait_time = 20 if IS_HDFS else 30
       wait_start = time.time()
-      self.wait_for_state(handle, finished_state, 20, client=client)
+      self.wait_for_state(handle, finished_state, wait_time, client=client)
       wait_end = time.time()
       wait_time = wait_end - wait_start
       self.close_query_using_client(client, handle)
diff --git a/tests/metadata/test_load.py b/tests/metadata/test_load.py
index fad5924b9..149664d66 100644
--- a/tests/metadata/test_load.py
+++ b/tests/metadata/test_load.py
@@ -28,7 +28,7 @@ from tests.common.test_dimensions import (
     create_uncompressed_text_dimension)
 from tests.common.skip import SkipIfLocal
 from tests.common.test_vector import ImpalaTestDimension
-from tests.util.filesystem_utils import get_fs_path, WAREHOUSE
+from tests.util.filesystem_utils import get_fs_path, WAREHOUSE, IS_HDFS
 
 TEST_TBL_PART = "test_load"
 TEST_TBL_NOPART = "test_load_nopart"
@@ -222,8 +222,10 @@ class TestAsyncLoadData(ImpalaTestSuite):
       exec_end_state = client.get_state(handle)
 
       # Wait for the statement to finish with a timeout of 20 seconds
+      # (30 seconds without shortcircuit reads)
+      wait_time = 20 if IS_HDFS else 30
       wait_start = time.time()
-      self.wait_for_state(handle, finished_state, 20, client=client)
+      self.wait_for_state(handle, finished_state, wait_time, client=client)
       wait_end = time.time()
       wait_time = wait_end - wait_start
       self.close_query_using_client(client, handle)