Skip to content

Remove *_LEFT fields to ensure PFC watchdog enter fresh into the operational/storm state after warm-reboot #897

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

Merged
wendani merged 4 commits into from
Jun 4, 2019
Merged

Remove *_LEFT fields to ensure PFC watchdog enter fresh into the operational/storm state after warm-reboot #897

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51025e1
Remove *_LEFT fields to allow PFC watchdog to enter fresh into the
wendani May 17, 2019
da9a19a
Merge remote-tracking branch 'public/master' into pfcwd_wb_left_master
wendani May 30, 2019
7e7e1c6
Merge remote-tracking branch 'public/master' into pfcwd_wb_left_master
wendani Jun 4, 2019
f20afb7
Merge remote-tracking branch 'public/master' into pfcwd_wb_left_master
wendani Jun 4, 2019
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
2 changes: 1 addition & 1 deletion orchagent/pfc_detect_broadcom.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ for i = n, 1, -1 do
end
end

-- Save values for next run
-- Save values for next run
redis.call('HSET', counters_table_name .. ':' .. KEYS[i], 'SAI_QUEUE_ATTR_PAUSE_STATUS_last', queue_pause_status)
redis.call('HSET', counters_table_name .. ':' .. KEYS[i], 'SAI_QUEUE_STAT_PACKETS_last', packets)
redis.call('HSET', counters_table_name .. ':' .. KEYS[i], 'PFC_WD_DETECTION_TIME_LEFT', time_left)
Expand Down
4 changes: 2 additions & 2 deletions orchagent/pfcwdorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ bool PfcWdSwOrch<DropHandler, ForwardHandler>::startWdActionOnQueue(const string
template <typename DropHandler, typename ForwardHandler>
bool PfcWdSwOrch<DropHandler, ForwardHandler>::bake()
{
// clean all *_last fields in COUNTERS_TABLE
// clean all *_last and *_LEFT fields in COUNTERS_TABLE
// to allow warm-reboot pfc detect & restore state machine to enter the same init state as cold-reboot
RedisClient redisClient(this->getCountersDb().get());

Expand All @@ -977,7 +977,7 @@ bool PfcWdSwOrch<DropHandler, ForwardHandler>::bake()
vector<string> wLasts;
for (const auto &fv : fvTuples)
{
if (fvField(fv).find("_last") != string::npos)
if ((fvField(fv).find("_last") != string::npos) || (fvField(fv).find("_LEFT") != string::npos))
{
wLasts.push_back(fvField(fv));
}
Expand Down
2 changes: 1 addition & 1 deletion orchagent/pfcwdorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class PfcWdSwOrch: public PfcWdOrch<DropHandler, ForwardHandler>
shared_ptr<DBConnector> m_applDb = nullptr;
// Track queues in storm
shared_ptr<Table> m_applTable = nullptr;
// used for hdel
// used for hset and hdel
RedisClient m_applDbRedisClient;
};

Expand Down