Skip to content

Allow state db to take modified entries made to the tunnel decap table #3960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow state db to take modified entries made to the tunnel decap table #3960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7051db9
modify state db on tunnel decap field mod
developfast Oct 28, 2025
9691535
add log on completion of state db sync
developfast Nov 14, 2025
03d3d78
added unit tests
developfast Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions orchagent/tunneldecaporch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)

sai_object_id_t tunnel_id = SAI_NULL_OBJECT_ID;

// track whether any oper fields changed on this key
bool state_changed = false;
// checking to see if the tunnel already exists
bool exists = (tunnelTable.find(key) != tunnelTable.end());
if (exists)
Expand Down Expand Up @@ -160,8 +162,10 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
}
if (exists)
{
// Apply to SAI; only touch cache/flag on success
setTunnelAttribute(fvField(i), dscp_mode, tunnel_id);
tunnelTable[key].dscp_mode = dscp_mode;
state_changed = true;
}
}
else if (fvField(i) == "ecn_mode")
Expand Down Expand Up @@ -207,7 +211,9 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
}
if (exists)
{
// Apply to SAI; only touch cache/flag on success
setTunnelAttribute(fvField(i), ttl_mode, tunnel_id);
state_changed = true;
}
}
else if (fvField(i) == decap_dscp_to_tc_field_name)
Expand All @@ -221,7 +227,9 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
}
if (exists)
{
// Apply to SAI; only touch cache/flag on success
setTunnelAttribute(fvField(i), dscp_to_tc_map_id, tunnel_id);
state_changed = true;
}
}
else if (fvField(i) == decap_tc_to_pg_field_name)
Expand All @@ -235,7 +243,9 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
}
if (exists)
{
// Apply to SAI; only touch cache/flag on success
setTunnelAttribute(fvField(i), tc_to_pg_map_id, tunnel_id);
state_changed = true;
}
}
else if (fvField(i) == encap_tc_to_dscp_field_name)
Expand All @@ -251,6 +261,7 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
{
// Record only
tunnelTable[key].encap_tc_to_dscp_map_id = tc_to_dscp_map_id;
state_changed = true;
}
}
else if (fvField(i) == encap_tc_to_queue_field_name)
Expand All @@ -266,6 +277,7 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
{
// Record only
tunnelTable[key].encap_tc_to_queue_map_id = tc_to_queue_map_id;
state_changed = true;
}
}
else
Expand All @@ -276,6 +288,12 @@ void TunnelDecapOrch::doDecapTunnelTask(Consumer &consumer)
}
}

if (exists && state_changed) {
// Publish to STATE_DB if any mirrored field changed
setDecapTunnelStatus(key);
SWSS_LOG_NOTICE("Fields for TUNNEL_DECAP_TABLE entry '%s' have been synchronised in STATE_DB", key.c_str());
}

if (task_status == task_process_status::task_need_retry)
{
++it;
Expand Down
1 change: 1 addition & 0 deletions tests/mock_tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ tests_SOURCES = aclorch_ut.cpp \
saispy_ut.cpp \
consumer_ut.cpp \
sfloworh_ut.cpp \
tunneldecaporch_ut.cpp \
ut_saihelper.cpp \
mock_orchagent_main.cpp \
mock_dbconnector.cpp \
Expand Down
Loading
Loading