Fossil SCM
Do not issue error-log panics for timeouts unless the total CPU time exceeds 10 seconds.
Commit
d6fdfd372b8da9b841554b3f7d32fe3973d1bb74f2af48172379586f1151b650
Parent
0298a6fc8629f1b…
1 file changed
+2
-2
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -3019,14 +3019,14 @@ | ||
| 3019 | 3019 | static int nAlarmSeconds = 0; |
| 3020 | 3020 | static void sigalrm_handler(int x){ |
| 3021 | 3021 | sqlite3_uint64 tmUser = 0, tmKernel = 0; |
| 3022 | 3022 | fossil_cpu_times(&tmUser, &tmKernel); |
| 3023 | 3023 | if( fossil_strcmp(g.zPhase, "web-page reply")==0 |
| 3024 | - && tmUser+tmKernel<1000000 | |
| 3024 | + && tmUser+tmKernel<10000000 | |
| 3025 | 3025 | ){ |
| 3026 | 3026 | /* Do not log time-outs during web-page reply unless more than |
| 3027 | - ** 1 second of CPU time has been consumed */ | |
| 3027 | + ** 10 seconds of CPU time has been consumed */ | |
| 3028 | 3028 | return; |
| 3029 | 3029 | } |
| 3030 | 3030 | fossil_panic("Timeout after %d seconds during %s" |
| 3031 | 3031 | " - user %,llu µs, sys %,llu µs", |
| 3032 | 3032 | nAlarmSeconds, g.zPhase, tmUser, tmKernel); |
| 3033 | 3033 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3019,14 +3019,14 @@ | |
| 3019 | static int nAlarmSeconds = 0; |
| 3020 | static void sigalrm_handler(int x){ |
| 3021 | sqlite3_uint64 tmUser = 0, tmKernel = 0; |
| 3022 | fossil_cpu_times(&tmUser, &tmKernel); |
| 3023 | if( fossil_strcmp(g.zPhase, "web-page reply")==0 |
| 3024 | && tmUser+tmKernel<1000000 |
| 3025 | ){ |
| 3026 | /* Do not log time-outs during web-page reply unless more than |
| 3027 | ** 1 second of CPU time has been consumed */ |
| 3028 | return; |
| 3029 | } |
| 3030 | fossil_panic("Timeout after %d seconds during %s" |
| 3031 | " - user %,llu µs, sys %,llu µs", |
| 3032 | nAlarmSeconds, g.zPhase, tmUser, tmKernel); |
| 3033 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3019,14 +3019,14 @@ | |
| 3019 | static int nAlarmSeconds = 0; |
| 3020 | static void sigalrm_handler(int x){ |
| 3021 | sqlite3_uint64 tmUser = 0, tmKernel = 0; |
| 3022 | fossil_cpu_times(&tmUser, &tmKernel); |
| 3023 | if( fossil_strcmp(g.zPhase, "web-page reply")==0 |
| 3024 | && tmUser+tmKernel<10000000 |
| 3025 | ){ |
| 3026 | /* Do not log time-outs during web-page reply unless more than |
| 3027 | ** 10 seconds of CPU time has been consumed */ |
| 3028 | return; |
| 3029 | } |
| 3030 | fossil_panic("Timeout after %d seconds during %s" |
| 3031 | " - user %,llu µs, sys %,llu µs", |
| 3032 | nAlarmSeconds, g.zPhase, tmUser, tmKernel); |
| 3033 |