Skip to content

Add synchronous switch to orch agent #987

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
lguohan merged 2 commits into from
Jul 25, 2019
Merged

Add synchronous switch to orch agent #987

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9c0f0a
Add synchronous switch to orch agent
kcudnik Jul 20, 2019
4eca8b3
fix compile error
kcudnik Jul 20, 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
20 changes: 18 additions & 2 deletions orchagent/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,14 @@ int gBatchSize = DEFAULT_BATCH_SIZE;
bool gSairedisRecord = true;
bool gSwssRecord = true;
bool gLogRotate = false;
bool gSyncMode = false;

ofstream gRecordOfs;
string gRecordFile;

void usage()
{
cout << "usage: orchagent [-h] [-r record_type] [-d record_location] [-b batch_size] [-m MAC]" << endl;
cout << "usage: orchagent [-h] [-r record_type] [-d record_location] [-b batch_size] [-m MAC] [-s]" << endl;
cout << " -h: display this message" << endl;
cout << " -r record_type: record orchagent logs with type (default 3)" << endl;
cout << " 0: do not record logs" << endl;
Expand All @@ -61,6 +63,7 @@ void usage()
cout << " -d record_location: set record logs folder location (default .)" << endl;
cout << " -b batch_size: set consumer table pop operation batch size (default 128)" << endl;
cout << " -m MAC: set switch MAC address" << endl;
cout << " -s: enable synchronous mode" << endl;
}

void sighup_handler(int signo)
Expand Down Expand Up @@ -117,7 +120,7 @@ int main(int argc, char **argv)

string record_location = ".";

while ((opt = getopt(argc, argv, "b:m:r:d:h")) != -1)
while ((opt = getopt(argc, argv, "b:m:r:d:hs")) != -1)
{
switch (opt)
{
Expand Down Expand Up @@ -162,6 +165,11 @@ int main(int argc, char **argv)
case 'h':
usage();
exit(EXIT_SUCCESS);
case 's':
gSyncMode = true;
SWSS_LOG_NOTICE("Enabling synchronous mode");
break;

default: /* '?' */
exit(EXIT_FAILURE);
}
Expand Down Expand Up @@ -219,6 +227,14 @@ int main(int argc, char **argv)
}
SWSS_LOG_NOTICE("Create a switch");

if (gSyncMode)
{
attr.id = SAI_REDIS_SWITCH_ATTR_SYNC_MODE;
attr.value.booldata = true;

sai_switch_api->set_switch_attribute(gSwitchId, &attr);
}

/* Get switch source MAC address if not provided */
if (!gMacAddress)
{
Expand Down