Skip to content

[pull] master from Azure:master#460

Merged
pull[bot] merged 2 commits intomudsut4ke:masterfrom
sonic-net:master
Dec 7, 2019
Merged

[pull] master from Azure:master#460
pull[bot] merged 2 commits intomudsut4ke:masterfrom
sonic-net:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Dec 7, 2019

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

jleveque and others added 2 commits December 7, 2019 11:26
…3851)

Patch isc-dhcp-relay in order to allow the relay agent to discover configured interfaces even if they are down.

Without this patch, the relay agent will not discover configured interfaces if they are down when the relay agent starts up. If the interface(s) then get brought up after the relay started, the relay will discard packets received on these interfaces and log the message, Discarding packet received on <iface_name> interface that has no IPv4 address assigned. This led to race conditions when starting SONiC (or loading configuration). To resolve this, the relay agent would need to be restarted with all configured interfaces up.

With this patch, the relay agent will discover all configured interfaces, whether or not they are up at the time the relay agent starts. Thus, the state of the configured interfaces can be down when the relay agent starts and brought up during the lifetime of the relay agent process, and the relay agent will relay packets as expected; it will not discard them.
Fix the issue when an SFP module is plugged into a QSFP port via an adapter.

- How I did it
Originally the type of an SFP module is determined according to the SKU dictionary. However, it's possible that as SFP module is plugged into a QSFP port via an adapter. In this case, the EEPROM content will be parsed in the wrong format.
To address that we fetch the identifier value of an xSFP module and then get the type by parsing it.
@pull pull bot added the ⤵️ pull label Dec 7, 2019
@pull pull bot merged commit 90ddad4 into mudsut4ke:master Dec 7, 2019
mudsut4ke pushed a commit that referenced this pull request Feb 3, 2020
…onic-net#2594)

* [201811 submodules] advance sairedis, swss, swss-common, utilities

Submodule src/sonic-sairedis d57222a..54b02a1:
  > Add support for fdb_event MOVE and check fdb event oids (#420)
  > [vslib] add missing port attributes for virtual switch (#419)

Submodule src/sonic-swss 584490c..62e2a20:
  > [fdborch] Store vlan id of FDB entry instead of port pvid into stateD… (#759)
  > [portsorch] Change speed set flow (#764)
  > Create egress ACL table group during the PFCWD stats list installment (#787)

Submodule src/sonic-swss-common 286ef34..2592b0c:
  > Add support for WarmStart::setDataCheckState() (#242)

Submodule src/sonic-utilities b44b462..d409987:
  > [sonic_installer] Improve error handling (#460)
  > [clock] sync os time to CMOS before rebooting (#465)
  > [intfstat] add intfstat script to output RIF counters (#439)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* [201811 utilties] add 201811 branch for sonic-utilities repo

Submodule src/sonic-utilities d409987...ff1448c:
  > [sonic_installer] Improve error handling (#460)
  > [clock] sync os time to CMOS before rebooting (#465)
  < [sonic_installer] Improve error handling (#460)
  < [clock] sync os time to CMOS before rebooting (#465)
  < [intfstat] add intfstat script to output RIF counters (#439)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants