cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

Show OML link uptime in vty 

Save the time when OML link to BTS was established and show it in
vty. That's useful when troubleshooting issues like periodic/sporadic
BTS restart.

Related: SYS#3889
Change-Id: I9e4e8504afe8ca467b68d41826f61654e24d9600
This commit is contained in:
Max 2017-09-21 16:15:32 +02:00
parent 00c22464a0
commit d1f70ed234
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/bsc/gsm_data_shared.h
View File

@ -722,6 +722,8 @@ struct gsm_bts {
struct gsm_e1_subslot oml_e1_link;
uint8_t oml_tei;
struct e1inp_sign_link *oml_link;
/* when OML link was established */
time_t uptime;
/* Abis network management O&M handle */
struct abis_nm_h *nmh;

20
src/libbsc/bsc_vty.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
#include <time.h>
#include <osmocom/vty/command.h>
#include <osmocom/vty/buffer.h>
@ -234,6 +235,9 @@ static void e1isl_dump_vty(struct vty *vty, struct e1inp_sign_link *e1l)
static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts)
{
struct pchan_load pl;
unsigned long long sec;
struct timespec tp;
int rc;
vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, "
"BSIC %u (NCC=%u, BCC=%u) and %u TRX%s",
@ -304,8 +308,20 @@ static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts)
paging_pending_requests_nr(bts),
bts->paging.available_slots, VTY_NEWLINE);
if (is_ipaccess_bts(bts)) {
vty_out(vty, " OML Link state: %s.%s",
bts->oml_link ? "connected" : "disconnected", VTY_NEWLINE);
vty_out(vty, " OML Link state: ");
if (bts->oml_link) {
vty_out(vty, "connected");
if (bts->uptime) {
rc = clock_gettime(CLOCK_MONOTONIC, &tp);
if (rc == 0) { /* monotonic clock helps to ensure that conversion below is valid */
sec = (unsigned long long)difftime(tp.tv_sec, bts->uptime);
vty_out(vty, " %llu days %llu hours %llu min. %llu sec.%s",
OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec),
sec % 60, VTY_NEWLINE);
}
}
} else
vty_out(vty, "disconnected.%s", VTY_NEWLINE);
} else {
vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);
e1isl_dump_vty(vty, bts->oml_link);

6
src/libbsc/bts_ipaccess_nanobts.c
View File

@ -20,6 +20,7 @@
*/
#include <arpa/inet.h>
#include <time.h>
#include <osmocom/gsm/tlv.h>
@ -364,6 +365,7 @@ void ipaccess_drop_oml(struct gsm_bts *bts)
e1inp_sign_link_destroy(bts->oml_link);
bts->oml_link = NULL;
bts->uptime = 0;
/* we have issues reconnecting RSL, drop everything. */
llist_for_each_entry(trx, &bts->trx_list, list)
@ -395,6 +397,8 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line,
struct gsm_bts *bts;
struct ipaccess_unit *dev = unit_data;
struct e1inp_sign_link *sign_link = NULL;
struct timespec tp;
int rc;
bts = find_bts_by_unitid(bsc_gsmnet, dev->site_id, dev->bts_id);
if (!bts) {
@ -423,6 +427,8 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line,
e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1],
E1INP_SIGN_OML, bts->c0,
bts->oml_tei, 0);
rc = clock_gettime(CLOCK_MONOTONIC, &tp);
bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */
break;
case E1INP_SIGN_RSL: {
struct e1inp_ts *ts;

6
src/libbsc/e1_config.c
View File

@ -20,7 +20,7 @@
#include <string.h>
#include <errno.h>
#include <time.h>
#include <netinet/in.h>
#include <osmocom/bsc/gsm_data.h>
@ -160,6 +160,8 @@ int e1_reconfig_bts(struct gsm_bts *bts)
struct e1inp_line *line;
struct e1inp_sign_link *oml_link;
struct gsm_bts_trx *trx;
struct timespec tp;
int rc;
DEBUGP(DLMI, "e1_reconfig_bts(%u)\n", bts->nr);
@ -201,6 +203,8 @@ int e1_reconfig_bts(struct gsm_bts *bts)
if (bts->oml_link)
e1inp_sign_link_destroy(bts->oml_link);
bts->oml_link = oml_link;
rc = clock_gettime(CLOCK_MONOTONIC, &tp);
bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */
llist_for_each_entry(trx, &bts->trx_list, list)
e1_reconfig_trx(trx);