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

[build]: do not start docker service if it is already started #1203

Merged
merged 1 commit into from
Dec 2, 2017
Merged

[build]: do not start docker service if it is already started #1203

merged 1 commit into from
Dec 2, 2017

Conversation

lguohan
Copy link
Collaborator

@lguohan lguohan commented Dec 1, 2017

- What I did
do not start docker service if it is already started

- How I did it
first check if docker service is already started

- How to verify it

make -f slave.mk docker-start
make -f slave.mk docker-start
sudo service docker stop
make -f slave.mk docker-start

- Description for the changelog
use docker restart instead of docker start

- A picture of a cute animal (not mandatory but encouraged)

jleveque
jleveque approved these changes Dec 1, 2017
View reviewed changes
slave.mk
@@ -336,7 +336,7 @@ $(SONIC_INSTALL_WHEELS) : $(PYTHON_WHEELS_PATH)/%-install : .platform $$(addsuff

# start docker daemon
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest updating comment to reflect new functionality: start docker daemon if not already started

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

changed, thanks.

Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't appear to have changed, FYI. Change not staged?

@lguohan
[build]: start docker service if not already started
f0759a3 
docker start fails when docker service is already started
@lguohan lguohan merged commit 414e43b into sonic-net:master Dec 2, 2017
@lguohan lguohan deleted the ds branch January 14, 2018 09:00
dgsudharsan pushed a commit to dgsudharsan/sonic-buildimage that referenced this pull request Nov 13, 2020
Updating submodule pointers for sonic-swss and sonic-utilities
e72e27d 
sonic-swss:
[fea7ade] [orchagent][port] In case of successful port creation set log level to NOTICE instead of ERR (sonic-net#1500)
[7b76d2e] Copp Manager Changes (sonic-net#1333)
[bed7970] [orchagent] Arm 32-bit arch compilation warning Fixes (sonic-net#1488)
[b9084a7] Revert: swss: flush g_asicState after each event is done sonic-net#570 (sonic-net#1478)
[d6e15e9] [dvs] Clean-up conftest.py (sonic-net#1406)

sonic-utilities:
[3f15835] [sflow] Add mVRF support (sonic-net#1230)
[dadfc18] Copp Changes (sonic-net#1004)
[b226159] [CLI][PFCWD] Fix issue with specifying ports in pfcwd start on masic platforms (sonic-net#1203)
[40377d3] [chassis]: Configure and show for platform chassis_modules (sonic-net#1145)
[d5eb2f8] [consutil][connect] Remove root need from connect line command (sonic-net#1225)
[6cbec6b] [multi-ASIC] CRM show/config commands changes for multi-asic (sonic-net#1127)
@dgsudharsan dgsudharsan mentioned this pull request Nov 13, 2020
Merged
3 tasks
@jleveque jleveque mentioned this pull request Nov 15, 2020
Merged
prsunny pushed a commit that referenced this pull request Nov 23, 2020
Updating submodule pointers for sonic-utilities (#5921)
b65fc78 
sonic-utilities:
[3f15835] [sflow] Add mVRF support (#1230)
[dadfc18] Copp Changes (#1004)
[b226159] [CLI][PFCWD] Fix issue with specifying ports in pfcwd start on masic platforms (#1203)
[40377d3] [chassis]: Configure and show for platform chassis_modules (#1145)
[d5eb2f8] [consutil][connect] Remove root need from connect line command (#1225)
[6cbec6b] [multi-ASIC] CRM show/config commands changes for multi-asic (#1127)

Co-authored-by: dgsudharsan <[email protected]>
abdosi added a commit that referenced this pull request Dec 15, 2020
@abdosi
[submodule update] sonic-utilities
76d7c4b 
b909766aab63da5e9a51e05fd2bf79e80db75e5 (HEAD -> 201911, origin/201911) Fix show ip/v6 route summary non-multi-asic platform to interact with FRR directly (#1306)
057d2ee26586034975e21a5cacb1a00ca87f2857 Add support to collect tech support on multi ASIC platform (#1308)
38ab16d5835b917f7459044853276c9d4b53c98b [CLI][PFCWD] Fix issue with specifying ports in pfcwd start on masic platforms (#1203)

Signed-off-by: Abhishek Dosi <[email protected]>
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@santhosh-kt
Updating submodule pointers for sonic-utilities (sonic-net#5921)
451f21e 
sonic-utilities:
[3f15835] [sflow] Add mVRF support (sonic-net#1230)
[dadfc18] Copp Changes (sonic-net#1004)
[b226159] [CLI][PFCWD] Fix issue with specifying ports in pfcwd start on masic platforms (sonic-net#1203)
[40377d3] [chassis]: Configure and show for platform chassis_modules (sonic-net#1145)
[d5eb2f8] [consutil][connect] Remove root need from connect line command (sonic-net#1225)
[6cbec6b] [multi-ASIC] CRM show/config commands changes for multi-asic (sonic-net#1127)

Co-authored-by: dgsudharsan <[email protected]>
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@smaheshm
[CLI][PFCWD] Fix issue with specifying ports in pfcwd start on masic …
b226159 
…platforms (sonic-net#1203)

When ports are specified as option to 'pfcwd start', port validation fails on multi ASIC platform as the validation logic is executed on each ASIC namespace. Validation for valid ports fails as the port exits in only one namespace and not in others.

Changed logic to perform port validation after collecting ports from all namespaces. If port validation fails there is no config change on other valid ports
richardyu-ms added a commit to richardyu-ms/sonic-buildimage that referenced this pull request Feb 8, 2023
@richardyu-ms
[202205][sairedis]advance sairedis head
1a33ccd 
Include commit
- 939c14b | [Submodule][upgrade]Upgrade SAI submodule (sonic-net#1203)

updates from SAI repo
- 0031470 | improve enum values integration check (sonic-net#1727) (sonic-net#1737)
- 4f11c7e | Enable github code scanning to replace LGTM. (sonic-net#1709)

Signed-off-by: richardyu-ms <[email protected]>
@richardyu-ms richardyu-ms mentioned this pull request Feb 8, 2023
Closed
8 tasks
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Feb 9, 2023
@yxieca
[202205][linkmgrd][utilities][swss][swss-common][sairedis][platform-d…
bcdb2f6 
…aemons] advance submodule head

linkmgrd:
* e191338 2023-02-10 | Fix the warning of unused variables (sonic-net#167) (HEAD -> 202205) [Longxiang Lyu]

utilities:
* 2c933b0a 2023-02-07 | [sai_failure_dump]Invoking dump during SAI failure (sonic-net#2633) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam]
* e949f318 2023-02-07 | [show] add support for gRPC show commands for `active-active` (sonic-net#2629) [vdahiya12]
* 77723927 2023-01-30 | Fixed admin state config CLI for Backport interfaces (sonic-net#2557) [anamehra]
* 32b1d4d6 2023-02-01 | [masic support] 'show run bgp' support for multi-asic (sonic-net#2427) [wenyiz2021]
* a2252d8a 2022-10-11 | Filter port invalid MTU configuration (sonic-net#2378) [pettershao-ragilenetworks]
* 0ffb4b6a 2023-02-09 | Add Transceiver PM basic CLI support to show output from TRANSCEIVER_PM table for ZR (sonic-net#2655) (github/202205) [longhuan-cisco]
* 496a0774 2023-02-09 | Add asic id for linecards so "show fabric counters queue/port" can work for single chip systems (sonic-net#2656) [jfeng-arista]
* 2591e8b5 2023-02-03 | multi asic support for show queue counter (sonic-net#2647) [zhixzhu]

swss:
* e0373a4 2023-02-07 | [autoneg]Fixing adv interface types to be set when AN is disabled (sonic-net#2638) (HEAD -> 202205, github/202205) [Sudharsan Dhamal Gopalarathnam]
* 62a09a0 2023-02-09 | [sai_failure_dump]Invoking dump during SAI failure (sonic-net#2644) (sonic-net#2661) [Sudharsan Dhamal Gopalarathnam]
* 076f63e 2023-02-08 | [202205] Revert "Revert "[voq][chassis]Add show fabric counters port/queue commands (sonic-net#2522)" (sonic-net#2612)" (sonic-net#2655) [kenneth-arista]
* a35e074 2023-02-06 | [202205][voq][chassis] Remove created ports from the default vlan. (sonic-net#2651) [arista-nwolfe]

swss-common:
* b9d4284 2023-02-08 | [202205] Fix epoll and socket resource leak issue. (sonic-net#651) (sonic-net#741) (github/202205) [Kevin Petremann]

sairedis:
* 9d8e731 2023-02-08 | [Mellanox] Enable DSCP remapping by using SAI attribute (sonic-net#1188) (HEAD -> 202205, github/202205) [Stephen Sun]
* 272a8bd 2023-02-10 | Fixing race condition for rif counters sonic-net#1136 (sonic-net#1202) [Suman Kumar]
* 211365a 2023-02-08 | [202205][submodule][SAI]Advance SAI header (sonic-net#1207) [Richard.Yu]
* 939c14b 2023-02-08 | [Submodule][upgrade]Upgrade SAI submodule (sonic-net#1203) [Richard.Yu]

platform-daemons:
* e5ccd40 2022-10-03 | [ycabled] fix naming error for error condition for CLI handling (sonic-net#302) (HEAD -> 202205, github/202205) [vdahiya12]
* cdd354d 2022-09-29 | [ycabled] add some exception catching logic to some vendor specific API's (sonic-net#301) [vdahiya12]
* cf58c08 2023-02-01 | Chassisd do an explicit stop of the config_manager (sonic-net#328) (sonic-net#336) [judyjoseph]

Signed-off-by: Ying Xie <[email protected]>
@yxieca yxieca mentioned this pull request Feb 9, 2023
Merged
8 tasks
yxieca added a commit that referenced this pull request Feb 10, 2023
@yxieca
[202205][linkmgrd][utilities][swss][swss-common][sairedis][platform-d…
5e52b92 
…aemons] advance submodule head (#13755)

linkmgrd:
* e191338 2023-02-10 | Fix the warning of unused variables (#167) (HEAD -> 202205) [Longxiang Lyu]

utilities:
* 2c933b0a 2023-02-07 | [sai_failure_dump]Invoking dump during SAI failure (#2633) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam]
* e949f318 2023-02-07 | [show] add support for gRPC show commands for `active-active` (#2629) [vdahiya12]
* 77723927 2023-01-30 | Fixed admin state config CLI for Backport interfaces (#2557) [anamehra]
* 32b1d4d6 2023-02-01 | [masic support] 'show run bgp' support for multi-asic (#2427) [wenyiz2021]
* a2252d8a 2022-10-11 | Filter port invalid MTU configuration (#2378) [pettershao-ragilenetworks]
* 0ffb4b6a 2023-02-09 | Add Transceiver PM basic CLI support to show output from TRANSCEIVER_PM table for ZR (#2655) (github/202205) [longhuan-cisco]
* 496a0774 2023-02-09 | Add asic id for linecards so "show fabric counters queue/port" can work for single chip systems (#2656) [jfeng-arista]
* 2591e8b5 2023-02-03 | multi asic support for show queue counter (#2647) [zhixzhu]

swss:
* e0373a4 2023-02-07 | [autoneg]Fixing adv interface types to be set when AN is disabled (#2638) (HEAD -> 202205, github/202205) [Sudharsan Dhamal Gopalarathnam]
* 62a09a0 2023-02-09 | [sai_failure_dump]Invoking dump during SAI failure (#2644) (#2661) [Sudharsan Dhamal Gopalarathnam]
* 076f63e 2023-02-08 | [202205] Revert "Revert "[voq][chassis]Add show fabric counters port/queue commands (#2522)" (#2612)" (#2655) [kenneth-arista]
* a35e074 2023-02-06 | [202205][voq][chassis] Remove created ports from the default vlan. (#2651) [arista-nwolfe]

swss-common:
* b9d4284 2023-02-08 | [202205] Fix epoll and socket resource leak issue. (#651) (#741) (github/202205) [Kevin Petremann]

sairedis:
* 9d8e731 2023-02-08 | [Mellanox] Enable DSCP remapping by using SAI attribute (#1188) (HEAD -> 202205, github/202205) [Stephen Sun]
* 272a8bd 2023-02-10 | Fixing race condition for rif counters #1136 (#1202) [Suman Kumar]
* 211365a 2023-02-08 | [202205][submodule][SAI]Advance SAI header (#1207) [Richard.Yu]
* 939c14b 2023-02-08 | [Submodule][upgrade]Upgrade SAI submodule (#1203) [Richard.Yu]

platform-daemons:
* e5ccd40 2022-10-03 | [ycabled] fix naming error for error condition for CLI handling (#302) (HEAD -> 202205, github/202205) [vdahiya12]
* cdd354d 2022-09-29 | [ycabled] add some exception catching logic to some vendor specific API's (#301) [vdahiya12]
* cf58c08 2023-02-01 | Chassisd do an explicit stop of the config_manager (#328) (#336) [judyjoseph]

Signed-off-by: Ying Xie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleveque jleveque jleveque approved these changes

Assignees
No one assigned
Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lguohan @jleveque