diff --git a/syncd/CommandLineOptions.cpp b/syncd/CommandLineOptions.cpp index 3ad68b886..52080b100 100644 --- a/syncd/CommandLineOptions.cpp +++ b/syncd/CommandLineOptions.cpp @@ -19,7 +19,6 @@ CommandLineOptions::CommandLineOptions() m_disableExitSleep = false; m_enableUnittests = false; m_enableConsistencyCheck = false; - m_enableSyncMode = false; m_enableSaiBulkSupport = false; m_redisCommunicationMode = SAI_REDIS_COMMUNICATION_MODE_REDIS_ASYNC; @@ -57,7 +56,6 @@ std::string CommandLineOptions::getCommandLineString() const ss << " DisableExitSleep=" << (m_disableExitSleep ? "YES" : "NO"); ss << " EnableUnittests=" << (m_enableUnittests ? "YES" : "NO"); ss << " EnableConsistencyCheck=" << (m_enableConsistencyCheck ? "YES" : "NO"); - ss << " EnableSyncMode=" << (m_enableSyncMode ? "YES" : "NO"); ss << " RedisCommunicationMode=" << sai_serialize_redis_communication_mode(m_redisCommunicationMode); ss << " EnableSaiBulkSuport=" << (m_enableSaiBulkSupport ? "YES" : "NO"); ss << " StartType=" << startTypeToString(m_startType); diff --git a/syncd/CommandLineOptions.h b/syncd/CommandLineOptions.h index 26adc5ec6..966b01946 100644 --- a/syncd/CommandLineOptions.h +++ b/syncd/CommandLineOptions.h @@ -68,8 +68,6 @@ namespace syncd */ bool m_enableConsistencyCheck; - bool m_enableSyncMode; - bool m_enableSaiBulkSupport; sai_redis_communication_mode_t m_redisCommunicationMode; diff --git a/syncd/CommandLineOptionsParser.cpp b/syncd/CommandLineOptionsParser.cpp index 620e5383f..3e20edbaa 100644 --- a/syncd/CommandLineOptionsParser.cpp +++ b/syncd/CommandLineOptionsParser.cpp @@ -19,9 +19,9 @@ std::shared_ptr CommandLineOptionsParser::parseCommandLine( auto options = std::make_shared(); #ifdef SAITHRIFT - const char* const optstring = "dp:t:g:x:b:w:uSUCsz:lrm:h"; + const char* const optstring = "dp:t:g:x:b:w:uSUCz:lrm:h"; #else - const char* const optstring = "dp:t:g:x:b:w:uSUCsz:lh"; + const char* const optstring = "dp:t:g:x:b:w:uSUCz:lh"; #endif // SAITHRIFT while (true) @@ -35,7 +35,6 @@ std::shared_ptr CommandLineOptionsParser::parseCommandLine( { "disableExitSleep", no_argument, 0, 'S' }, { "enableUnittests", no_argument, 0, 'U' }, { "enableConsistencyCheck", no_argument, 0, 'C' }, - { "syncMode", no_argument, 0, 's' }, { "redisCommunicationMode", required_argument, 0, 'z' }, { "enableSaiBulkSupport", no_argument, 0, 'l' }, { "globalContext", required_argument, 0, 'g' }, @@ -95,11 +94,6 @@ std::shared_ptr CommandLineOptionsParser::parseCommandLine( options->m_enableConsistencyCheck = true; break; - case 's': - SWSS_LOG_WARN("param -s is depreacated, use -z"); - options->m_enableSyncMode = true; - break; - case 'z': sai_deserialize_redis_communication_mode(optarg, options->m_redisCommunicationMode); break; @@ -175,8 +169,6 @@ void CommandLineOptionsParser::printUsage() std::cout << " Metadata enable unittests" << std::endl; std::cout << " -C --enableConsistencyCheck" << std::endl; std::cout << " Enable consisteny check DB vs ASIC after comparison logic" << std::endl; - std::cout << " -s --syncMode" << std::endl; - std::cout << " Enable synchronous mode (depreacated, use -z)" << std::endl; std::cout << " -z --redisCommunicationMode" << std::endl; std::cout << " Redis communication mode (redis_async|redis_sync|zmq_sync), default: redis_async" << std::endl; std::cout << " -l --enableBulk" << std::endl; diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp index 2e560d5d1..455cfef69 100644 --- a/syncd/Syncd.cpp +++ b/syncd/Syncd.cpp @@ -80,26 +80,6 @@ Syncd::Syncd( SWSS_LOG_THROW("no context config defined at global context %u", m_commandLineOptions->m_globalContext); } - if (m_contextConfig->m_zmqEnable && m_commandLineOptions->m_enableSyncMode) - { - SWSS_LOG_NOTICE("disabling command line sync mode, since context zmq enabled"); - - m_commandLineOptions->m_enableSyncMode = false; - - m_commandLineOptions->m_redisCommunicationMode = SAI_REDIS_COMMUNICATION_MODE_ZMQ_SYNC; - } - - if (m_commandLineOptions->m_enableSyncMode) - { - SWSS_LOG_WARN("enable sync mode is deprecated, please use communication mode, FORCING redis sync mode"); - - m_enableSyncMode = true; - - m_contextConfig->m_zmqEnable = false; - - m_commandLineOptions->m_redisCommunicationMode = SAI_REDIS_COMMUNICATION_MODE_REDIS_SYNC; - } - if (m_commandLineOptions->m_redisCommunicationMode == SAI_REDIS_COMMUNICATION_MODE_ZMQ_SYNC) { SWSS_LOG_NOTICE("zmq sync mode enabled via cmd line"); diff --git a/syncd/tests/TestSyncdBrcm.cpp b/syncd/tests/TestSyncdBrcm.cpp index 385b0a11d..d99a3b758 100644 --- a/syncd/tests/TestSyncdBrcm.cpp +++ b/syncd/tests/TestSyncdBrcm.cpp @@ -71,7 +71,6 @@ void syncdBrcmWorkerThread() auto commandLineOptions = std::make_shared(); auto isWarmStart = false; - commandLineOptions->m_enableSyncMode= true; commandLineOptions->m_enableTempView = true; commandLineOptions->m_disableExitSleep = true; commandLineOptions->m_enableUnittests = false; diff --git a/syncd/tests/TestSyncdMlnx.cpp b/syncd/tests/TestSyncdMlnx.cpp index 457f621a9..c79f19f09 100644 --- a/syncd/tests/TestSyncdMlnx.cpp +++ b/syncd/tests/TestSyncdMlnx.cpp @@ -72,7 +72,6 @@ void syncdMlnxWorkerThread() auto commandLineOptions = std::make_shared(); auto isWarmStart = false; - commandLineOptions->m_enableSyncMode= true; commandLineOptions->m_enableTempView = false; commandLineOptions->m_disableExitSleep = true; commandLineOptions->m_enableUnittests = false; diff --git a/syncd/tests/TestSyncdNvdaBf.cpp b/syncd/tests/TestSyncdNvdaBf.cpp index 33c1d1227..9f2dbb463 100644 --- a/syncd/tests/TestSyncdNvdaBf.cpp +++ b/syncd/tests/TestSyncdNvdaBf.cpp @@ -101,7 +101,6 @@ void syncdNvdaBfWorkerThread() auto commandLineOptions = std::make_shared(); auto isWarmStart = false; - commandLineOptions->m_enableSyncMode= true; commandLineOptions->m_enableTempView = false; commandLineOptions->m_disableExitSleep = true; commandLineOptions->m_enableUnittests = false;