You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2018/07/09 07:30:59 UTC
cassandra-dtest git commit: Fix cleanup of log watcher threads at end
of tests
Repository: cassandra-dtest
Updated Branches:
refs/heads/master 5276d89b6 -> c98469d86
Fix cleanup of log watcher threads at end of tests
patch by Stefan Podkowinski; reviewed by Kurt Greaves for CASSANDRA-14558
Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/c98469d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/c98469d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/c98469d8
Branch: refs/heads/master
Commit: c98469d86642f9bf8a317a62112debd4b20e186e
Parents: 5276d89
Author: Stefan Podkowinski <st...@1und1.de>
Authored: Wed Jul 4 14:09:32 2018 +0200
Committer: Stefan Podkowinski <st...@1und1.de>
Committed: Mon Jul 9 09:25:58 2018 +0200
----------------------------------------------------------------------
conftest.py | 2 +-
dtest_setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/c98469d8/conftest.py
----------------------------------------------------------------------
diff --git a/conftest.py b/conftest.py
index 1078989..84ece62 100644
--- a/conftest.py
+++ b/conftest.py
@@ -288,7 +288,7 @@ def fixture_dtest_setup(request,
dtest_setup.initialize_cluster(fixture_dtest_create_cluster_func)
if not dtest_config.disable_active_log_watching:
- dtest_setup.log_watch_thread = dtest_setup.begin_active_log_watch()
+ dtest_setup.begin_active_log_watch()
# at this point we're done with our setup operations in this fixture
# yield to allow the actual test to run
http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/c98469d8/dtest_setup.py
----------------------------------------------------------------------
diff --git a/dtest_setup.py b/dtest_setup.py
index 6986479..b8e1b23 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -102,7 +102,7 @@ class DTestSetup:
When the cluster is no longer in use, stop_active_log_watch should be called to end log watching.
(otherwise a 'daemon' thread will (needlessly) run until the process exits).
"""
- self._log_watch_thread = self.cluster.actively_watch_logs_for_error(self._log_error_handler, interval=0.25)
+ self.log_watch_thread = self.cluster.actively_watch_logs_for_error(self._log_error_handler, interval=0.25)
def _log_error_handler(self, errordata):
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org