lynxis has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/44087?usp=email ) Change subject: tcap_as_loadshare: improve fallback rate counters ...................................................................... tcap_as_loadshare: improve fallback rate counters Rename tcap:asp:fallback into tcap:fallback:handle. Add a seperate counter for every different fallback method. Related: SYS#8283 Change-Id: If471c2b53ce8ff423313cfb0b8bf3042cc194803 --- M src/ss7_as.c M src/ss7_as.h M src/tcap_as_loadshare.c 3 files changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/87/44087/1 diff --git a/src/ss7_as.c b/src/ss7_as.c index d2b6081..6dc51d2 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -143,7 +143,10 @@ [SS7_AS_CTR_TCAP_DECODE_FAILURE] = { "tcap:decode:failure", "Number of TCAP messages which could not decoded (loadshare-tcap)" }, [SS7_AS_CTR_TCAP_LOAD_SHARE_SUCCESS] = {"tcap:loadshare:success","Successful ASP selection for a TCAP Begin message (loadshare-tcap)" }, [SS7_AS_CTR_TCAP_LOAD_SHARE_FAILURE] = {"tcap:loadshare:failure","Could not find a valid ASP for a TCAP Begin message (loadshare-tcap)" }, - [SS7_AS_CTR_TCAP_ASP_FALLBACK] = { "tcap:asp:fallback", "A non-starting TCAP message had to be routed by round-robin over all ASP. (loadshare-tcap)" }, + [SS7_AS_CTR_TCAP_FALLBACK_HANDLE] = { "tcap:fallback:handle", "A non-starting TCAP message (Continue, End, Abort) had to be handled by the fallback. (loadshare-tcap)" }, + [SS7_AS_CTR_TCAP_FALLBACK_ROUNDROBIN] = {"tcap:fallback:rr", "Successful fallback handling by TCAP load sharing. (loadshare-tcap)" }, + [SS7_AS_CTR_TCAP_FALLBACK_UDTS] ={ "tcap:fallback:udts", "Successful fallback handling by sending a UDTS. (loadshare-tcap)" }, + [SS7_AS_CTR_TCAP_FALLBACK_ROUTE] ={ "tcap:fallback:udts", "Successful fallback handling by sending to the fallback rount. (loadshare-tcap)" }, [SS7_AS_CTR_TCAP_SESS_MISS] = { "tcap:session:miss", "A non-starting TCAP message (Continue, End, Abort) was missing a session entry. (loadshare-tcap)" }, [SS7_AS_CTR_TCAP_SESS_HIT] = { "tcap:session:hit", "A non-starting TCAP message (Continue, End, Abort) hit a session entry, (loadshare-tcap)" }, #endif /* WITH_TCAP_LOADSHARING */ diff --git a/src/ss7_as.h b/src/ss7_as.h index 27c56e4..57727ab 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -70,7 +70,10 @@ SS7_AS_CTR_TCAP_DECODE_FAILURE, SS7_AS_CTR_TCAP_LOAD_SHARE_SUCCESS, SS7_AS_CTR_TCAP_LOAD_SHARE_FAILURE, - SS7_AS_CTR_TCAP_ASP_FALLBACK, + SS7_AS_CTR_TCAP_FALLBACK_HANDLE, + SS7_AS_CTR_TCAP_FALLBACK_ROUNDROBIN, + SS7_AS_CTR_TCAP_FALLBACK_ROUTE, + SS7_AS_CTR_TCAP_FALLBACK_UDTS, SS7_AS_CTR_TCAP_SESS_MISS, SS7_AS_CTR_TCAP_SESS_HIT, #endif /* WITH_TCAP_LOADSHARING */ diff --git a/src/tcap_as_loadshare.c b/src/tcap_as_loadshare.c index bee3bfd..afd2a2d 100644 --- a/src/tcap_as_loadshare.c +++ b/src/tcap_as_loadshare.c @@ -507,6 +507,8 @@ OSMO_ASSERT(rasp); + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_TCAP_FALLBACK_HANDLE); + switch (as->cfg.loadshare.tcap.unroutable_tcap_msg) { case SS7_AS_TCAP_UNROUTABLE_LOAD_SHARE_AS: /* RFC3868 A.3.1 Connectionless Transport: @@ -519,8 +521,10 @@ * Hence, if UNROUTABLE_LOAD_SHARE_AS is configured, allocation * policy "State sharing" at the peer is assumed. */ asp = select_asp_tcap_enabled_rr(as); - if (asp) + if (asp) { + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_TCAP_FALLBACK_ROUNDROBIN); rc = 0; + } break; case SS7_AS_TCAP_UNROUTABLE_ROUTE_FALLBACK: /* RFC3868 A.2: @@ -529,14 +533,21 @@ * in-sequence-delivery is requested. However, linkset failures * may cause MTP to reroute to the other SG." */ /* No ASP selection. Try to route the SCCP msg to the fallback DPC */ + rc = asp_loadshare_tcap_route_fallback(as, mtp3_rtlb, sccp_msg); - if (!rc) /* rc == 0 would require a valid asp, use > 0 to drop the msg, but don't send an error back if needed */ + if (!rc) { + /* asp_loadshare_tcap_route_fallback() returns 0 on success, but rc = 0 would + * require a valid asp. + * Use rc > 0, so asp_loadshare_tcap_sccp() will drop further handling and free the message. */ rc = 1; + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_TCAP_FALLBACK_ROUTE); + } break; case SS7_AS_TCAP_UNROUTABLE_REJECT_UDTS: /* RFC3868 4.7.3.1 TCAP traffic: * "If an ASP is not available, the SG may generate (X)UDTS * "routing failure", if the return option is used." */ + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_TCAP_FALLBACK_UDTS); /* fall-through */ default: /* default case, asp stays NULL, will reject when returning -ENOKEY */ @@ -699,8 +710,6 @@ rc = -ENOKEY; goto out_free_sua; } - - rate_ctr_inc2(as->ctrg, SS7_AS_CTR_TCAP_ASP_FALLBACK); } tcap_trans_track_entry_create(as, asp, &called_addr, &parsed.dtid, &calling_addr, &parsed.otid); @@ -733,7 +742,6 @@ rc = -ENOKEY; goto out_free_sua; } - } /* Don't create an entry for an End */ } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/44087?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If471c2b53ce8ff423313cfb0b8bf3042cc194803 Gerrit-Change-Number: 44087 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis <lynxis@fe80.eu>