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

[orchagent] Add zmq sync mode flag #1505

Merged
merged 3 commits into from
Dec 7, 2020
Merged

[orchagent] Add zmq sync mode flag #1505

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80d7657
[orchagent] Add zmq sync mode flag
kcudnik Nov 17, 2020
2a5599f
Add communication mode attribute support
kcudnik Nov 21, 2020
d583897
Address comments
kcudnik Nov 30, 2020
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
19 changes: 14 additions & 5 deletions orchagent/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ bool gSwssRecord = true;
bool gLogRotate = false;
bool gSaiRedisLogRotate = false;
bool gSyncMode = false;
sai_redis_communication_mode_t gRedisCommunicationMode = SAI_REDIS_COMMUNICATION_MODE_REDIS_ASYNC;
char *gAsicInstance = NULL;

extern bool gIsNatSupported;
Expand All @@ -64,7 +65,7 @@ string gRecordFile;

void usage()
{
cout << "usage: orchagent [-h] [-r record_type] [-d record_location] [-b batch_size] [-m MAC] [-i INST_ID] [-s]" << endl;
cout << "usage: orchagent [-h] [-r record_type] [-d record_location] [-b batch_size] [-m MAC] [-i INST_ID] [-s] [-z mode]" << 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 @@ -76,6 +77,7 @@ void usage()
cout << " -m MAC: set switch MAC address" << endl;
cout << " -i INST_ID: set the ASIC instance_id in multi-asic platform" << endl;
cout << " -s: enable synchronous mode" << endl;
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you also add a message that this is being deprecated as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

cout << " -z: redis communication mode (redis_async|redys_sync|zmq_sync), default: redis_async" << endl;
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems "redys_sync" is a typo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

}

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

string record_location = ".";

while ((opt = getopt(argc, argv, "b:m:r:d:i:hs")) != -1)
while ((opt = getopt(argc, argv, "b:m:r:d:i:hsz:")) != -1)
{
switch (opt)
{
Expand Down Expand Up @@ -213,6 +215,9 @@ int main(int argc, char **argv)
gSyncMode = true;
SWSS_LOG_NOTICE("Enabling synchronous mode");
break;
case 'z':
sai_deserialize_redis_communication_mode(optarg, gRedisCommunicationMode);
break;

default: /* '?' */
exit(EXIT_FAILURE);
Expand Down Expand Up @@ -272,12 +277,16 @@ int main(int argc, char **argv)
// when g_syncMode is set to true here, create_switch will wait the response from syncd
if (gSyncMode)
{
attr.id = SAI_REDIS_SWITCH_ATTR_SYNC_MODE;
attr.value.booldata = true;
SWSS_LOG_WARN("sync mode is depreacated, use -z param");

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

attr.id = SAI_REDIS_SWITCH_ATTR_REDIS_COMMUNICATION_MODE;
attr.value.s32 = gRedisCommunicationMode;

sai_switch_api->set_switch_attribute(gSwitchId, &attr);

if (gAsicInstance)
{
attr.id = SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO;
Expand Down