This is an automated email from the ASF dual-hosted git repository.
924060929 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new fac13b82353 [fix](audit) deflake test_audit_log_hint_session_context
(#64617)
fac13b82353 is described below
commit fac13b823539dc218092255a5342d54256096edc
Author: 924060929 <[email protected]>
AuthorDate: Thu Jun 18 17:12:50 2026 +0800
[fix](audit) deflake test_audit_log_hint_session_context (#64617)
The regression test `test_audit_log_hint_session_context` (introduced by
#64569)
is flaky: it intermittently fails with `expected: <trace_id:...> but
was: <null>`.
### Root cause
The case locates the hint query's audit row with:
```sql
select ELEMENT_AT(changed_variables, 'session_context')
from __internal_schema.audit_log
where stmt like '%${marker}%' order by time desc limit 1
```
That polling query is itself written to the audit log, and its own
statement text
also contains `${marker}` (inside the `like` predicate), so its audit
row matches
the filter too. The self-row carries no `session_context`, so depending
on the
order in which audit rows are flushed, `order by time desc limit 1` can
return the
self-row and read a `null` value — which is the observed flakiness.
### Fix
Locate the row by the marker **and** the exact `session_context` value,
so the
`null` self-rows are excluded, then flush and retry until the expected
row appears.
Introduced by #64569.
---
.../test_audit_log_hint_session_context.groovy | 26 ++++++++++++++--------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git
a/regression-test/suites/audit/test_audit_log_hint_session_context.groovy
b/regression-test/suites/audit/test_audit_log_hint_session_context.groovy
index 32ccf653543..0ed4ed7ca83 100644
--- a/regression-test/suites/audit/test_audit_log_hint_session_context.groovy
+++ b/regression-test/suites/audit/test_audit_log_hint_session_context.groovy
@@ -51,21 +51,29 @@ suite("test_audit_log_hint_session_context",
"nonConcurrent") {
Thread.sleep(6000)
sql """call flush_audit_log()"""
- def retry = 180
- def query = """select ELEMENT_AT(changed_variables, 'session_context')
- from __internal_schema.audit_log
- where stmt like '%${stmtMarker}%' order by time desc limit
1"""
- def res = sql "${query}"
- while (res.isEmpty()) {
+ // The hint query's audit row must carry session_context in
changed_variables. Match by the
+ // marker AND the exact session_context value: the polling query below is
itself audited and
+ // its statement text also contains the marker, but it sets no
session_context. Picking a
+ // single row via "order by time desc limit 1" could therefore land on
such a self-row (whose
+ // session_context is null) depending on audit-flush ordering, which is
flaky. Counting rows
+ // whose session_context equals the expected value excludes those
self-rows entirely.
+ def retry = 60
+ def query = """select count(*) from __internal_schema.audit_log
+ where stmt like '%${stmtMarker}%'
+ and ELEMENT_AT(changed_variables, 'session_context') =
'${hintTrace}'"""
+ def found = (sql "${query}")[0][0] as long
+ while (found == 0) {
if (retry-- < 0) {
- throw new RuntimeException("audit_log row for the hint query was
not found")
+ throw new RuntimeException("audit_log row for the hint query with
the expected "
+ + "session_context was not found")
}
sleep(3000)
- res = sql "${query}"
+ sql """call flush_audit_log()"""
+ found = (sql "${query}")[0][0] as long
}
// The per-query SET_VAR hint session_context must be visible in
changed_variables.
- assertEquals(hintTrace, res[0][0].toString())
+ assertTrue(found >= 1)
sql "set global enable_audit_plugin = false"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
