From: Luca Boccassi <bluca@debian.org>
Date: Wed, 15 Feb 2023 19:58:58 +0000 (+0000)
Subject: Merge pull request #26213 from poettering/journal-rework-seqnum
X-Git-Tag: v254-rc1~1277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f97aae029c0fe44d64dc5ff202ab0125571211f;p=thirdparty%2Fsystemd.git

Merge pull request #26213 from poettering/journal-rework-seqnum

journal sequence number rework
---

6f97aae029c0fe44d64dc5ff202ab0125571211f
diff --cc test/units/testsuite-04.sh
index bab2bdc24e4,419d00bedfd..3cde55cacb7
--- a/test/units/testsuite-04.sh
+++ b/test/units/testsuite-04.sh
@@@ -256,14 -256,16 +256,23 @@@ if is_xattr_supported; the
      add_logs_filtering_override "logs-filtering.service" "10-allow-with-escape-char" "\x7emore~"
      [[ -n $(run_service_and_fetch_logs "logs-filtering.service") ]]
  
 +    add_logs_filtering_override "delegated-cgroup-filtering.service" "00-allow-all" ".*"
 +    [[ -n $(run_service_and_fetch_logs "delegated-cgroup-filtering.service") ]]
 +
 +    add_logs_filtering_override "delegated-cgroup-filtering.service" "01-discard-hello" "~hello"
 +    [[ -z $(run_service_and_fetch_logs "delegated-cgroup-filtering.service") ]]
 +
      rm -rf /etc/systemd/system/logs-filtering.service.d
 +    rm -rf /etc/systemd/system/delegated-cgroup-filtering.service.d
  fi
  
+ # Check that the seqnum field at least superficially works
+ systemd-cat echo "ya"
+ journalctl --sync
+ SEQNUM1=$(journalctl -o export -n 1 | grep -a __SEQNUM= | cut -d= -f2)
+ systemd-cat echo "yo"
+ journalctl --sync
+ SEQNUM2=$(journalctl -o export -n 1 | grep -a __SEQNUM= | cut -d= -f2)
+ test "$SEQNUM2" -gt "$SEQNUM1"
+ 
  touch /testok