- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: tcpdump/dumpcap: move kill_rm_pidfile to inc file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40164?usp=email ) Change subject: tcpdump/dumpcap: move kill_rm_pidfile to inc file ...................................................................... tcpdump/dumpcap: move kill_rm_pidfile to inc file Move kill_rm_pidfile out of the 4 ttcn3 tcpdump/dumpcap scripts into a shared include file. Use the version of the function that only tries to kill the command with sudo if it was started with sudo. This fixes dumpcap not stopping if: * it was started with ttcn3-tcpdump-start.sh (despite the name it will start dumpcap instead of tcpdump if dumpcap was found), where it gets started without sudo, and * no rule is in the user's sudoers file is set to run kill as root with NOPASSWD. Change-Id: Ia63c37b54fb42a8c64a676334cef6f9df4152e18 --- A _scripts/tcpdump-dumpcap.inc.sh M ttcn3-dumpcap-start.sh M ttcn3-dumpcap-stop.sh M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 5 files changed, 23 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/40164/1 diff --git a/_scripts/tcpdump-dumpcap.inc.sh b/_scripts/tcpdump-dumpcap.inc.sh new file mode 100644 index 0000000..d033998 --- /dev/null +++ b/_scripts/tcpdump-dumpcap.inc.sh @@ -0,0 +1,15 @@ +# This file gets included by ttcn3-{tcpdump,dumpcap}-{start,stop} scripts + +kill_rm_pidfile() { + if [ -e $1 ]; then + PSNAME="$(ps -q "$(cat "$1")" -o comm=)" + if [ "$PSNAME" != "sudo" ]; then + kill "$(cat "$1")" + else + # NOTE: This requires you to be root or something like + # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file + sudo kill "$(cat "$1")" + fi + rm $1 + fi +} diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh index a1e64fc..ddd4eb4 100755 --- a/ttcn3-dumpcap-start.sh +++ b/ttcn3-dumpcap-start.sh @@ -4,6 +4,8 @@ # needed when we want to capture from interfaces of different link # types. It will also store the results as pcap-ng, not plain old pcap. +. "$(dirname "$0")/_scripts/tcpdump-dumpcap.inc.sh" + PIDFILE_PCAP=/tmp/pcap.pid DUMPCAP=/usr/bin/dumpcap @@ -13,13 +15,6 @@ TESTCASE=$1 -kill_rm_pidfile() { - if [ -e $1 ]; then - kill "$(cat "$1")" - rm $1 - fi -} - echo "------ $TESTCASE ------" date diff --git a/ttcn3-dumpcap-stop.sh b/ttcn3-dumpcap-stop.sh index 95bcdb6..1ac8e7b 100755 --- a/ttcn3-dumpcap-stop.sh +++ b/ttcn3-dumpcap-stop.sh @@ -1,24 +1,12 @@ #!/bin/sh +. "$(dirname "$0")/_scripts/tcpdump-dumpcap.inc.sh" + PIDFILE_PCAP=/tmp/pcap.pid PIDFILE_NETCAT=/tmp/netcat.pid TESTCASE=$1 VERDICT="$2" -kill_rm_pidfile() { -if [ -e $1 ]; then - PSNAME="$(ps -q "$(cat "$1")" -o comm=)" - if [ "$PSNAME" != "sudo" ]; then - kill "$(cat "$1")" - else - # NOTE: This requires you to be root or something like - # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file - sudo kill "$(cat "$1")" - fi - rm $1 -fi -} - date if [ x"$VERDICT" = x"pass" ]; then diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 9575a68..2c2f8c5 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -1,5 +1,7 @@ #!/bin/sh +. "$(dirname "$0")/_scripts/tcpdump-dumpcap.inc.sh" + PIDFILE_PCAP=/tmp/pcap.pid TCPDUMP=$(command -v tcpdump) DUMPCAP=$(command -v dumpcap) @@ -18,17 +20,6 @@ # and this script will hang indefinitely fi -kill_rm_pidfile() { - # NOTE: This requires you to be root or something like - # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file - if [ -e "$1" ]; then - if [ -s "$1" ]; then - $SUDOSTR kill "$(cat "$1")" 2>&1 | grep -v "No such process" - fi - rm $1 - fi -} - echo "------ $TESTCASE ------" date diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index def10d8..65aeb2a 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -1,5 +1,7 @@ #!/bin/sh +. "$(dirname "$0")/_scripts/tcpdump-dumpcap.inc.sh" + PIDFILE_PCAP=/tmp/pcap.pid PIDFILE_NETCAT=/tmp/netcat.pid FIFO=/tmp/cmderr @@ -13,17 +15,6 @@ # and this script will hang indefinitely fi -kill_rm_pidfile() { - # NOTE: This requires you to be root or something like - # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file - if [ -e "$1" ]; then - if [ -s "$1" ]; then - $SUDOSTR kill "$(cat "$1")" 2>&1 | grep -v "No such process" - fi - rm $1 - fi -} - date if [ x"$VERDICT" = x"pass" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40164?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia63c37b54fb42a8c64a676334cef6f9df4152e18 Gerrit-Change-Number: 40164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: set osmo-bts sched priority to 30

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40153?usp=email ) Change subject: bts: set osmo-bts sched priority to 30 ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > From tps://gerrit.osmocom.org/c/osmo-bts/+/34581: […] I've added the information to the commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I828422e2363a58ca8c19d0f1b8a1b7d4e4bc031e Gerrit-Change-Number: 40153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Apr 2025 06:39:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: set osmo-bts sched priority to 30

by osmith

Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40153?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria Change subject: bts: set osmo-bts sched priority to 30 ...................................................................... bts: set osmo-bts sched priority to 30 Change the scheduling priority from 10 to 30, as we are currently see osmo-bts suffering from scheduling latency in jenkins even though we don't run other jobs at that time: 20250425034138405 DL1C ERROR PC clock skew: elapsed_us=387574, error_us=382959 (scheduler_trx.c:449) This should fix that the kernel prioritizes other (userspace or kernel) processes running on the same machine that have a higher priority. We have seen such an improvement after increasing scheduler priority for osmo-bts-sysmo too (see I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10). Priority 30 is higher than 10. From sched(7): > Processes scheduled under one of the real-time policies (SCHED_FIFO, > SCHED_RR) have a sched_priority value in the range 1 (low) to 99 (high). This testsuite currently gets executed through docker-playground and it fetches this config from osmo-ttcn3-hacks (see If15461240f3037c142c176fc7da745a1701ae3f8). Related: osmo-ci I0162f7299c8e37f893ffa10ddc4c8edece29ed7f Change-Id: I828422e2363a58ca8c19d0f1b8a1b7d4e4bc031e --- M bts/osmo-bts.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/40153/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I828422e2363a58ca8c19d0f1b8a1b7d4e4bc031e Gerrit-Change-Number: 40153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: ansible: build-hosts: add testenv-coredump-helper

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40138?usp=email ) Change subject: ansible: build-hosts: add testenv-coredump-helper ...................................................................... ansible: build-hosts: add testenv-coredump-helper The Osmocom jenkins nodes run inside LXCs. When we get a coredump it appears on the host. Add a helper script to the hosts so the jenkins jobs can fetch the coredumps in case an Osmocom program crashes while running a ttcn3 testsuite. The helper script has the following safety features to ensure jenkins can't just fetch any coredump: * Only fetch coredumps within the last 3 seconds and only if the executable matches osmo-* or open5gs-* * Only listen on the lxc IP Related: OS#6769 Change-Id: I7e66c98106b7028a393e3b873e96ae2dcb412c48 --- A ansible/roles/testenv-coredump-helper/README.md A ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.py A ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.service A ansible/roles/testenv-coredump-helper/handlers/main.yml A ansible/roles/testenv-coredump-helper/tasks/main.yml M ansible/setup-build-host.yml 6 files changed, 210 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ansible/roles/testenv-coredump-helper/README.md b/ansible/roles/testenv-coredump-helper/README.md new file mode 100644 index 0000000..d27f457 --- /dev/null +++ b/ansible/roles/testenv-coredump-helper/README.md @@ -0,0 +1,49 @@ +# testenv-coredump-helper + +A simple webserver to make Osmocom related coredumps available in LXCs. + +## Architecture + +``` +.-----------------------------------------------------------------------------. +| build host (build4) .--------------------------.| +| | LXC (deb12build-ansible) || +| | || +| shell | HTTP || +| coredumpctl --------- testenv-coredump-helper ------------- testenv || +| |__________________________|| +|_____________________________________________________________________________| +``` + +## What this script does + +This role installs a systemd service running the script in +`files/testenv-coredump-helper.py`, which runs a HTTP server on port `8042` of +the `lxcbr0`'s IP (e.g. `10.0.3.1`) on the build host. The IP is detected +dynamically as it is random on each build host. + +The HTTP server provides one GET endpoint `/core`. When it is requested (by +testenv running inside the LXC), the script runs `coredumpctl` with parameters +to check for any coredump within the last three seconds that was created for +any Osmocom specific program (starting with `osmo-*` or `open5gs-*`). + +* If no matching coredump was found, it returns HTTP status code `404`. + +* If a matching coredump was found, it returns HTTP status code `200`, sends + the path to the executable in an `X-Executable-Path` header and sends the + coredump itself as body. + +The coredump and path to the executable are retrieved from `coredumpctl`. The +coredump is stored in a temporary file for the duration of the transfer. + +## Client implementation + +The clientside implementation is in `osmo-ttcn3-hacks.git`, +`_testenv/testenv/coredump.py` in the `get_from_coredumpctl_lxc_host()` +function. + +## Maximum coredump size + +The `testenv-coredump-helper` script does not limit the size of the coredump, +however a maximum size that `systemd-coredump` accepts can be configured in +`/etc/systemd/coredump.conf`. diff --git a/ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.py b/ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.py new file mode 100644 index 0000000..a56bd0f --- /dev/null +++ b/ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python3 +# Copyright 2025 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: GPL-3.0-or-later +# Simple webserver to make Osmocom related coredumps available in LXCs. See +# ../README.md and OS#6769 for details. +import datetime +import fnmatch +import http.server +import json +import os +import shutil +import signal +import socket +import socketserver +import subprocess +import sys +import tempfile + + +NETDEV = "lxcbr0" +IP_PATTERN = "10.0.*" +PORT = 8042 + + +def find_lxc_ip(): + cmd = ["ip", "-j", "-o", "-4", "addr", "show", "dev", NETDEV] + p = subprocess.run(cmd, capture_output=True, text=True, check=True) + ret = json.loads(p.stdout)[0]["addr_info"][0]["local"] + if not fnmatch.fnmatch(ret, IP_PATTERN): + print(f"ERROR: IP doesn't match pattern {IP_PATTERN}: {ret}") + sys.exit(1) + return ret + + +def executable_is_relevant(exe): + basename = os.path.basename(exe) + patterns = [ + "open5gs-*", + "osmo-*", + ] + + for pattern in patterns: + if fnmatch.fnmatch(basename, pattern): + return True + + return False + + +class CustomRequestHandler(http.server.SimpleHTTPRequestHandler): + def do_GET(self): + if self.path == "/core": + # Check for any coredump within last 3 seconds + since = (datetime.datetime.now() - datetime.timedelta(seconds=3)).strftime("%Y-%m-%d %H:%M:%S") + cmd = ["coredumpctl", "-q", "-S", since, "--json=short", "-n1"] + + p = subprocess.run(cmd, capture_output=True, text=True) + if p.returncode != 0: + self.send_error(404, "No coredump found") + return None + + # Check if the coredump executable is from osmo-*, open5gs-*, etc. + coredump = json.loads(p.stdout)[0] + if not executable_is_relevant(coredump["exe"]): + self.send_error(404, "No coredump found") + return None + + # Put coredump into a temporary file and return it + with tempfile.TemporaryDirectory() as tmpdirname: + core_path = os.path.join(tmpdirname, "core") + cmd = [ + "coredumpctl", + "dump", + "-q", + "-S", + since, + "-o", + core_path, + str(coredump["pid"]), + coredump["exe"], + ] + subprocess.run(cmd, stdout=subprocess.DEVNULL, check=True) + + with open(core_path, "rb") as f: + self.send_response(200) + self.send_header("X-Executable-Path", coredump["exe"]) + self.end_headers() + self.wfile.write(f.read()) + else: + self.send_error(404, "File Not Found") + + +def signal_handler(sig, frame): + sys.exit(0) + + +def main(): + if not shutil.which("coredumpctl"): + print("ERROR: coredumpctl not found!") + sys.exit(1) + + ip = os.environ.get("LXC_HOST_IP") or find_lxc_ip() + print(f"Listening on {ip}:{PORT}") + signal.signal(signal.SIGINT, signal_handler) + with socketserver.TCPServer((ip, PORT), CustomRequestHandler, False) as httpd: + httpd.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + httpd.server_bind() + httpd.server_activate() + httpd.serve_forever() + + +if __name__ == "__main__": + main() diff --git a/ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.service b/ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.service new file mode 100644 index 0000000..ef5a851 --- /dev/null +++ b/ansible/roles/testenv-coredump-helper/files/testenv-coredump-helper.service @@ -0,0 +1,12 @@ +[Unit] +Description=testenv coredump helper +After=lxc.service + +[Service] +Environment="PYTHONUNBUFFERED=1" +Type=simple +Restart=always +ExecStart=/opt/testenv-coredump-helper/testenv-coredump-helper + +[Install] +WantedBy=multi-user.target diff --git a/ansible/roles/testenv-coredump-helper/handlers/main.yml b/ansible/roles/testenv-coredump-helper/handlers/main.yml new file mode 100644 index 0000000..0f7ef57 --- /dev/null +++ b/ansible/roles/testenv-coredump-helper/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart testenv-coredump-helper + service: + name: testenv-coredump-helper + state: restarted diff --git a/ansible/roles/testenv-coredump-helper/tasks/main.yml b/ansible/roles/testenv-coredump-helper/tasks/main.yml new file mode 100644 index 0000000..9ff2769 --- /dev/null +++ b/ansible/roles/testenv-coredump-helper/tasks/main.yml @@ -0,0 +1,31 @@ +--- +- name: install coredumpctl + apt: + name: + - systemd-coredump + cache_valid_time: 3600 + update_cache: yes + +- name: mkdir /opt/testenv-coredump-helper + ansible.builtin.file: + path: /opt/testenv-coredump-helper + state: directory + +- name: install testenv-coredump-helper + ansible.builtin.copy: + src: testenv-coredump-helper.py + dest: /opt/testenv-coredump-helper/testenv-coredump-helper + mode: '0755' + notify: restart testenv-coredump-helper + +- name: install testenv-coredump-helper service + ansible.builtin.copy: + src: testenv-coredump-helper.service + dest: /etc/systemd/system/testenv-coredump-helper.service + mode: '0644' + notify: restart testenv-coredump-helper + +- name: enable testenv-coredump-helper service + ansible.builtin.systemd_service: + name: testenv-coredump-helper + enabled: true diff --git a/ansible/setup-build-host.yml b/ansible/setup-build-host.yml index ed8def5..d1d9874 100644 --- a/ansible/setup-build-host.yml +++ b/ansible/setup-build-host.yml @@ -18,3 +18,4 @@ update_cache: yes roles: - name: apt-allow-relinfo-change + - name: testenv-coredump-helper -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7e66c98106b7028a393e3b873e96ae2dcb412c48 Gerrit-Change-Number: 40138 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: set core env var

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40139?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: set core env var ...................................................................... jobs/ttcn3-testsuites-testenv: set core env var Configure testenv jobs to get coredumps from lxc hosts. Related: OS#6769 Change-Id: I8359b0faa1fed76b430749589916cd072a8a7753 --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index a5e90af..f6a7798 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -530,6 +530,7 @@ export TESTENV_SOURCE_HIGHLIGHT_COLORS="esc" export TESTENV_NO_IMAGE_UP_TO_DATE_CHECK=1 export TESTENV_NO_KVM=1 + export TESTENV_COREDUMP_FROM_LXC_HOST=1 set -x ./testenv.py run \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8359b0faa1fed76b430749589916cd072a8a7753 Gerrit-Change-Number: 40139 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email ) Change subject: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason ...................................................................... osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason If osmo-bts-trx exit()s due to the PC clock issues, e.g. if the process stalls, it produces rather confusing logging messages: DL1C ERROR PC clock skew: elapsed_us=387574, error_us=382959 DOML NOTICE ... Shutting down BTS, exit 1, reason: No clock from osmo-trx The second message suggests that the transceiver (osmo-trx) is the culprit, but the first one reflects the actual reason (PC clock skew). Let's pass proper shutdown reason to avoid confusion. Change-Id: Ibbbbc4e919e6eb812882fc60de4be13fa77934b7 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 11 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 00143ab..a9a53f6 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -411,6 +411,7 @@ struct timespec tv_now; uint64_t expire_count; int64_t elapsed_us, error_us; + const char *reason = NULL; int rc, i; if (!(what & OSMO_FD_READ)) @@ -430,8 +431,9 @@ /* check if transceiver is still alive */ if (tcs->fn_without_clock_ind++ == TRX_LOSS_FRAMES) { - LOGP(DL1C, LOGL_NOTICE, "No more clock from transceiver\n"); - goto no_clock; + reason = "No more clock from transceiver"; + LOGP(DL1C, LOGL_ERROR, "%s\n", reason); + goto shutdown; } /* compute actual elapsed time and resulting OS scheduling error */ @@ -446,9 +448,11 @@ /* if someone played with clock, or if the process stalled */ if (elapsed_us > GSM_TDMA_FN_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { - LOGP(DL1C, LOGL_ERROR, "PC clock skew: elapsed_us=%" PRId64 ", error_us=%" PRId64 "\n", - elapsed_us, error_us); - goto no_clock; + LOGP(DL1C, LOGL_ERROR, + "PC clock skew: elapsed_us=%" PRId64 ", error_us=%" PRId64 "\n", + elapsed_us, error_us); + reason = "PC clock skew too high"; + goto shutdown; } /* call bts_sched_fn() for all expired FN */ @@ -457,9 +461,9 @@ return 0; -no_clock: +shutdown: osmo_timerfd_disable(&tcs->fn_timer_ofd); - bts_shutdown(bts, "No clock from osmo-trx"); + bts_shutdown(bts, reason); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibbbbc4e919e6eb812882fc60de4be13fa77934b7 Gerrit-Change-Number: 40156 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email ) Change subject: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibbbbc4e919e6eb812882fc60de4be13fa77934b7 Gerrit-Change-Number: 40156 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Apr 2025 04:59:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: fix recently introduced indenting blunder

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email ) Change subject: fix recently introduced indenting blunder ...................................................................... fix recently introduced indenting blunder Related: 0b4374bb9faf3f9c2a792c1c06117cc51784982d == I556e01b26a71b43432c623adb7ea5af2114981e3 Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 --- M include/osmocom/hnbgw/context_map.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 41b312d..7e288d7 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -30,16 +30,16 @@ */ enum map_rua_fsm_event { /* Receiving a RUA Connect from HNB. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg */ MAP_RUA_EV_RX_CONNECT, /* Receiving some data from HNB via RUA, to forward via SCCP to CN. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg */ MAP_RUA_EV_RX_DIRECT_TRANSFER, /* Receiving a RUA Disconnect from HNB. - * Parameter: struct msgb *ranap_msg (can be NULL) */ + * Parameter: struct msgb *ranap_msg (can be NULL) */ MAP_RUA_EV_RX_DISCONNECT, /* SCCP has received some data from CN to forward via RUA to HNB. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg */ MAP_RUA_EV_TX_DIRECT_TRANSFER, /* The CN side is disconnected (e.g. received an SCCP Released), that means we are going gracefully disconnect * RUA, too. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 Gerrit-Change-Number: 40163 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 2 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: fix recently introduced indenting blunder

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email ) Change subject: fix recently introduced indenting blunder ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia9c7da4d69ab2521ff726579d11df51af0e73388 Gerrit-Change-Number: 40163 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Apr 2025 17:04:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email ) Change subject: osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/40156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibbbbc4e919e6eb812882fc60de4be13fa77934b7 Gerrit-Change-Number: 40156 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Apr 2025 17:03:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log