Changeset: 46ee0cf877f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/46ee0cf877f3
Modified Files:
monetdb5/modules/mal/clients.c
sql/test/sysmon/timeout/Tests/timeout_aggr.maltest
sql/test/sysmon/timeout/Tests/timeout_join.maltest
Branch: Jan2022
Log Message:
Reduce timeout for tests so that they are more likely to hit it.
diffs (78 lines):
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -502,7 +502,8 @@ CLTqueryTimeout(Client cntxt, MalBlkPtr
if (mal_clients[idx].mode == FREECLIENT)
msg = createException(MAL,"clients.queryTimeout","Session not
active anymore");
else {
- lng timeout_micro = (lng) qto * 1000000;
+ /* when testing (FORCEMITOMASK), reduce timeout of 1 sec to 1
msec */
+ lng timeout_micro = GDKdebug & FORCEMITOMASK && qto == 1 ? 1000
: (lng) qto * 1000000;
mal_clients[idx].querytimeout = timeout_micro;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
qry_ctx->querytimeout = timeout_micro;
diff --git a/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest
b/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest
--- a/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest
+++ b/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest
@@ -6,14 +6,13 @@ dbgmsk_unset := 8+8388608;
dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
mdb.setDebug(dbgmsk_set);
-t1:= alarm.usec();
barrier i:= 0:lng;
bat.append(a, i);
redo i:= iterator.next(1:lng,1000000:lng);
exit i;
mdb.setDebug(dbgmsk_restore);
-t2:= alarm.usec();
-d:=t2-t1;
-qto:= d + 1000:lng;
+qto:= 1000:lng;
clients.setQryTimeoutMicro(qto);
X_sum:hge := aggr.sum(a);
+qto:= 0:lng;
+clients.setQryTimeoutMicro(qto);
diff --git a/sql/test/sysmon/timeout/Tests/timeout_join.maltest
b/sql/test/sysmon/timeout/Tests/timeout_join.maltest
--- a/sql/test/sysmon/timeout/Tests/timeout_join.maltest
+++ b/sql/test/sysmon/timeout/Tests/timeout_join.maltest
@@ -7,18 +7,17 @@ dbgmsk_unset := 8+8388608;
dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
mdb.setDebug(dbgmsk_set);
-t1:= alarm.usec();
barrier i:= 0:lng;
bat.append(a, i);
bat.append(b, i);
redo i:= iterator.next(1:lng,1000000:lng);
exit i;
mdb.setDebug(dbgmsk_restore);
-t2:= alarm.usec();
-d:=t2-t1;
-qto:= d + 1000:lng;
+qto:= 1000:lng;
clients.setQryTimeoutMicro(qto);
(vg_a,xg_b):=algebra.join(a,b,nil:bat,nil:bat,false,nil:lng);
+qto:= 0:lng;
+clients.setQryTimeoutMicro(qto);
statement error
@@ -30,15 +29,14 @@ dbgmsk_unset := 8+8388608;
dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
mdb.setDebug(dbgmsk_set);
-t1:= alarm.usec();
barrier j:= 0:int;
bat.append(int_a, j);
bat.append(int_b, j);
redo j:= iterator.next(1:int,1000000:int);
exit j;
mdb.setDebug(dbgmsk_restore);
-t2:= alarm.usec();
-d:=t2-t1;
-qto:= d + 1000:lng;
+qto:= 1000:lng;
clients.setQryTimeoutMicro(qto);
(vg_a,xg_b):=algebra.join(int_a,int_b,nil:bat,nil:bat,false,nil:lng);
+qto:= 0:lng;
+clients.setQryTimeoutMicro(qto);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
