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

Jump to bottom

[mlagsyncd]Fix mlag socket read fail #1832

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

[mlagsyncd]Fix mlag socket read fail #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ae60ca
change some code for trigger build
pettershao-ragilenetworks May 8, 2021
ebb1554
Merge branch 'master' of https://github.com/pettershao-ragilenetworks…
pettershao-ragilenetworks Jul 8, 2021
71e232d
Merge github.com:Azure/sonic-swss into fix_mlag_socket
pettershao-ragilenetworks Jul 22, 2021
cdfa56e
[mlag]fix socket read fail
pettershao-ragilenetworks Jul 22, 2021
43577c5
Update mclag.h
pettershao-ragilenetworks Aug 8, 2021
0a3a637
Update mclaglink.h
pettershao-ragilenetworks Aug 8, 2021
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: 0 additions & 1 deletion mclagsyncd/mclaglink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,7 +1731,6 @@ void MclagLink::mclagsyncdSetPeerSystemId(
}

MclagLink::MclagLink(Select *select, int port) :
MSG_BATCH_SIZE(256),
m_bufSize(MCLAG_MAX_MSG_LEN * MSG_BATCH_SIZE),
m_messageBuffer(NULL),
m_pos(0),
Expand Down
2 changes: 1 addition & 1 deletion mclagsyncd/mclaglink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ namespace swss {
bool is_iccp_up = false;
std::string m_system_mac;
std::set<vlan_mbr> m_vlan_mbrship; //set of vlan,mbr tuples
static const int MSG_BATCH_SIZE = 256;

const int MSG_BATCH_SIZE;
Copy link
Contributor

@qiluo-msft qiluo-msft Aug 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const int MSG_BATCH_SIZE;
static const int MSG_BATCH_SIZE = 256;
``` #Closed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this fix is easier than defining as a macro.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, accepted.

std::map<std::string, std:: string> *p_learn;

unique_ptr<DBConnector> p_state_db;
Expand Down