3:29 a.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
netlink: monitor: join scanner thread on __exit__
In case a timeout occurs, the _scan() function ultimately ends, but
nothing explicitly waits on its control thread. It is harmless in the
case of netlink.monitor, but it is impolite to leak threads, even for a
short while.
This patch explicitly waits for the scan thread to finish before exiting
from an event monitor context manager.
The issue was spotted by running the tests with --countthreads.
Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/network/netlink/monitor.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/69041/1
diff --git a/lib/vdsm/network/netlink/monitor.py b/lib/vdsm/network/netlink/monitor.py
index 089c1ec..fc538e0 100644
--- a/lib/vdsm/network/netlink/monitor.py
+++ b/lib/vdsm/network/netlink/monitor.py
@@ -124,6 +124,7 @@
def __exit__(self, groups, timeout, silent_timeout):
if not self.is_stopped():
self.stop()
+ self._scan_thread.join()
def start(self):
if self._timeout:
@@ -168,7 +169,6 @@
self._scanning_stopped.set()
self._scanning_started.wait()
os.write(self._pipetrick[1], b'c')
- self._scan_thread.join()
def is_stopped(self):
return self._scanning_stopped.is_set()
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
9:39 a.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
Patch Set 3: Code-Review-1
(2 comments)
https://gerrit.ovirt.org/#/c/69041/3//COMMIT_MSG
Commit Message:
PS3, Line 17: with --countthreads
the plugin was renamed --with-thread-leak-check
https://gerrit.ovirt.org/#/c/69041/3/lib/vdsm/network/netlink/monitor.py
File lib/vdsm/network/netlink/monitor.py:
Line 173: def is_stopped(self):
Line 174: return self._scanning_stopped.is_set()
Line 175:
Line 176: def wait(self, timeout=None):
Line 177: if timeout:
I think you can copy timeout blindly.
you current code blocks forever if timeout=0.
Line 178: self._scan_thread.join(timeout)
Line 179: else:
Line 180: self._scan_thread.join()
Line 181:
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
12:18 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/69041/3/lib/vdsm/network/netlink/monitor.py
File lib/vdsm/network/netlink/monitor.py:
Line 173: def is_stopped(self):
Line 174: return self._scanning_stopped.is_set()
Line 175:
Line 176: def wait(self, timeout=None):
Line 177: if timeout:
is should not block forever if timeout parameter of the monitor
works. i'd
I'll try to rephrase. Why not a simple
self._scan_thread.join(timeout=timeout)
?
Line 178: self._scan_thread.join(timeout)
Line 179: else:
Line 180: self._scan_thread.join()
Line 181:
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
12:19 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/69041/3/lib/vdsm/network/netlink/monitor.py
File lib/vdsm/network/netlink/monitor.py:
Line 173: def is_stopped(self):
Line 174: return self._scanning_stopped.is_set()
Line 175:
Line 176: def wait(self, timeout=None):
Line 177: if timeout:
I'll try to rephrase. Why not a simple
ah, just seen ps3.
Line 178: self._scan_thread.join(timeout)
Line 179: else:
Line 180: self._scan_thread.join()
Line 181:
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
12:20 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
Patch Set 4: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
3:07 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
3:07 p.m.
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: netlink: monitor: join scanner thread on __exit__
......................................................................
netlink: monitor: join scanner thread on __exit__
In case a timeout occurs, the _scan() function ultimately ends, but
nothing explicitly waits on its control thread. It is harmless in the
case of netlink.monitor, but it is impolite to leak threads, even for a
short while.
This patch explicitly waits for the scan thread to finish before exiting
from an event monitor context manager.
The issue was spotted by running the tests with --with-thread-leak-check.
Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
Signed-off-by: Petr Horáček <phoracek(a)redhat.com>
---
M lib/vdsm/network/netlink/monitor.py
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Nir Soffer: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Petr Horáček: Verified
Dan Kenigsberg: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/69041
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9dd0097ad8d6ba5288e27b8f02bc62fc562030e9
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
2666
days inactive
2679
days old
vdsm-patches@lists.fedorahosted.org
6 comments
1 participants
participants (1)
-
Code Review