[PATCH 2/6] xfs_scrub_all: remove journalctl background process

Darrick J. Wong
2023-12-31T22:57:49Z

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@kernel.org>
---
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 f27251fa543..fc7a2e637ef 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)