Skip to content

Commit

Permalink
show linkmgrd status in show mux status (sonic-net#2254)
Browse files Browse the repository at this point in the history 
What I did
Replace status in show mux status with APP DB MUX_CABLE_TABLE:<port_name>, which is written by linkmgrd and indicates linkmgrd's state transition.

This change is required for active-active dualtor setup. In active-active setup, we care more about whether state transition happens on ToR side. In tests, we want to see if linkmgrd makes immediate reaction on link state changes. If we continue to use STATE DB entries, when gRPC is not available, we will get unknow in show mux status, which is not informatic and not the actual value we want to check.

sign-off: Jing Zhang [email protected]

How I did it
Use APP DB entries instead of STATE DB.

Move STATE DB to column SERVER_STATUS.

How to verify it
Unit tests with mock DB values.
Tests on dual testbeds.
  • Loading branch information
@zjswhhh
zjswhhh authored Jul 5, 2022
1 parent 7070794 commit c7389bd
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 35 deletions.
53 changes: 36 additions & 17 deletions show/muxcable.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,15 @@ def get_switch_name(config_db):
sys.exit(STATUS_FAIL)


def create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict, muxcable_health_dict, muxcable_metrics_dict, asic_index, port):
def create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict, muxcable_grpc_dict, muxcable_health_dict, muxcable_metrics_dict, asic_index, port):

res_dict = {}
status_value = get_value_for_key_in_dict(muxcable_info_dict[asic_index], port, "state", "MUX_CABLE_TABLE")
port_name = platform_sfputil_helper.get_interface_alias(port, db)
port_status_dict["MUX_CABLE"][port_name] = {}
port_status_dict["MUX_CABLE"][port_name]["STATUS"] = status_value
gRPC_value = get_value_for_key_in_dict(muxcable_grpc_dict[asic_index], port, "state", "MUX_CABLE_TABLE")
port_status_dict["MUX_CABLE"][port_name]["SERVER_STATUS"] = gRPC_value
health_value = get_value_for_key_in_dict(muxcable_health_dict[asic_index], port, "state", "MUX_LINKMGR_TABLE")
port_status_dict["MUX_CABLE"][port_name]["HEALTH"] = health_value
res_dict = get_hwmode_mux_direction_port(db, port)
Expand All @@ -428,14 +430,15 @@ def create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict, m
last_switch_end_time = muxcable_metrics_dict[asic_index].get("linkmgrd_switch_active_end")
port_status_dict["MUX_CABLE"][port_name]["LAST_SWITCHOVER_TIME"] = last_switch_end_time

def create_table_dump_per_port_status(db, print_data, muxcable_info_dict, muxcable_health_dict, muxcable_metrics_dict, asic_index, port):
def create_table_dump_per_port_status(db, print_data, muxcable_info_dict, muxcable_grpc_dict, muxcable_health_dict, muxcable_metrics_dict, asic_index, port):

print_port_data = []
res_dict = {}

res_dict = get_hwmode_mux_direction_port(db, port)
status_value = get_value_for_key_in_dict(muxcable_info_dict[asic_index], port, "state", "MUX_CABLE_TABLE")
#status_value = get_value_for_key_in_tbl(y_cable_asic_table, port, "status")
gRPC_value = get_value_for_key_in_dict(muxcable_grpc_dict[asic_index], port, "state", "MUX_CABLE_TABLE")
health_value = get_value_for_key_in_dict(muxcable_health_dict[asic_index], port, "state", "MUX_LINKMGR_TABLE")

last_switch_end_time = ""
Expand All @@ -447,6 +450,7 @@ def create_table_dump_per_port_status(db, print_data, muxcable_info_dict, muxcab
port_name = platform_sfputil_helper.get_interface_alias(port, db)
print_port_data.append(port_name)
print_port_data.append(status_value)
print_port_data.append(gRPC_value)
print_port_data.append(health_value)
if res_dict[2] == "False":
hwstatus = "absent"
Expand Down Expand Up @@ -510,10 +514,13 @@ def status(db, port, json_output):
port = platform_sfputil_helper.get_interface_name(port, db)

port_table_keys = {}
appl_db_muxcable_tbl_keys = {}
port_health_table_keys = {}
port_metrics_table_keys = {}
per_npu_statedb = {}
per_npu_appl_db = {}
muxcable_info_dict = {}
muxcable_grpc_dict = {}
muxcable_health_dict = {}
muxcable_metrics_dict = {}

Expand All @@ -525,6 +532,11 @@ def status(db, port, json_output):
per_npu_statedb[asic_id] = SonicV2Connector(use_unix_socket_path=False, namespace=namespace)
per_npu_statedb[asic_id].connect(per_npu_statedb[asic_id].STATE_DB)

per_npu_appl_db[asic_id] = swsscommon.SonicV2Connector(use_unix_socket_path=False, namespace=namespace)
per_npu_appl_db[asic_id].connect(per_npu_appl_db[asic_id].APPL_DB)

appl_db_muxcable_tbl_keys[asic_id] = per_npu_appl_db[asic_id].keys(
per_npu_appl_db[asic_id].APPL_DB, 'MUX_CABLE_TABLE:*')
port_table_keys[asic_id] = per_npu_statedb[asic_id].keys(
per_npu_statedb[asic_id].STATE_DB, 'MUX_CABLE_TABLE|*')
port_health_table_keys[asic_id] = per_npu_statedb[asic_id].keys(
Expand All @@ -546,17 +558,20 @@ def status(db, port, json_output):
click.echo("Got invalid asic index for port {}, cant retreive mux status".format(port_name))
sys.exit(STATUS_FAIL)

muxcable_info_dict[asic_index] = per_npu_statedb[asic_index].get_all(
muxcable_info_dict[asic_index] = per_npu_appl_db[asic_id].get_all(
per_npu_appl_db[asic_id].APPL_DB, 'MUX_CABLE_TABLE:{}'.format(port))
muxcable_grpc_dict[asic_index] = per_npu_statedb[asic_index].get_all(
per_npu_statedb[asic_index].STATE_DB, 'MUX_CABLE_TABLE|{}'.format(port))
muxcable_health_dict[asic_index] = per_npu_statedb[asic_index].get_all(
per_npu_statedb[asic_index].STATE_DB, 'MUX_LINKMGR_TABLE|{}'.format(port))
muxcable_metrics_dict[asic_index] = per_npu_statedb[asic_index].get_all(
per_npu_statedb[asic_index].STATE_DB, 'MUX_METRICS_TABLE|{}'.format(port))

if muxcable_info_dict[asic_index] is not None:
logical_key = "MUX_CABLE_TABLE|{}".format(port)
logical_key = "MUX_CABLE_TABLE:{}".format(port)
logical_health_key = "MUX_LINKMGR_TABLE|{}".format(port)
logical_metrics_key = "MUX_METRICS_TABLE|{}".format(port)
if logical_key in port_table_keys[asic_index] and logical_health_key in port_health_table_keys[asic_index]:
if logical_key in appl_db_muxcable_tbl_keys[asic_index] and logical_health_key in port_health_table_keys[asic_index]:

if logical_metrics_key not in port_metrics_table_keys[asic_index]:
muxcable_metrics_dict[asic_index] = {}
Expand All @@ -565,18 +580,18 @@ def status(db, port, json_output):
port_status_dict = {}
port_status_dict["MUX_CABLE"] = {}

create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict,
create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict, muxcable_grpc_dict,
muxcable_health_dict, muxcable_metrics_dict, asic_index, port)

click.echo("{}".format(json.dumps(port_status_dict, indent=4)))
sys.exit(STATUS_SUCCESSFUL)
else:
print_data = []

create_table_dump_per_port_status(db, print_data, muxcable_info_dict,
create_table_dump_per_port_status(db, print_data, muxcable_info_dict, muxcable_grpc_dict,
muxcable_health_dict, muxcable_metrics_dict, asic_index, port)

headers = ['PORT', 'STATUS', 'HEALTH', 'HWSTATUS', 'LAST_SWITCHOVER_TIME']
headers = ['PORT', 'STATUS', 'SERVER_STATUS', 'HEALTH', 'HWSTATUS', 'LAST_SWITCHOVER_TIME']

click.echo(tabulate(print_data, headers=headers))
sys.exit(STATUS_SUCCESSFUL)
Expand All @@ -595,38 +610,42 @@ def status(db, port, json_output):
port_status_dict["MUX_CABLE"] = {}
for namespace in namespaces:
asic_id = multi_asic.get_asic_index_from_namespace(namespace)
for key in natsorted(port_table_keys[asic_id]):
port = key.split("|")[1]
muxcable_info_dict[asic_id] = per_npu_statedb[asic_id].get_all(
for key in natsorted(appl_db_muxcable_tbl_keys[asic_id]):
port = key.split(":")[1]
muxcable_info_dict[asic_id] = per_npu_appl_db[asic_id].get_all(
per_npu_appl_db[asic_id].APPL_DB, 'MUX_CABLE_TABLE:{}'.format(port))
muxcable_grpc_dict[asic_id] = per_npu_statedb[asic_id].get_all(
per_npu_statedb[asic_id].STATE_DB, 'MUX_CABLE_TABLE|{}'.format(port))
muxcable_health_dict[asic_id] = per_npu_statedb[asic_id].get_all(
per_npu_statedb[asic_id].STATE_DB, 'MUX_LINKMGR_TABLE|{}'.format(port))
muxcable_metrics_dict[asic_id] = per_npu_statedb[asic_id].get_all(
per_npu_statedb[asic_id].STATE_DB, 'MUX_METRICS_TABLE|{}'.format(port))
if not muxcable_metrics_dict[asic_id]:
muxcable_metrics_dict[asic_id] = {}
create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict,
create_json_dump_per_port_status(db, port_status_dict, muxcable_info_dict, muxcable_grpc_dict,
muxcable_health_dict, muxcable_metrics_dict, asic_id, port)

click.echo("{}".format(json.dumps(port_status_dict, indent=4)))
else:
print_data = []
for namespace in namespaces:
asic_id = multi_asic.get_asic_index_from_namespace(namespace)
for key in natsorted(port_table_keys[asic_id]):
port = key.split("|")[1]
for key in natsorted(appl_db_muxcable_tbl_keys[asic_id]):
port = key.split(":")[1]
muxcable_info_dict[asic_id] = per_npu_appl_db[asic_id].get_all(
per_npu_appl_db[asic_id].APPL_DB, 'MUX_CABLE_TABLE:{}'.format(port))
muxcable_health_dict[asic_id] = per_npu_statedb[asic_id].get_all(
per_npu_statedb[asic_id].STATE_DB, 'MUX_LINKMGR_TABLE|{}'.format(port))
muxcable_info_dict[asic_id] = per_npu_statedb[asic_id].get_all(
muxcable_grpc_dict[asic_id] = per_npu_statedb[asic_id].get_all(
per_npu_statedb[asic_id].STATE_DB, 'MUX_CABLE_TABLE|{}'.format(port))
muxcable_metrics_dict[asic_id] = per_npu_statedb[asic_id].get_all(
per_npu_statedb[asic_id].STATE_DB, 'MUX_METRICS_TABLE|{}'.format(port))
if not muxcable_metrics_dict[asic_id]:
muxcable_metrics_dict[asic_id] = {}
create_table_dump_per_port_status(db, print_data, muxcable_info_dict,
create_table_dump_per_port_status(db, print_data, muxcable_info_dict, muxcable_grpc_dict,
muxcable_health_dict, muxcable_metrics_dict, asic_id, port)

headers = ['PORT', 'STATUS', 'HEALTH', 'HWSTATUS','LAST_SWITCHOVER_TIME']
headers = ['PORT', 'STATUS', 'SERVER_STATUS', 'HEALTH', 'HWSTATUS', 'LAST_SWITCHOVER_TIME']
click.echo(tabulate(print_data, headers=headers))

sys.exit(STATUS_SUCCESSFUL)
Expand Down
18 changes: 18 additions & 0 deletions tests/mock_tables/appl_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,5 +263,23 @@
},
"VXLAN_REMOTE_VNI_TABLE:Vlan200:25.25.25.27": {
"vni": "200"
},
"MUX_CABLE_TABLE:Ethernet32": {
"state": "active"
},
"MUX_CABLE_TABLE:Ethernet0": {
"state": "active"
},
"MUX_CABLE_TABLE:Ethernet4": {
"state": "standby"
},
"MUX_CABLE_TABLE:Ethernet8": {
"state": "standby"
},
"MUX_CABLE_TABLE:Ethernet16": {
"state": "standby"
},
"MUX_CABLE_TABLE:Ethernet12": {
"state": "active"
}
}
48 changes: 30 additions & 18 deletions tests/muxcable_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@


tabular_data_status_output_expected = """\
PORT STATUS HEALTH HWSTATUS LAST_SWITCHOVER_TIME
---------- -------- --------- ------------ ---------------------------
Ethernet0 active healthy inconsistent 2021-May-13 10:01:15.696728
Ethernet4 standby healthy consistent
Ethernet8 standby unhealthy consistent
Ethernet12 unknown unhealthy inconsistent
Ethernet16 standby healthy consistent
Ethernet32 active healthy inconsistent
PORT STATUS SERVER_STATUS HEALTH HWSTATUS LAST_SWITCHOVER_TIME
---------- -------- --------------- --------- ------------ ---------------------------
Ethernet0 active active healthy inconsistent 2021-May-13 10:01:15.696728
Ethernet4 standby standby healthy consistent
Ethernet8 standby standby unhealthy consistent
Ethernet12 active unknown unhealthy inconsistent
Ethernet16 standby standby healthy consistent
Ethernet32 active active healthy inconsistent
"""

tabular_data_status_output_expected_alias = """\
PORT STATUS HEALTH HWSTATUS LAST_SWITCHOVER_TIME
------ -------- --------- ------------ ---------------------------
etp1 active healthy inconsistent 2021-May-13 10:01:15.696728
etp2 standby healthy consistent
etp3 standby unhealthy consistent
etp4 unknown unhealthy inconsistent
etp5 standby healthy consistent
etp9 active healthy inconsistent
PORT STATUS SERVER_STATUS HEALTH HWSTATUS LAST_SWITCHOVER_TIME
------ -------- --------------- --------- ------------ ---------------------------
etp1 active active healthy inconsistent 2021-May-13 10:01:15.696728
etp2 standby standby healthy consistent
etp3 standby standby unhealthy consistent
etp4 active unknown unhealthy inconsistent
etp5 standby standby healthy consistent
etp9 active active healthy inconsistent
"""


Expand All @@ -52,36 +52,42 @@
"MUX_CABLE": {
"Ethernet0": {
"STATUS": "active",
"SERVER_STATUS": "active",
"HEALTH": "healthy",
"HWSTATUS": "inconsistent",
"LAST_SWITCHOVER_TIME": "2021-May-13 10:01:15.696728"
},
"Ethernet4": {
"STATUS": "standby",
"SERVER_STATUS": "standby",
"HEALTH": "healthy",
"HWSTATUS": "consistent",
"LAST_SWITCHOVER_TIME": ""
},
"Ethernet8": {
"STATUS": "standby",
"SERVER_STATUS": "standby",
"HEALTH": "unhealthy",
"HWSTATUS": "consistent",
"LAST_SWITCHOVER_TIME": ""
},
"Ethernet12": {
"STATUS": "unknown",
"STATUS": "active",
"SERVER_STATUS": "unknown",
"HEALTH": "unhealthy",
"HWSTATUS": "inconsistent",
"LAST_SWITCHOVER_TIME": ""
},
"Ethernet16": {
"STATUS": "standby",
"SERVER_STATUS": "standby",
"HEALTH": "healthy",
"HWSTATUS": "consistent",
"LAST_SWITCHOVER_TIME": ""
},
"Ethernet32": {
"STATUS": "active",
"SERVER_STATUS": "active",
"HEALTH": "healthy",
"HWSTATUS": "inconsistent",
"LAST_SWITCHOVER_TIME": ""
Expand All @@ -95,36 +101,42 @@
"MUX_CABLE": {
"etp1": {
"STATUS": "active",
"SERVER_STATUS": "active",
"HEALTH": "healthy",
"HWSTATUS": "inconsistent",
"LAST_SWITCHOVER_TIME": "2021-May-13 10:01:15.696728"
},
"etp2": {
"STATUS": "standby",
"SERVER_STATUS": "standby",
"HEALTH": "healthy",
"HWSTATUS": "consistent",
"LAST_SWITCHOVER_TIME": ""
},
"etp3": {
"STATUS": "standby",
"SERVER_STATUS": "standby",
"HEALTH": "unhealthy",
"HWSTATUS": "consistent",
"LAST_SWITCHOVER_TIME": ""
},
"etp4": {
"STATUS": "unknown",
"STATUS": "active",
"SERVER_STATUS": "unknown",
"HEALTH": "unhealthy",
"HWSTATUS": "inconsistent",
"LAST_SWITCHOVER_TIME": ""
},
"etp5": {
"STATUS": "standby",
"SERVER_STATUS": "standby",
"HEALTH": "healthy",
"HWSTATUS": "consistent",
"LAST_SWITCHOVER_TIME": ""
},
"etp9": {
"STATUS": "active",
"SERVER_STATUS": "active",
"HEALTH": "healthy",
"HWSTATUS": "inconsistent",
"LAST_SWITCHOVER_TIME": ""
Expand Down

0 comments on commit c7389bd

Please sign in to comment.