Commit a000e81
committed
fix(message_queue): prevent a 502 from stopping the bot
The bot stopped for more than 5 hours. The process continued to run, and
systemd showed NRestarts=0, but the bot wrote no more lines to the journal.
The progress message of a job stayed at "Step 19/25", but the job was
complete and the push to GitLab was successful.
Cause: the read timeout and the write timeout apply to one socket operation
only. They do not apply to the full request. The Telegram API server sent a
502 page through a slow proxy. Each part of that page started the socket
timeout again, thus the request continued for an unlimited time. The consumer
sends one message at a time. Thus this one request stopped all messages. The
"except Exception" block in the consumer loop did not operate, because the
code raised no error.
This commit makes three changes:
1. Time limit. Each request to Telegram now has a limit on the total time.
If the limit passes, the code raises NetworkError. The usual retry code
then does the retry. The limit applies to the queue, to the immediate
messages, to the automatic deletions, and to the check that the worker
does before a dump. Without a limit, that check can keep a worker for as
much as job_timeout, which is 2 hours.
2. Shorter errors. The function sanitize_telegram_error() keeps the status
code and a short part of the body. The failure wrote more than 700 lines
of HTML to the journal. It now writes one line. The bot also has an error
handler for the poll loop, thus that loop writes short lines too.
3. Correct order of edits. Each edit of a Telegram message gets an order
number from Redis. Redis keeps the number of the last edit that Telegram
accepted. The bot discards an edit whose number is less than that number.
Example: step 20 of 25 fails, then step 21 of 25 succeeds. The bot then
discards step 20 and does not show an earlier step. A retry of an edit
that has a number keeps that number, thus an old edit cannot move in
front of a later edit.
Two conditions need more care:
- If Redis loses the counter key but keeps the watermark key, the counter
must not start again at 1. All new numbers would then be less than the
watermark, and the bot would discard all subsequent edits. Thus the script
starts the counter at the watermark.
- A message that a version before this one put in the queue has no order
number. If Telegram accepted an edit for the same message, that edit is
more recent. Thus the bot discards the message with no number. If Telegram
accepted no edit, the bot sends the message.
The Lua scripts are in the new file dumpyarabot/lua_scripts.py. Each script
does a compare and a write. Redis runs a script from the start to the end and
does no other command at the same time. Thus two workers cannot change a key
between the compare and the write. The full cycle of test, edit, and mark is
not one operation, but only the bot process reads the queue.1 parent b064390 commit a000e81
6 files changed
Lines changed: 823 additions & 75 deletions
File tree
- dumpyarabot
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
| 5 | + | |
4 | 6 | | |
5 | | - | |
| 7 | + | |
| 8 | + | |
6 | 9 | | |
7 | 10 | | |
8 | | - | |
| 11 | + | |
9 | 12 | | |
10 | 13 | | |
11 | 14 | | |
| |||
105 | 108 | | |
106 | 109 | | |
107 | 110 | | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
108 | 144 | | |
109 | 145 | | |
110 | 146 | | |
| |||
163 | 199 | | |
164 | 200 | | |
165 | 201 | | |
| 202 | + | |
166 | 203 | | |
167 | 204 | | |
168 | 205 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
| 34 | + | |
33 | 35 | | |
34 | 36 | | |
35 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
0 commit comments