This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 2a9243c2d9d branch-3.0: [fix](regression) Fix test_show_data_warehouse
groovy failed occasionally in `ASAN` mode #47802 (#48268)
2a9243c2d9d is described below
commit 2a9243c2d9d2b0a95823a42cb9899a0e7bfbaf3b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Feb 25 09:57:20 2025 +0800
branch-3.0: [fix](regression) Fix test_show_data_warehouse groovy failed
occasionally in `ASAN` mode #47802 (#48268)
Cherry-picked from #47802
Co-authored-by: Lei Zhang <zhang...@selectdb.com>
---
.../suites/show_p0/test_show_data_warehouse.groovy | 29 ++++++++++++++--------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/regression-test/suites/show_p0/test_show_data_warehouse.groovy
b/regression-test/suites/show_p0/test_show_data_warehouse.groovy
index e51434da0d3..71ca9d7f7e7 100644
--- a/regression-test/suites/show_p0/test_show_data_warehouse.groovy
+++ b/regression-test/suites/show_p0/test_show_data_warehouse.groovy
@@ -84,22 +84,29 @@ suite("test_show_data_warehouse") {
long start = System.currentTimeMillis()
long dataSize = 0
long current = -1
+
+ boolean hitDb1 = false;
+ boolean hitDb2 = false;
+ def result;
do {
current = System.currentTimeMillis()
- def res = sql """ show data
properties("entire_warehouse"="true","db_names"="${db1Name},${db2Name}"); """
- if (res[0][1].toInteger() > 0 && res[1][1].toInteger() > 0) {
- break;
+ result = sql """ show data
properties("entire_warehouse"="true","db_names"="${db1Name}"); """
+ if ((result.size() == 2) && result[0][1].toInteger() == 785 *
replicaCount1) {
+ hitDb1 = true;
}
- sleep(30000)
- } while (current - start < 600000)
- def result = sql """ show data
properties("entire_warehouse"="true","db_names"="${db1Name}"); """
- assertEquals(result.size(), 2)
- assertEquals(result[0][1].toInteger(), 785 * replicaCount1)
+ result = sql """ show data
properties("entire_warehouse"="true","db_names"="${db2Name}"); """
+ if (result.size() == 2 && result[0][1].toInteger() == 762 *
replicaCount1) {
+ hitDb2 = true;
+ }
+ if (hitDb1 && hitDb2) {
+ break
+ }
+ sleep(30000)
+ } while (current - start < 1200 * 1000)
- result = sql """ show data
properties("entire_warehouse"="true","db_names"="${db2Name}"); """
- assertEquals(result.size(), 2)
- assertEquals(result[0][1].toInteger(), 762 * replicaCount1)
+ // because asan be report maybe cost too much time
+ assertTrue((hitDb1 && hitDb2), "data size check fail after 1200s")
result = sql """ show data
properties("entire_warehouse"="true","db_names"="${db1Name},${db2Name}"); """
assertEquals(result.size(), 3)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
