Skip to content

Commit 751f2e5

Browse files
vdahiya12vdahiya12
committed
add logging
Signed-off-by: Vaibhav Dahiya <vdahiya@microsoft.com>
1 parent 990a6c3 commit 751f2e5

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

‎sonic-ycabled/ycable/ycable_utilities/y_cable_helper.py

+26-26
Original file line numberDiff line numberDiff line change
@@ -474,27 +474,27 @@ def wait_for_state_change(channel_connectivity, port):
474474
asic_index = multi_asic.get_asic_index_from_namespace(DEFAULT_NAMESPACE)
475475

476476
if channel_connectivity == grpc.ChannelConnectivity.TRANSIENT_FAILURE:
477-
helper_logger.log_notice("gRPC port {} state changed to TRANSIENT_FAILURE".format(port))
477+
helper_logger.log_notice("gRPC port {} state changed to TRANSIENT_FAILURE tid {}".format(port, threading.currentThread().getName()))
478478
# for connectivity state to FAILURE/IDLE report a failure
479479
fvs_updated = swsscommon.FieldValuePairs([('response', 'failure')])
480480
fwd_state_response_tbl[asic_index].set(port, fvs_updated)
481481
grpc_port_connectivity[port] = "TRANSIENT_FAILURE"
482482

483483
if channel_connectivity == grpc.ChannelConnectivity.CONNECTING:
484-
helper_logger.log_notice("gRPC port {} state changed to CONNECTING".format(port))
484+
helper_logger.log_notice("gRPC port {} state changed to CONNECTING tid {}".format(port, threading.currentThread().getName()))
485485
grpc_port_connectivity[port] = "CONNECTING"
486486
if channel_connectivity == grpc.ChannelConnectivity.READY:
487-
helper_logger.log_notice("gRPC port {} state changed to READY".format(port))
487+
helper_logger.log_notice("gRPC port {} state changed to READY tid {}".format(port, threading.currentThread().getName()))
488488
grpc_port_connectivity[port] = "READY"
489489
if channel_connectivity == grpc.ChannelConnectivity.IDLE:
490-
helper_logger.log_notice("gRPC port {} state changed to IDLE".format(port))
490+
helper_logger.log_notice("gRPC port {} state changed to IDLE tid {}".format(port, threading.currentThread().getName()))
491491
# for connectivity state to FAILURE/IDLE report a failure
492492
fvs_updated = swsscommon.FieldValuePairs([('response', 'failure')])
493493
fwd_state_response_tbl[asic_index].set(port, fvs_updated)
494494
grpc_port_connectivity[port] = "IDLE"
495495

496496
if channel_connectivity == grpc.ChannelConnectivity.SHUTDOWN:
497-
helper_logger.log_notice("gRPC port {} state changed to SHUTDOWN".format(port))
497+
helper_logger.log_notice("gRPC port {} state changed to SHUTDOWN tid {}".format(port, threading.currentThread().getName()))
498498
grpc_port_connectivity[port] = "SHUTDOWN"
499499

500500

@@ -600,7 +600,7 @@ def put_init_values_for_grpc_states(port, read_side, hw_mux_cable_tbl, hw_mux_ca
600600
stub = grpc_port_stubs.get(port, None)
601601
request = linkmgr_grpc_driver_pb2.AdminRequest(portid=DEFAULT_PORT_IDS, state=[0, 0])
602602
if stub is None:
603-
helper_logger.log_notice("stub is None for getting admin port forwarding state RPC port {}".format(port))
603+
helper_logger.log_notice("stub is None for getting admin port forwarding state RPC port {} tid {} writing unknown".format(port, threading.currentThread().getName()))
604604
fvs_updated = swsscommon.FieldValuePairs([('state', 'unknown'),
605605
('read_side', str(read_side)),
606606
('active_side', 'unknown')])
@@ -615,9 +615,9 @@ def put_init_values_for_grpc_states(port, read_side, hw_mux_cable_tbl, hw_mux_ca
615615
fwd_response_port_ids = response.portid
616616
fwd_response_port_ids_state = response.state
617617
helper_logger.log_notice(
618-
"forwarding state RPC received response port ids = {} port {}".format(fwd_response_port_ids, port))
618+
"initial forwarding state RPC received response port ids = {} port {} tid {}".format(fwd_response_port_ids, port, threading.currentThread().getName()))
619619
helper_logger.log_notice(
620-
"forwarding state RPC received response state values = {} port {}".format(fwd_response_port_ids_state, port))
620+
"initial forwarding state RPC received response state values = {} port {} tid {}".format(fwd_response_port_ids_state, port, threading.currentThread().getName()))
621621
else:
622622
helper_logger.log_warning("response was none while doing init config state for gRPC HW_MUX_CABLE_TABLE {} ".format(port))
623623

@@ -3298,7 +3298,7 @@ def handle_show_hwmode_state_cmd_arg_tbl_notification(fvp, port_tbl, xcvrd_show_
32983298
# TODO state only for dummy value in this request MSG remove this
32993299
request = linkmgr_grpc_driver_pb2.AdminRequest(portid=DEFAULT_PORT_IDS, state=[0, 0])
33003300
helper_logger.log_debug(
3301-
"Y_CABLE_DEBUG:calling RPC for getting cli forwarding state read_side portid = {} Ethernet port {}".format(read_side, port))
3301+
"Y_CABLE_DEBUG:calling RPC for getting cli forwarding state read_side portid = {} Ethernet port {} tid {}".format(read_side, port, threading.currentThread().getName()))
33023302

33033303
stub = grpc_port_stubs.get(port, None)
33043304
if stub is None:
@@ -3316,10 +3316,10 @@ def handle_show_hwmode_state_cmd_arg_tbl_notification(fvp, port_tbl, xcvrd_show_
33163316
# Debug only, remove this section once Server side is Finalized
33173317
fwd_response_port_ids = response.portid
33183318
fwd_response_port_ids_state = response.state
3319-
helper_logger.log_notice(
3320-
"forwarding state RPC received response port ids = {} port {}".format(fwd_response_port_ids, port))
3321-
helper_logger.log_notice(
3322-
"forwarding state RPC received response state values = {} port {}".format(fwd_response_port_ids_state, port))
3319+
helper_logger.log_debug(
3320+
"procesing request hwmode forwarding state RPC received response port ids = {} port {} tid {}".format(fwd_response_port_ids, port, threading.currentThread().getName()))
3321+
helper_logger.log_debug(
3322+
"processing request hwmode forwarding state RPC received response state values = {} port {} tid {}".format(fwd_response_port_ids_state, port, threading.currentThread().getName()))
33233323
else:
33243324
helper_logger.log_notice("response was none cli handle_fwd_state_command_grpc_notification {} ".format(port))
33253325

@@ -3422,14 +3422,14 @@ def handle_fwd_state_command_grpc_notification(fvp_m, hw_mux_cable_tbl, fwd_stat
34223422
helper_logger.log_debug("Y_CABLE_DEBUG:before invoking RPC fwd_state read_side = {}".format(read_side))
34233423
# TODO state only for dummy value in this request MSG remove this
34243424
request = linkmgr_grpc_driver_pb2.AdminRequest(portid=DEFAULT_PORT_IDS, state=[0, 0])
3425-
helper_logger.log_notice(
3426-
"calling RPC for getting forwarding state port = {} portid {} peer portid {} read_side {}".format(port, read_side, 1 - int(read_side), read_side))
3425+
helper_logger.log_debug(
3426+
"processing request for fwd_state calling RPC for getting forwarding state port = {} portid {} peer portid {} read_side {} tid {}".format(port, read_side, 1 - int(read_side), read_side, threading.currentThread().getName()))
34273427

34283428
self_state = "unknown"
34293429
peer_state = "unknown"
34303430
stub = grpc_port_stubs.get(port, None)
34313431
if stub is None:
3432-
helper_logger.log_notice("stub is None for getting admin port forwarding state RPC port {}".format(port))
3432+
helper_logger.log_notice("stub is None for getting admin port forwarding state RPC port {} tid ".format(port, threading.currentThread().getName()))
34333433
retry_setup_grpc_channel_for_port(port, asic_index, port_tbl, grpc_client)
34343434
stub = grpc_port_stubs.get(port, None)
34353435
if stub is None:
@@ -3447,10 +3447,10 @@ def handle_fwd_state_command_grpc_notification(fvp_m, hw_mux_cable_tbl, fwd_stat
34473447
# Debug only, remove this section once Server side is Finalized
34483448
fwd_response_port_ids = response.portid
34493449
fwd_response_port_ids_state = response.state
3450-
helper_logger.log_notice(
3451-
"forwarding state RPC received response port = {} portids {} read_side {}".format(port, fwd_response_port_ids,read_side))
3452-
helper_logger.log_notice(
3453-
"forwarding state RPC received response port = {} state values = {} read_side {}".format(port, fwd_response_port_ids_state, read_side))
3450+
helper_logger.log_debug(
3451+
"processing request for fwd_state forwarding state RPC received response port = {} portids {} read_side {} tid {}".format(port, fwd_response_port_ids, read_side, threading.currentThread().getName()))
3452+
helper_logger.log_debug(
3453+
"processing request for fwd state forwarding state RPC received response port = {} state values = {} read_side {} tid {}".format(port, fwd_response_port_ids_state, read_side, threading.currentThread().getName()))
34543454
else:
34553455
helper_logger.log_notice("response was none handle_fwd_state_command_grpc_notification {} ".format(port))
34563456

@@ -3536,11 +3536,11 @@ def handle_hw_mux_cable_table_grpc_notification(fvp, hw_mux_cable_tbl, asic_inde
35363536
hw_response_port_ids = response.portid
35373537
hw_response_port_ids_state = response.state
35383538
helper_logger.log_notice(
3539-
"Set admin state RPC received response port {} port ids = {} curr_read_side {} read_side {}".format(port, hw_response_port_ids, curr_read_side, read_side))
3539+
"Set admin state RPC received response port {} port ids = {} curr_read_side {} read_side {} tid {}".format(port, hw_response_port_ids, curr_read_side, read_side, threading.currentThread().getName()))
35403540
helper_logger.log_notice(
3541-
"Set admin state RPC received response port {} state values = {} curr_read_side {} read_side {}".format(port, hw_response_port_ids_state, curr_read_side, read_side))
3541+
"Set admin state RPC received response port {} state values = {} curr_read_side {} read_side {} tid {}".format(port, hw_response_port_ids_state, curr_read_side, read_side, threading.currentThread().getName()))
35423542
else:
3543-
helper_logger.log_notice("response was none hw_mux_cable_table_grpc_notification {} ".format(port))
3543+
helper_logger.log_notice("response was none hw_mux_cable_table_grpc_notification {} tid {}".format(port, threading.currentThread().getName()))
35443544

35453545
active_side = parse_grpc_response_hw_mux_cable_change_state(ret, response, curr_read_side, port)
35463546

@@ -4055,22 +4055,22 @@ async def send_request_and_get_response(self):
40554055
response_stream = self.stub.NotifyGracefulRestartStart(request)
40564056
index = 0
40574057
async for response in response_stream:
4058-
helper_logger.log_notice("Async client received from direct read period port = {}: period = {} index = {} guid = {} notifytype {} msgtype = {}".format(self.port, response.period, index, response.guid, response.notifytype, response.msgtype))
4058+
helper_logger.log_debug("Async client received from direct read period port = {}: period = {} index = {} guid = {} notifytype {} msgtype = {} tid {}".format(self.port, response.period, index, response.guid, response.notifytype, response.msgtype, threading.currentThread().getName()))
40594059
helper_logger.log_debug("Async Debug only :{} {}".format(dir(response_stream), dir(response)))
40604060
index = index+1
40614061
if response == grpc.aio.EOF:
40624062
break
40634063
helper_logger.log_notice("Async client finished loop from direct read period port:{} ".format(self.port))
40644064
index = index+1
40654065
except grpc.RpcError as e:
4066-
helper_logger.log_notice("Async client port = {} exception occured because of {} ".format(self.port, e.code()))
4066+
helper_logger.log_notice("Async client port = {} exception occured because of {} tid {}".format(self.port, e.code(), threading.currentThread().getName()))
40674067

40684068
await self.response_queue.put(response)
40694069

40704070
async def process_response(self):
40714071
while True:
40724072
response = await self.response_queue.get()
4073-
helper_logger.log_debug("Async recieved a response from {} {}".format(self.port, response))
4073+
helper_logger.log_debug("Async recieved a response from {} {} tid {}".format(self.port, response, threading.currentThread().getName()))
40744074
# do something with response
40754075
if response is not None:
40764076
await asyncio.sleep(response.period)

‎sonic-ycabled/ycable/ycable_utilities/y_cable_table_helper.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
helper utlities configuring y_cable tables for ycabled daemon
44
"""
55

6-
6+
import threading
77
from sonic_py_common import daemon_base, logger
88
from sonic_py_common import multi_asic
99
from swsscommon import swsscommon
@@ -551,6 +551,7 @@ def __init__(self):
551551
self.appl_db[asic_id] = daemon_base.db_connect("APPL_DB", namespace)
552552
self.fwd_state_response_tbl[asic_id] = swsscommon.Table(
553553
self.appl_db[asic_id], "FORWARDING_STATE_RESPONSE")
554+
helper_logger.log_notice('created table instance from tid {}'.format(threading.currentThread().getName()))
554555

555556
def get_fwd_state_response_tbl(self):
556557
return self.fwd_state_response_tbl

0 commit comments

Comments
 (0)