[impala] 02/02: IMPALA-11671: Clear trash for Ozone to avoid bug

[jo...@apache.org]

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

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

commit 1e30ca228d683821e42e51f94478c77642f5331a
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Tue Oct 18 16:33:16 2022 -0700

    IMPALA-11671: Clear trash for Ozone to avoid bug
    
    When using Ozone, clears trash before listing it after running tests to
    avoid HDDS-4974. It seems to come up specifically for files generated by
    query_test/test_cancellation.py and query_test/test_decimal_queries.py.
    
    Change-Id: I3dfdac33484cc4a033a81943c655928b8c5b24b0
    Reviewed-on: http://gerrit.cloudera.org:8080/19151
    Reviewed-by: Daniel Becker <da...@cloudera.com>
    Reviewed-by: Joe McDonnell <jo...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/run-all-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/run-all-tests.sh b/bin/run-all-tests.sh
index ba0d40dbe..f90d6f1bc 100755
--- a/bin/run-all-tests.sh
+++ b/bin/run-all-tests.sh
@@ -335,6 +335,10 @@ do
   # to the file-list-begin*.log from the beginning of the iteration to see if files
   # are not being cleaned up. This is most useful on the first iteration, when
   # the list of files is from dataload.
+  if [[ "${TARGET_FILESYSTEM}" = "ozone" ]]; then
+    # Clean up trash to avoid HDDS-4974 causing the next command to fail.
+    ozone fs -rm -r -skipTrash ${FILESYSTEM_PREFIX}/test-warehouse/.Trash
+  fi
   hdfs dfs -ls -R ${FILESYSTEM_PREFIX}/test-warehouse \
       > ${IMPALA_LOGS_DIR}/file-list-end-${i}.log 2>&1