Skip to content
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

acquire lock before accessing shared redis context #489

Merged
merged 12 commits into from
Jul 24, 2019
Merged

acquire lock before accessing shared redis context #489

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
24c6494
fixed issue of permenent block on redisBufferRead() due to unprotecte…
anilkpandey Jul 17, 2019
676c0b5
Delete .DS_Store
anilkpandey Jul 18, 2019
550aca9
Merge remote-tracking branch 'upstream/master'
anilkpandey Jul 19, 2019
f009491
resolved merge conflict
anilkpandey Jul 19, 2019
e840a6b
Revert "resolved merge conflict"
anilkpandey Jul 20, 2019
03fc996
Revert "Merge remote-tracking branch 'upstream/master'"
anilkpandey Jul 20, 2019
0347277
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
anilkpandey Jul 20, 2019
7497a35
Revert "Revert "resolved merge conflict""
anilkpandey Jul 20, 2019
b265a8b
Update syncd.cpp
anilkpandey Jul 21, 2019
bad91f1
Update syncd.cpp
anilkpandey Jul 21, 2019
bf400a9
Update syncd.cpp
anilkpandey Jul 21, 2019
d29f99a
Update syncd.cpp
anilkpandey Jul 21, 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
13 changes: 7 additions & 6 deletions syncd/syncd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3101,13 +3101,14 @@ bool processFlexCounterEvent(
sai_object_id_t vid = SAI_NULL_OBJECT_ID;
sai_deserialize_object_id(vidStr, vid);
sai_object_id_t rid;

if (!try_translate_vid_to_rid(vid, rid))
{
SWSS_LOG_WARN("port VID %s, was not found (probably port was removed/splitted) and will remove from counters now",
sai_serialize_object_id(vid).c_str());

return false;
std::lock_guard<std::mutex> lock(g_mutex);
if (!try_translate_vid_to_rid(vid, rid))
{
SWSS_LOG_WARN("port VID %s, was not found (probably port was removed/splitted) and will remove from counters now",
sai_serialize_object_id(vid).c_str());
return false;
}
}

sai_object_type_t objectType = redis_sai_object_type_query(vid); // VID and RID will have the same object type
Expand Down