Fix for credo gbsyncd warm-reboot #1499
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
More attributes are needed for the create_switch of credo gbsyncd warm-boot. The fix here is to pass all the attributes when SAI_SWITCH_ATTR_TYPE is SAI_SWITCH_TYPE_PHY.
firstRun being true disallows the start of warm-reboot. It was set to true when no switch attributes is found under the key of HIDDEN* in ASIC_DB or GB_ASIC_DB. However, all such attributes are unrelated to the credo gbsyncd, so hasNoHiddenKeysDefined is always true for gbsyncd. The fix here is to determine the first run also based on no switch objects has been created in ASIC_DB or GB_ASIC_DB.
… supported SAI_SWITCH_ATTR_DEFAULT_TRAP_GROUP is not supported by credo gbsyncd. Skip the steps related to it when it is not available
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This needs to be discussed, nice passing more attributes in warm boot make no sense, by design warm boot should have the same attributes after warm boot. Exception is attributes pointers which changes because of memory allocation for syncd process and hardware info to point which switch should be instantiated. If you are changing this then there is some issue inside libsai in vendor code for warm boot |
kcudnik
requested changes
Jan 14, 2025
| @@ -61,9 +61,26 @@ ComparisonLogic::ComparisonLogic( | |||
|
|
|||
| // TODO needs to be removed and done in generic | |||
|
|
|||
| m_current->m_defaultTrapGroupRid = m_switch->getSwitchDefaultAttrOid(SAI_SWITCH_ATTR_DEFAULT_TRAP_GROUP); | |||
| m_temp->m_defaultTrapGroupRid = m_switch->getSwitchDefaultAttrOid(SAI_SWITCH_ATTR_DEFAULT_TRAP_GROUP); | |||
| try | |||
| @@ -691,6 +691,15 @@ bool RedisClient::hasNoHiddenKeysDefined() const | |||
| return keys.size() == 0; | |||
| } | |||
|
|
|||
| bool RedisClient::hasNoSwitchDefined() const | |||
There was a problem hiding this comment.
Why there would be no switch? What is purpose of this? You have flag isveryfirstrun
| @@ -4645,7 +4645,16 @@ void Syncd::performWarmRestartSingleSwitch( | |||
| sai_attribute_t *attrList = list.get_attr_list(); | |||
|
|
|||
| uint32_t attrCount = list.get_attr_count(); | |||
|
|
|||
| bool isPhy = false; | |||
| for (uint32_t idx = 0; idx < attrCount; idx++) | |||
There was a problem hiding this comment.
There is a function for that in sai utils
| @@ -4662,7 +4671,7 @@ void Syncd::performWarmRestartSingleSwitch( | |||
| * new process could be loaded at different address space. | |||
| */ | |||
|
|
|||
| if (id == SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO || meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_POINTER) | |||
| if (isPhy || id == SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO || meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_POINTER) | |||
There was a problem hiding this comment.
You can pass all attributes, look at my comment in main thread
| @@ -5103,7 +5112,7 @@ bool Syncd::isVeryFirstRun() | |||
| * this is first run, let's query HIDDEN ? | |||
| */ | |||
|
|
|||
| bool firstRun = m_client->hasNoHiddenKeysDefined(); | |||
| bool firstRun = m_client->hasNoHiddenKeysDefined() && m_client->hasNoSwitchDefined(); | |||
There was a problem hiding this comment.
You already have flag isveryfirst run, why this is modified?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To support credo gbsyncd warm-reboot, we found several issues to be fixed in sonic-sairedis as follows: