Skip to content

dummy commit to check unrelated failures #3844

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

Closed
rajkumar1-arista wants to merge 2 commits into from
Closed

dummy commit to check unrelated failures #3844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf032e1
dummy commit to check unrelated failures
rajkumar1-arista Aug 24, 2025
8ee7dec
[Mux] Clear bulkers when rolling back mux switchover
mssonicbld Sep 2, 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
1 change: 1 addition & 0 deletions orchagent/flex_counter/flex_counter_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ struct CachedObjects
auto counter_ids = FlexCounterManager::serializeCounterStats(pending_counter_stats);
auto counter_type_it = FlexCounterManager::counter_id_field_lookup.find(pending_counter_type);

// dummy comment
auto counter_keys = group_name + ":";
for (const auto& oid: pending_sai_objects)
{
Expand Down
4 changes: 4 additions & 0 deletions orchagent/muxorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,10 @@ void MuxCable::rollbackStateChange()
st_chg_in_progress_ = true;
state_ = prev_state_;
bool success = false;

nbr_handler_->clearBulkers();
gNeighOrch->clearBulkers();

switch (prev_state_)
{
case MuxState::MUX_STATE_ACTIVE:
Expand Down
1 change: 1 addition & 0 deletions orchagent/muxorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class MuxNbrHandler
sai_object_id_t getNextHopId(const NextHopKey);
MuxNeighbor getNeighbors() const { return neighbors_; };
string getAlias() const { return alias_; };
void clearBulkers() { gRouteBulker.clear(); };

private:
bool removeRoutes(std::list<MuxRouteBulkContext>& bulk_ctx_list);
Expand Down
6 changes: 6 additions & 0 deletions orchagent/neighorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2401,3 +2401,9 @@ bool NeighOrch::ifChangeInformRemoteNextHop(const string &alias, bool if_up)
}
return rc;
}

void NeighOrch::clearBulkers()
{
gNeighBulker.clear();
gNextHopBulker.clear();
}
2 changes: 2 additions & 0 deletions orchagent/neighorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ class NeighOrch : public Orch, public Subject, public Observer
void updateSrv6Nexthop(const NextHopKey &, const sai_object_id_t &);
bool ifChangeInformRemoteNextHop(const string &, bool);

void clearBulkers();

private:
PortsOrch *m_portsOrch;
IntfsOrch *m_intfsOrch;
Expand Down
3 changes: 3 additions & 0 deletions tests/mock_tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ P4_ORCH_DIR = $(top_srcdir)/orchagent/p4orch
DASH_ORCH_DIR = $(top_srcdir)/orchagent/dash
DASH_PROTO_DIR = $(top_srcdir)/orchagent/dash/proto

CFLAGS = -g -O0
CXXFLAGS = -g -O0

CFLAGS_SAI = -I /usr/include/sai

TESTS = tests tests_intfmgrd tests_teammgrd tests_portsyncd tests_fpmsyncd tests_response_publisher
Expand Down
Loading