[S] Change in osmo-msc[master]: msc_main: close SMS db on startup error

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/32085 ) Change subject: msc_main: close SMS db on startup error ...................................................................... msc_main: close SMS db on startup error When the SMS sqlite db is opened and not closed properly, sqlite will print a trace on the next OsmoMSC startup while restoring the database. This happens when e.g. attempting to bind OsmoMSC on an IP that is not available (yet) and then restarting OsmoMSC. db.c:521 Init database connection to 'sms.db' using SQLite3 lib version 3.34.1 db.c:318 SQLITE3: (283) recovered 37 frames from WAL file /var/lib/osmocom/sms.db-wal backtrace.c:42 backtrace() returned 22 addresses backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0x36a56) [0x7f1518c00a56] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(sqlite3_log+0x9e) [0x7f1518c00b3e] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0x5f4f4) [0x7f1518c294f4] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0x5fbb3) [0x7f1518c29bb3] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0x7ee02) [0x7f1518c48e02] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0x7f908) [0x7f1518c49908] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xb9a5f) [0x7f1518c83a5f] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xcddac) [0x7f1518c97dac] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xcddef) [0x7f1518c97def] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xf537d) [0x7f1518cbf37d] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xb479e) [0x7f1518c7e79e] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xb79b6) [0x7f1518c819b6] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xb8116) [0x7f1518c82116] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(+0xb853f) [0x7f1518c8253f] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(sqlite3_prepare_v2+0x16) [0x7f1518c826a6] backtrace.c:53 /lib/x86_64-linux-gnu/libsqlite3.so.0(sqlite3_exec+0xb4) [0x7f1518c8fce4] backtrace.c:53 /usr/bin/osmo-msc(+0x1bf13) [0x564f81946f13] backtrace.c:53 /usr/bin/osmo-msc(+0x524c0) [0x564f8197d4c0] backtrace.c:53 /usr/bin/osmo-msc(+0x1324e) [0x564f8193e24e] backtrace.c:53 /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xea) [0x7f1518991d0a] backtrace.c:53 /usr/bin/osmo-msc(+0x13fea) [0x564f8193efea] Related: SYS#6360 Change-Id: I9bb799048db5fcdb2a2520107bd75d5f7a865459 --- M src/osmo-msc/msc_main.c 1 file changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/85/32085/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index c87749d..ac71168 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -744,16 +744,20 @@ if (sms_queue_start(msc_network) != 0) return -1; - if (msc_mgw_setup() != 0) + if (msc_mgw_setup() != 0) { + db_fini(); return 7; + } if (ss7_setup(tall_msc_ctx, &sccp_a, &sccp_iu)) { fprintf(stderr, "Setting up SCCP client failed.\n"); + db_fini(); return 8; } if (sgs_server_open(g_sgs)) { fprintf(stderr, "Starting SGs server failed\n"); + db_fini(); return 9; } @@ -762,6 +766,7 @@ msc_network); if (!msc_network->a.sri) { fprintf(stderr, "Setting up A receiver failed\n"); + db_fini(); return 10; } LOGP(DMSC, LOGL_NOTICE, "A-interface: SCCP user %s, cs7-instance %u (%s)\n", @@ -777,6 +782,7 @@ msc_network); if (!msc_network->iu.sri) { fprintf(stderr, "Setting up IuCS receiver failed\n"); + db_fini(); return 11; } @@ -796,6 +802,7 @@ rc = osmo_daemonize(); if (rc < 0) { perror("Error during daemonize"); + db_fini(); return 6; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9bb799048db5fcdb2a2520107bd75d5f7a865459 Gerrit-Change-Number: 32085 Gerrit-PatchSet: 1 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-MessageType: newchange