[dhcp_relay]: Check whether device requires DHCP relay upon docker start #371

jleveque · 2017-03-03T18:54:06Z

If not, log a message and exit docker. Other conditions can be added in the future as needed.

With OneImage, all dockers must be deployed, but DHCP relay may not be needed. It's cleaner to have docker exit than to continue running and serving no purpose. Log message is helpful to understand why.

Signed-off-by: Joe LeVeque jolevequ@microsoft.com

stcheng · 2017-03-04T00:04:54Z

dockers/docker-dhcp-relay/config.sh

+DEVICE_ROLE=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_devices['$MINIGRAPH_HOSTNAME']['type']"`
+
+if [ $DEVICE_ROLE != "ToRRouter" ]; then
+    echo "Device does not require DHCP relay. docker-dhcp-relay exiting..."


if the script exits here, will the docker exits?

I think if you return a nonzero value, it will.

Taoyu is correct. I have tested the behavior, and exiting with a nonzero value will cause the docker container to exit, whereas exiting with a return value of 0 will cause the container to keep running.

taoyl-ms · 2017-03-04T03:16:59Z

dockers/docker-dhcp-relay/config.sh

-sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/dhcp_relay.yml -t /usr/share/sonic/templates/isc-dhcp-relay.j2 > /etc/default/isc-dhcp-relay
+MINIGRAPH_HOSTNAME=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_hostname"`
+DEVICE_ROLE=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_devices['$MINIGRAPH_HOSTNAME']['type']"`
+


you can directly use -v "minigraph_devices[minigraph_hostname]['type']", don't need to call it twice.

Good to know. Simplified in 0fdd3c8. Thanks!

lguohan · 2017-03-07T08:11:52Z

should we do this in dhcprelay service unit file? if we detect it is not tor, we do not even start the container.

jleveque · 2017-03-09T00:26:34Z

It would be cleaner to have this logic outside the container, but systemd provides a limited set of conditionals to work with in the unit files, none of which I'm aware of allow us to directly check the device type from the minigraph. Do you have an idea in mind?

taoyl-ms · 2017-03-17T22:45:09Z

How about doing it in /usr/bin/dhcp_relay.sh instead of in the service definition file? You can check minigraph there and if the switch is not ToR you just do nothing and tell systemd you succeeded to start the service.

jleveque · 2017-03-17T23:43:06Z

Thanks for the idea, but after speaking with Guohan and Shuotian, we decided the service shouldn't even be started if not needed. This also applies to teamd, and may apply to other services in the future. I will soon submit another solution that disables the services on first boot.

taoyl-ms · 2017-03-18T02:25:45Z

If you are going to disable the service on first boot, please make sure your disabling happens after update_graph service so we don't mistakenly disable it based on a default graph.

jleveque · 2017-03-18T21:14:00Z

Thanks for the heads-up! :)

jleveque · 2017-03-23T00:44:57Z

Abandoning in favor of #427

sairedis * 248a095 2018-11-07 | Add best candidate search for acl table (sonic-net#371) [Kamil Cudnik] * d1e26c3 2018-11-07 | Ignore order when compare QOS MAP list entries (sonic-net#372) [Kamil Cudnik] * e8df347 2018-11-05 | Add best candidate search for router interface using tunnel term tabl… (sonic-net#370) [Kamil Cudnik] * 8ae173b 2018-11-01 | Refactor saidump graph generator (sonic-net#367) [Kamil Cudnik] common * 2a37c5c 2018-11-07 | Add system warm-reboot check in WarmRestart class (sonic-net#246) (HEAD, origin/master, origin/HEAD) [zhenggen-xu] * fb082b5 2018-11-06 | Fix ProducerStateTable::clear() to clear StateHash properly (sonic-net#244) [Taoyu Li] * 0ee636b 2018-11-05 | Remove local googletest submodule and link with system gtest (sonic-net#245) [Qi Luo] * b56ffba 2018-10-31 | Add NEIGH_RESTORE_TABLE in stateDB (sonic-net#243) [zhenggen-xu] * b58c69d 2018-10-28 | swss-common: add op 'create' case to avoid flush immediately (sonic-net#219) [Dong Zhang] swss * afdcf34 2018-11-12 | Support neighsyncd system warmreboot. (sonic-net#661) (HEAD, origin/master, origin/HEAD) [zhenggen-xu] * f380685 2018-11-09 | Routing-stack warm-reboot feature. (sonic-net#602) [Rodny Molina] * 9fbcb60 2018-11-09 | Add warm-reboot mode for teammgrd (sonic-net#678) [pavel-shirshov] * 8c60787 2018-11-09 | Don't add loopback ip2me route again if already configured (sonic-net#656) [Jipan Yang] * 6eb1613 2018-11-08 | [test]: Add interface IPv6 add/remove test case (sonic-net#677) [Shuotian Cheng] * 5de5054 2018-11-07 | [vrfmgrd]: Support VNET setting (sonic-net#657) [Marian Pritsak] * f666011 2018-11-06 | [teammgrd]: Add retry logic when enslaving member port into team (sonic-net#669) [Shuotian Cheng] * 36e304d 2018-11-05 | [vstest]: print output when runcmd returns error (sonic-net#672) [lguohan] * aede5d4 2018-11-05 | [test]: Fix clean up wrong interface IP (sonic-net#673) [Shuotian Cheng] * aeceaca 2018-11-02 | [portmgrd]: portmgrd shall be responsible for all ports update (sonic-net#668) [Shuotian Cheng] * 5796e54 2018-11-02 | Orchagent warm restart data restore requires three iterations (sonic-net#670) [Jipan Yang] * 15a2299 2018-11-01 | [vlanmgrd]: Do not bring up VLAN members by default (sonic-net#667) [Shuotian Cheng] * 44a4460 2018-11-01 | [test]: Clean up LAGs after finishing the test (sonic-net#666) [Shuotian Cheng] Signed-off-by: Guohan Lu <gulv@microsoft.com>

sairedis * 248a095 2018-11-07 | Add best candidate search for acl table (#371) [Kamil Cudnik] * d1e26c3 2018-11-07 | Ignore order when compare QOS MAP list entries (#372) [Kamil Cudnik] * e8df347 2018-11-05 | Add best candidate search for router interface using tunnel term tabl… (#370) [Kamil Cudnik] * 8ae173b 2018-11-01 | Refactor saidump graph generator (#367) [Kamil Cudnik] common * 2a37c5c 2018-11-07 | Add system warm-reboot check in WarmRestart class (#246) (HEAD, origin/master, origin/HEAD) [zhenggen-xu] * fb082b5 2018-11-06 | Fix ProducerStateTable::clear() to clear StateHash properly (#244) [Taoyu Li] * 0ee636b 2018-11-05 | Remove local googletest submodule and link with system gtest (#245) [Qi Luo] * b56ffba 2018-10-31 | Add NEIGH_RESTORE_TABLE in stateDB (#243) [zhenggen-xu] * b58c69d 2018-10-28 | swss-common: add op 'create' case to avoid flush immediately (#219) [Dong Zhang] swss * afdcf34 2018-11-12 | Support neighsyncd system warmreboot. (#661) (HEAD, origin/master, origin/HEAD) [zhenggen-xu] * f380685 2018-11-09 | Routing-stack warm-reboot feature. (#602) [Rodny Molina] * 9fbcb60 2018-11-09 | Add warm-reboot mode for teammgrd (#678) [pavel-shirshov] * 8c60787 2018-11-09 | Don't add loopback ip2me route again if already configured (#656) [Jipan Yang] * 6eb1613 2018-11-08 | [test]: Add interface IPv6 add/remove test case (#677) [Shuotian Cheng] * 5de5054 2018-11-07 | [vrfmgrd]: Support VNET setting (#657) [Marian Pritsak] * f666011 2018-11-06 | [teammgrd]: Add retry logic when enslaving member port into team (#669) [Shuotian Cheng] * 36e304d 2018-11-05 | [vstest]: print output when runcmd returns error (#672) [lguohan] * aede5d4 2018-11-05 | [test]: Fix clean up wrong interface IP (#673) [Shuotian Cheng] * aeceaca 2018-11-02 | [portmgrd]: portmgrd shall be responsible for all ports update (#668) [Shuotian Cheng] * 5796e54 2018-11-02 | Orchagent warm restart data restore requires three iterations (#670) [Jipan Yang] * 15a2299 2018-11-01 | [vlanmgrd]: Do not bring up VLAN members by default (#667) [Shuotian Cheng] * 44a4460 2018-11-01 | [test]: Clean up LAGs after finishing the test (#666) [Shuotian Cheng] Signed-off-by: Guohan Lu <gulv@microsoft.com>

…t#358)" (sonic-net#371) This reverts commit 8764902.

…onic-net#358)" (sonic-net#371)" (sonic-net#388) This reverts commit 8fc09d0.

… automatically (#15133) src/sonic-platform-common * ff72811 - (HEAD -> 202205, origin/202205) Fix issue '<' not supported between instances of 'NoneType' and 'int' (#371) (5 hours ago) [Junchao-Mellanox] * f2a419d - Render Media lane and Media assignment options info from Application Code (#368) (8 hours ago) [rajann] * d8bad10 - Retrieve FW version using CDB command for CMIS transceivers + handle single bank FW versioning (#372) (8 hours ago) [mihirpat1]

…D automatically (#15344) src/sonic-platform-daemons * 1537d6a - (HEAD -> 202205, origin/202205) [dualtor] Fix command `show mux status` (#371) (2 minutes ago) [Longxiang Lyu]

…D automatically (#15366) src/sonic-platform-daemons * 18815c7 - (HEAD -> 202205, origin/202205) Revert "[ycabled] refactor code for onboarding async client changes;refactor (#355)" (3 minutes ago) [Ying Xie] * 5324554 - Revert "add async notification support in active-active topo; refactor code for ycable tasks for change events (#327)" (3 minutes ago) [Ying Xie] * cbbe2b5 - Revert "[ycabled] fix bug for `show mux status` delayed response (#364)" (3 minutes ago) [Ying Xie] * 9746709 - Revert "[dualtor] Fix command `show mux status` (#371)" (3 minutes ago) [Ying Xie] * 551ab3c - Revert "[ycabled] correct the wrong function call for 'config hwmode state' (#372)" (3 minutes ago) [Ying Xie]

…D automatically (#15749) src/sonic-platform-daemons * 112656c - (HEAD -> 202205, origin/202205) [ycabled][active-active] no initialize Async Client, when no active-active cable type; fix names for all ycabled threads (#373) (4 minutes ago) [vdahiya12] * e325d5a - Revert "Revert "[ycabled] correct the wrong function call for 'config hwmode state' (#372)"" (4 minutes ago) [Ying Xie] * ddabca1 - Revert "Revert "[dualtor] Fix command `show mux status` (#371)"" (4 minutes ago) [Ying Xie] * 28918da - Revert "Revert "[ycabled] fix bug for `show mux status` delayed response (#364)"" (4 minutes ago) [Ying Xie] * a849de9 - Revert "Revert "add async notification support in active-active topo; refactor code for ycable tasks for change events (#327)"" (4 minutes ago) [Ying Xie] * cf1e73a - Revert "Revert "[ycabled] refactor code for onboarding async client changes;refactor (#355)"" (4 minutes ago) [Ying Xie]

…tomatically (#18433) #### Why I did it src/sonic-linux-kernel ``` * 59e5ea1 - (HEAD -> 202311, origin/202311) Disable small sector erase size for UBIFS on flash (#382) (4 hours ago) [Mridul Bajpai] * ed95e5d - [202311] Dynamic write timeout support for optoe driver (#371) (8 hours ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205

stcheng reviewed Mar 4, 2017

View reviewed changes

taoyl-ms reviewed Mar 4, 2017

View reviewed changes

jleveque added 2 commits March 6, 2017 20:51

Check if device requires DHCP relay upon docker start

feba6ae

Remove unnecessary call to sonic-cfggen

0fdd3c8

stcheng assigned jleveque Mar 17, 2017

stcheng added the Enhancement ➕ label Mar 17, 2017

stcheng force-pushed the master branch 2 times, most recently from b9ca7e2 to 42ae02b Compare March 22, 2017 20:29

jleveque closed this Mar 23, 2017

jleveque deleted the dhcp_relay branch March 30, 2017 01:28

lguohan mentioned this pull request Nov 12, 2018

[submodules]: update swss/sairedis/common for warmboot #2248

Merged

madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020

Revert "Update port and queue stat counters by Flex counter (sonic-ne…

8fc09d0

…t#358)" (sonic-net#371) This reverts commit 8764902.

madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020

Revert "Revert "Update port and queue stat counters by Flex counter (s…

2a7d2a7

…onic-net#358)" (sonic-net#371)" (sonic-net#388) This reverts commit 8fc09d0.

dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020

Add best candidate search for acl table (sonic-net#371)

248a095

mlok-nokia pushed a commit to mlok-nokia/sonic-buildimage that referenced this pull request Jun 5, 2024

Merge pull request sonic-net#371 from mssonicbld/sonicbld/202205-merge

6f53e91

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[dhcp_relay]: Check whether device requires DHCP relay upon docker start #371

[dhcp_relay]: Check whether device requires DHCP relay upon docker start #371

jleveque commented Mar 3, 2017 •

edited

Loading

stcheng Mar 4, 2017

taoyl-ms Mar 4, 2017

jleveque Mar 6, 2017

taoyl-ms Mar 4, 2017

jleveque Mar 6, 2017 •

edited

Loading

lguohan commented Mar 7, 2017

jleveque commented Mar 9, 2017

taoyl-ms commented Mar 17, 2017 •

edited

Loading

jleveque commented Mar 17, 2017

taoyl-ms commented Mar 18, 2017

jleveque commented Mar 18, 2017

jleveque commented Mar 23, 2017

[dhcp_relay]: Check whether device requires DHCP relay upon docker start #371

[dhcp_relay]: Check whether device requires DHCP relay upon docker start #371

Conversation

jleveque commented Mar 3, 2017 • edited Loading

stcheng Mar 4, 2017

Choose a reason for hiding this comment

taoyl-ms Mar 4, 2017

Choose a reason for hiding this comment

jleveque Mar 6, 2017

Choose a reason for hiding this comment

taoyl-ms Mar 4, 2017

Choose a reason for hiding this comment

jleveque Mar 6, 2017 • edited Loading

Choose a reason for hiding this comment

lguohan commented Mar 7, 2017

jleveque commented Mar 9, 2017

taoyl-ms commented Mar 17, 2017 • edited Loading

jleveque commented Mar 17, 2017

taoyl-ms commented Mar 18, 2017

jleveque commented Mar 18, 2017

jleveque commented Mar 23, 2017

jleveque commented Mar 3, 2017 •

edited

Loading

jleveque Mar 6, 2017 •

edited

Loading

taoyl-ms commented Mar 17, 2017 •

edited

Loading