Skip to content

Commit 85081c4

Browse files
Turn all nacks to requeue False (#811)
A temporary workaround for the rabbitmq errors we are seeing
1 parent c5b5069 commit 85081c4

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

src/murfey/server/feedback.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,9 @@ def feedback_callback(header: dict, message: dict, _db=murfey_db) -> None:
21132113
if bfactors_registered:
21142114
murfey.server._transport_object.transport.ack(header)
21152115
else:
2116-
murfey.server._transport_object.transport.nack(header)
2116+
murfey.server._transport_object.transport.nack(
2117+
header, requeue=False
2118+
)
21172119
return None
21182120
elif message["register"] == "done_bfactor":
21192121
_save_bfactor(message, _db)
@@ -2144,8 +2146,8 @@ def feedback_callback(header: dict, message: dict, _db=murfey_db) -> None:
21442146
else:
21452147
# Send it directly to DLQ without trying to rerun it
21462148
murfey.server._transport_object.transport.nack(
2147-
header, requeue=result.get("requeue", False)
2148-
)
2149+
header, requeue=False
2150+
) # should be result.get("requeue", False)
21492151
if not result:
21502152
logger.error(
21512153
f"Workflow {sanitise(message['register'])} returned {result}"
@@ -2160,18 +2162,24 @@ def feedback_callback(header: dict, message: dict, _db=murfey_db) -> None:
21602162
_db.close()
21612163
logger.warning("Murfey database required a rollback")
21622164
if murfey.server._transport_object:
2163-
murfey.server._transport_object.transport.nack(header, requeue=True)
2165+
murfey.server._transport_object.transport.nack(
2166+
header, requeue=False
2167+
) # should be True
21642168
except OperationalError:
21652169
logger.warning("Murfey database error encountered", exc_info=True)
21662170
time.sleep(1)
21672171
if murfey.server._transport_object:
2168-
murfey.server._transport_object.transport.nack(header, requeue=True)
2172+
murfey.server._transport_object.transport.nack(
2173+
header, requeue=False
2174+
) # should be True
21692175
except NoResultFound:
21702176
# Missing rows might be due to a race condition and should be requeued
21712177
logger.warning("No matching database row was found", exc_info=True)
21722178
time.sleep(1)
21732179
if murfey.server._transport_object:
2174-
murfey.server._transport_object.transport.nack(header, requeue=True)
2180+
murfey.server._transport_object.transport.nack(
2181+
header, requeue=False
2182+
) # should be True
21752183
except Exception:
21762184
logger.warning(
21772185
"Exception encountered in server RabbitMQ callback", exc_info=True

0 commit comments

Comments
 (0)