From: Darrick J. Wong <djwong@xxxxxxxxxx> Now that we only start systemd services if we're running in service mode, there's no need for the background journalctl process that only ran if we had started systemd services in non-service mode. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- scrub/xfs_scrub_all.in | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scrub/xfs_scrub_all.in b/scrub/xfs_scrub_all.in index f2b06fb8f7d..8b3ac332f53 100644 --- a/scrub/xfs_scrub_all.in +++ b/scrub/xfs_scrub_all.in @@ -261,17 +261,6 @@ def main(): fs = find_mounts() - # Tail the journal if we ourselves aren't a service... - journalthread = None - if 'SERVICE_MODE' not in os.environ: - try: - cmd=['journalctl', '--no-pager', '-q', '-S', 'now', \ - '-f', '-u', 'xfs_scrub@*', '-o', \ - 'cat'] - journalthread = subprocess.Popen(cmd) - except: - pass - # Schedule scrub jobs... running_devs = set() killfuncs = set() @@ -308,9 +297,6 @@ def main(): while len(killfuncs) > 0: wait_for_termination(cond, killfuncs) - if journalthread is not None: - journalthread.terminate() - # See the service mode comments in xfs_scrub.c for why we do this. if 'SERVICE_MODE' in os.environ: time.sleep(2)
