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

Jump to bottom

[interfaces]: Redirect brctl errors and add || true #462

Merged
merged 1 commit into from
Apr 4, 2017
Merged

[interfaces]: Redirect brctl errors and add || true #462

merged 1 commit into from
Apr 4, 2017

Conversation

stcheng
Copy link
Contributor

@stcheng stcheng commented Mar 30, 2017

  • This change is added so that when doing ifdown/ifup to flap the
    interface, it will success even when the interface is already
    enslaved as a member of VLAN.

Signed-off-by: Shuotian Cheng [email protected]

@stcheng stcheng requested a review from jleveque March 30, 2017 22:58
@stcheng stcheng self-assigned this Mar 30, 2017
@stcheng stcheng requested a review from taoyl-ms March 30, 2017 22:58
@taoyl-ms
Copy link
Contributor

Just come up with one problem - when there is no vlan/pc configured, this comment line will still be presented as it is out of the for loop. Shall we move it into the for loop? However if we do that there will be multiple comment lines of same content.

@stcheng
Copy link
Contributor Author

stcheng commented Mar 30, 2017

@taoyl-ms I see. I will address this.

@taoyl-ms
Copy link
Contributor

What's your plan to address this? Add a if to check whether the amount of members >0?

@stcheng
Copy link
Contributor Author

stcheng commented Mar 30, 2017

@taoyl-ms yes. what about this approach?

lguohan
lguohan reviewed Apr 4, 2017
View reviewed changes
files/image_config/interfaces/interfaces.j2 Outdated
{% for vlan in minigraph_vlans.keys()|sort %}
{% for member in minigraph_vlans[vlan]['members'] %}
auto {{ member }}
allow-hotplug {{ member }}
iface {{ member }} inet manual
pre-up ifconfig {{ member }} up
post-up brctl addif {{ vlan }} {{ member }}
post-up brctl addif {{ vlan }} {{ member }} >/dev/null 2>&1 || true
Copy link
Collaborator

Choose a reason for hiding this comment

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

is it necessary to redirect the standout to /dev/null? would it be bettr if we can see the error message? in case there are some other errors?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

agree.

[interfaces]: Support ifup/ifdown on VLAN/LAG members
7d8568a 
- This change is added so that when doing ifdown/ifup to flap the
  interface, it will success even when the interface is already
  enslaved as a member of VLAN.
- LAG members do not have IP addresses. Thus ifconfig command is
  needed.
- Do not display comments when not necessary.

Signed-off-by: Shuotian Cheng <[email protected]>
@stcheng stcheng merged commit bd6976a into sonic-net:master Apr 4, 2017
@stcheng stcheng deleted the vlan branch April 4, 2017 08:41
@stcheng stcheng mentioned this pull request Jun 12, 2019
Merged
stcheng pushed a commit to stcheng/sonic-buildimage that referenced this pull request Jun 13, 2019
[swss]: Update swss submodules change
ae2f7f5 
sonic-swss:
[vnet]: Extend Bitmap VNET test with "remove" flows (sonic-net#900)
[vxlanorch] Ambiguous return code for removeNextHopTunnel (sonic-net#880)
Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (sonic-net#839)
Set LAG mtu value based on kernel netlink msg (sonic-net#922)
[orchagent]: Remove try/catch for correct coredump file (sonic-net#790)
[aclorch] unittest by gtest (sonic-net#924)
[orchagent]: Added support of PFC WD for BFN platform (sonic-net#823)
[vnetorch]: Fix tunnel route removal flow for bitmap VNET (sonic-net#912)
pkill -9 zebra for frr warm restart VS test fix (sonic-net#927)
swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB  (sonic-net#907)
[debian]: Do not build test when building with real SAI (sonic-net#932)

sonic-swss-common:
Add schema for dot1p to tc mapping config table (sonic-net#274)
Fix MIRROR_SESSION table macro name (sonic-net#264)
[schema] Add VNET Route tables in config_db (sonic-net#279)
[debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280)
White-list clear_stats op from orchagent to syncd (sonic-net#281)
Correct comment (sonic-net#282)

sonic-sairedis:
[debian]: Change build order in target binary (sonic-net#452)
[debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461)
Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462)
add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460)
Check if port VID exists in db on flex counter query (sonic-net#464)
Full sleep wait change for PFC watchdog (sonic-net#465)
Add synchronous clear_stats operation path (sonic-net#463)
Modify sai_create_port to breakout a port for virtual switch (sonic-net#454)
Fix typo  (sonic-net#467)

Signed-off-by: Shu0T1an ChenG <[email protected]>
stcheng pushed a commit that referenced this pull request Jun 14, 2019
[swss]: Update swss submodules change (#2995)
f8a4efc 
sonic-swss:
[vnet]: Extend Bitmap VNET test with "remove" flows (#900)
[vxlanorch] Ambiguous return code for removeNextHopTunnel (#880)
Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (#839)
Set LAG mtu value based on kernel netlink msg (#922)
[orchagent]: Remove try/catch for correct coredump file (#790)
[aclorch] unittest by gtest (#924)
[orchagent]: Added support of PFC WD for BFN platform (#823)
[vnetorch]: Fix tunnel route removal flow for bitmap VNET (#912)
pkill -9 zebra for frr warm restart VS test fix (#927)
swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB  (#907)
[debian]: Do not build test when building with real SAI (#932)

sonic-swss-common:
Add schema for dot1p to tc mapping config table (#274)
Fix MIRROR_SESSION table macro name (#264)
[schema] Add VNET Route tables in config_db (#279)
[debian] increment debian compatibility to 10 to enable parallel package build (#280)
White-list clear_stats op from orchagent to syncd (#281)
Correct comment (#282)

sonic-sairedis:
[debian]: Change build order in target binary (#452)
[debian] increment debian compatibility to 10 to enable parallel package build (#461)
Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (#462)
add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (#460)
Check if port VID exists in db on flex counter query (#464)
Full sleep wait change for PFC watchdog (#465)
Add synchronous clear_stats operation path (#463)
Modify sai_create_port to breakout a port for virtual switch (#454)
Fix typo  (#467)

Signed-off-by: Shu0T1an ChenG <[email protected]>
seiferteric pushed a commit to project-arlo/sonic-buildimage that referenced this pull request Oct 14, 2019
@jangidrk
Update git submodules
0602e9b 
* Update src/sonic-sairedis from branch 'broadcom_sonic'
  to 9de2a0cd3371723c925341091c3ee9bc6df88527
  - Merge 201904 branch to broadcom_sonic branch on Mon Jul  1 13:57:56 PDT 2019
    
    Change-Id: Ibc8bd38f6819bda73ba52fff6358b794f7366d46
    
  - Fix typo  (sonic-net#467)
    
    * Rename to fix typo
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Correct shared_ptr creation parameters
    
    Signed-off-by: Wenda Ni <[email protected]>
    
  - Modify sai_create_port to breakout a port for virtual switch (sonic-net#454)
    
    For breakout a port, it needs to support create port and remove port.
    When create a port, it needs to init some attributes.
    
    Signed-off-by: chiourung_huang <[email protected]>
    
  - Add synchronous clear_stats operation path (sonic-net#463)
    
    * Send clear_stats op from orchagent to syncd via Redis pipeline
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Handle clear_stats op in syncd
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Receive clear_stats op status response from sycnd in orchagent context
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Shift clear_stats to get synchronous response from ASIC
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Fix compilation error
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Fix log message output
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Remove debugging symbols
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Remove debugging symbols
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Change the validation order of KeyOpFieldsValuesTuple responded from
    syncd
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Expand status log utility to include op type as argument
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Address comments: check if object id is present in local db
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Leverage newly merged infrastructure to check if object id is present in
    the local db
    
    Signed-off-by: Wenda Ni <[email protected]>
    
    * Fix compile error
    
    Signed-off-by: Wenda Ni <[email protected]>
    
  - Full sleep wait change for PFC watchdog (sonic-net#465)
    
    * Sleep wait change for pfc watchdog, which still has plugins in place so
    isEmpty() always returns true.
    
    When issuing 'pfcwd stop' cli to stop PFC watchdog, it only clears the counter id list for physical ports under the hood, leaving lua script plugins still installed and ieEmpty() returns false.
    
    So even when PFC watchdog is stopped, the flex counter thread would wake up every 200 ms.
    
    Jun 4 17:58:51.273413 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 33 ms
    Jun 4 17:58:51.471288 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 30 ms
    Jun 4 17:58:51.672930 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 31 ms
    Jun 4 17:58:51.882972 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 40 ms
    Jun 4 17:58:52.074862 str-a7050-acs-1 ERR syncd#syncd: :- flexCounterThread: End of flex counter thread FC PFC_WD, took 31 ms
    
    This PR is to address the above observation:
    
    Fine granularize the isEmpty() to two functions---isIdsEmpty() and isPluginsEmpty(), and use the emptiness check of the counter id list, isIdsEmpty(), as the criteria for full sleep wait. This approach is generally valid because current flex counter use cases would have the presence of non-empty counter id list to be meaningful, followed by an optional execution of the Lua script plugins if they are installed.
    
    Signed-off-by: Wenda Ni <[email protected]>
    
  - Check if port VID exists in db on flex counter query (sonic-net#464)
    
    
  - add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460)
    
    Signed-off-by: Stepan Blyschak <[email protected]>
  - Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462)
    
    Signed-off-by: Wenda Ni <[email protected]>
    
  - [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461)
    
    * fix parallel build
    
    Signed-off-by: Stepan Blyschak <[email protected]>
    
    * [debian] increment debian compatibility to 10 to enable parallel package
    build
    
    From debhelper man pages:
    
    "If neither option is specified, debhelper currently defaults to
    --parallel in compat 10 (or later) and --no-parallel otherwise."
    
    Signed-off-by: Stepan Blyschak <[email protected]>
    
    * make tests run serial
    
    Signed-off-by: Stepan Blyschak <[email protected]>
    
  - [debian]: Change build order in target binary (sonic-net#452)
    
    Make binary-syncd the last target, so the non-rpc requisites will be available after the first build
    It will allow doing incremental builds later on for the main binary type
  - Add buffer pool stat to flex counter architecture (sonic-net#451)
    
    
  -  Watermark: test SAI clear api if the stats mode is READ_AND_CLEAR (sonic-net#427)
    
    * Test SAI clear api if the stats mode is READ_AND_CLEAR
    
    Signed-off-by: Wenda <[email protected]>
    
    * Address compile error
dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020
@wendani @lguohan
Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS …
d445b0e 
…is disable (sonic-net#462)

Signed-off-by: Wenda Ni <[email protected]>
@shi-su shi-su mentioned this pull request Mar 4, 2021
Merged
4 tasks
shi-su added a commit that referenced this pull request Mar 4, 2021
@shi-su
[sonic-swss-common] Update submodule (#6958)
24759dc 
Update the sonic-swss-common submodule. The following are the commits in the submodule.

f01fede [debian/control] libswsscommon-dev depends on libbost-dev (#458)
607a8ce Convert return value of get_all function in SonicV2Connector to dict (#462)
lguohan pushed a commit that referenced this pull request Mar 10, 2021
@shi-su @lguohan
[sonic-swss-common] Update submodule (#6958)
d5b3519 
Update the sonic-swss-common submodule. The following are the commits in the submodule.

f01fede [debian/control] libswsscommon-dev depends on libbost-dev (#458)
607a8ce Convert return value of get_all function in SonicV2Connector to dict (#462)
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@shi-su
[sonic-swss-common] Update submodule (sonic-net#6958)
ec403fe 
Update the sonic-swss-common submodule. The following are the commits in the submodule.

f01fede [debian/control] libswsscommon-dev depends on libbost-dev (sonic-net#458)
607a8ce Convert return value of get_all function in SonicV2Connector to dict (sonic-net#462)
mssonicbld added a commit that referenced this pull request Apr 18, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
baf6f62 
…D automatically (#18706)

#### Why I did it
src/sonic-platform-daemons
```
* d45b982 - (HEAD -> 202311, origin/202311) [chassis][linecard] Fix Module LINECARD<> went off-line message for empty slot issue (#462) (4 hours ago) [Marty Y. Lok]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 18, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
a5281fb 
…D automatically (#18707)

#### Why I did it
src/sonic-platform-daemons
```
* 0f61e15 - (HEAD -> master, origin/master, origin/HEAD) [chassis][linecard] Fix Module LINECARD<> went off-line message for empty slot issue (#462) (8 hours ago) [Marty Y. Lok]
* 25e22cd - Support to get MEDIA_SETTING and OPTICS_SI from both platform folder and HWSKU folder (#456) (21 hours ago) [Kebo Liu]
* 805c76a - [xcvrd] Ignore processing ports that are not front-panel (#455) (21 hours ago) [Vivek]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 20, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
ed86ed0 
…D automatically (#18731)

#### Why I did it
src/sonic-platform-daemons
```
* a566959 - (HEAD -> 202205, origin/202205) [chassis][linecard] Fix Module LINECARD<> went off-line message for empty slot issue (#462) (#470) (8 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Apr 26, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
a43ee42 
…D automatically (#18778)

#### Why I did it
src/sonic-platform-daemons
```
* 0694d33 - (HEAD -> 202305, origin/202305) [chassis][linecard] Fix Module LINECARD<> went off-line message for empty slot issue (#462) (3 days ago) [Marty Y. Lok]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request May 11, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
e5e8d42 
… automatically (#18931)

#### Why I did it
src/sonic-platform-common
```
* 7658e08 - (HEAD -> 202305, origin/202305) Update Innolight package for mock test (#461) (25 hours ago) [Anoop Kamath]
* e7011ea - DPinit timeout seen for Innolight transceiver during CMIS init + transceiver OIR causing CMIS init failure (#450) (2 days ago) [Anoop Kamath]
* 581a7a0 - Handle page select and remote access check after changing SFP target (#462) (2 days ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request May 12, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
2e97051 
… automatically (#18840)

#### Why I did it
src/sonic-platform-common
```
* 0362460 - (HEAD -> master, origin/master, origin/HEAD) fix: using PAGE_LENGTH instead of INIT_OFFSET (#452) (4 days ago) [Qingxiao Ren]
* 16ab403 - Update Innolight package for mock test (#461) (4 days ago) [Anoop Kamath]
* 50a75a5 - Aligning SONiC code with sff8024 spec (#457) (5 days ago) [Tomer Shalvi]
* 655a5ff - Handle page select and remote access check after changing SFP target (#462) (9 days ago) [mihirpat1]
* de16e50 - DPinit timeout seen for Innolight transceiver during CMIS init + transceiver OIR causing CMIS init failure (#450) (11 days ago) [Anoop Kamath]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jun 25, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
e4061fd 
… automatically (#19384)

#### Why I did it
src/sonic-platform-common
```
* c90b6bf - (HEAD -> 202311, origin/202311) Handle page select and remote access check after changing SFP target (#462) (4 minutes ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan approved these changes

@jleveque jleveque Awaiting requested review from jleveque

@taoyl-ms taoyl-ms Awaiting requested review from taoyl-ms

Assignees

@stcheng stcheng

Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stcheng @taoyl-ms @lguohan