From b3483fa81079fc22f4b21a59450c2a79154d1e8a Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 26 Dec 2019 11:08:00 -0500 Subject: [PATCH] Add explicit returns from flush/ready threads --- node-daemon/pvcd/NodeInstance.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node-daemon/pvcd/NodeInstance.py b/node-daemon/pvcd/NodeInstance.py index be40ccc8..e0188972 100644 --- a/node-daemon/pvcd/NodeInstance.py +++ b/node-daemon/pvcd/NodeInstance.py @@ -663,6 +663,7 @@ class NodeInstance(object): zkhandler.writedata(self.zk_conn, { '/nodes/{}/domainstate'.format(self.name): 'flushed' }) self.flush_thread = None self.flush_stopper = False + return def unflush(self): self.logger.out('Restoring node {} to active service.'.format(self.name), state='i') @@ -710,3 +711,4 @@ class NodeInstance(object): zkhandler.writedata(self.zk_conn, { '/nodes/{}/domainstate'.format(self.name): 'ready' }) self.flush_thread = None self.flush_stopper = False + return