From 54e045640955c4b0179bd78c90d2237ba41de0ba Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Fri, 14 May 2021 04:53:31 +0300 Subject: [PATCH] worker: Do not call detached() from LocalWorker This is handled automatically by the master-side AbstractWorker shutdown. AbstractWorker.stopService() -> disconnect() -> _disconnect() -> ull.Connection.loseConnection() -> notifyDisconnected() -> AbstractWorker.detached() --- worker/buildbot_worker/null.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/worker/buildbot_worker/null.py b/worker/buildbot_worker/null.py index 88d5e83fa..7286da324 100644 --- a/worker/buildbot_worker/null.py +++ b/worker/buildbot_worker/null.py @@ -36,8 +36,5 @@ class LocalWorker(WorkerBase): res = yield master.workers.newConnection(conn, self.name) if res: yield self.parent.attached(conn) - - @defer.inlineCallbacks - def stopService(self): - yield self.parent.detached() - yield WorkerBase.stopService(self) + # detached() will be called automatically on connection disconnection which is + # invoked from the master side when the AbstarctWorker.stopService() is called.