Move eventd enabled check from build time to runtime #20248

zbud-msft · 2024-09-12T21:34:48Z

Why I did it

Work item tracking

Microsoft ADO (number only):28728116

How I did it

Remove eventd enabled/slim image check from Dockerfile (build time). As part of Dockerfile expose eventd_enabled and slim image flags to ENV which will be used docker_init/start.sh to check if rsyslog plugin should be moved to rsyslog.d

How to verify it

Manual test/pipeline

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

slave.mk

dockers/docker-dhcp-relay/start.sh

dockers/docker-dhcp-relay/Dockerfile.j2

dockers/docker-dhcp-relay/start.sh

dockers/docker-fpm-frr/docker_init.sh

dockers/docker-orchagent/docker-init.j2

qiluo-msft · 2024-09-17T18:13:29Z

dockers/docker-dhcp-relay/docker_init.sh

@@ -21,4 +21,6 @@ chmod +x /usr/bin/wait_for_intf.sh
 # The docker container should start this script as PID 1, so now that supervisord is
 # properly configured, we exec /usr/local/bin/supervisord so that it runs as PID 1 for the
 # duration of the container's lifetime
+j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/events_info.json  > /etc/rsyslog.d/dhcp_relay_events.conf


ENVIRONMENT

offline discussed, need to check ConfigDB flag, not env var. #Closed

qiluo-msft

As comments

StormLiangMS · 2024-09-25T01:17:13Z

hi @yxieca could you cherry pick?

StormLiangMS · 2024-09-25T01:19:19Z

hi @zbud-msft do we need this one for 202405?

bingwang-ms · 2024-09-25T22:02:29Z

@zbud-msft, @qiluo-msft We are only cherry-pick bug fix for 202405 branch. This seems to be an enhancement to me. Please clarify if this is a must-have for 202405 branch. Thanks!

## How I did it Remove eventd enabled/slim image check from Dockerfile (build time). As part of Dockerfile expose eventd_enabled and slim image flags to ENV which will be used docker_init/start.sh to check if rsyslog plugin should be moved to rsyslog.d #### How to verify it Manual test/pipeline

mssonicbld · 2024-09-25T22:41:47Z

Cherry-pick PR to 202405: #20351

## How I did it Remove eventd enabled/slim image check from Dockerfile (build time). As part of Dockerfile expose eventd_enabled and slim image flags to ENV which will be used docker_init/start.sh to check if rsyslog plugin should be moved to rsyslog.d #### How to verify it Manual test/pipeline

stepanblyschak

We notice few issues in 202405 regression, @zbud-msft @qiluo-msft Could you please have a look?

stepanblyschak · 2024-10-17T15:04:42Z

files/build_templates/docker_image_ctl.j2

+{%- elif docker_container_name == "eventd" %}
+    export EVENTD_STATE=$(sonic-db-cli -s CONFIG_DB HGET 'FEATURE|eventd' 'state')
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/events_info.json  > /etc/rsyslog.d/host_events.conf
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/syncd_events_info.json  > /etc/rsyslog.d/syncd_events.conf


@zbud-msft @qiluo-msft These commands are CPU heavy as well as those added in docker-init.j2 for multiple containers.
Any performance measurements done w.r.t fast-reboot, warm-reboot to understand the impact?
Any idea how to achieve same functionality without introducing additional CPU overhead during init?

stepanblyschak · 2024-10-17T15:05:23Z

dockers/docker-dhcp-relay/docker_init.sh

@@ -21,4 +21,7 @@ chmod +x /usr/bin/wait_for_intf.sh
 # The docker container should start this script as PID 1, so now that supervisord is
 # properly configured, we exec /usr/local/bin/supervisord so that it runs as PID 1 for the
 # duration of the container's lifetime
+export EVENTD_STATE=$(sonic-db-cli -s CONFIG_DB HGET 'FEATURE|eventd' 'state')
+j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/events_info.json  > /etc/rsyslog.d/dhcp_relay_events.conf


@zbud-msft What if eventd state changes in runtime ? Is this flow unsupported ?

stepanblyschak · 2024-10-17T15:07:21Z

files/build_templates/docker_image_ctl.j2

+    export EVENTD_STATE=$(sonic-db-cli -s CONFIG_DB HGET 'FEATURE|eventd' 'state')
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/events_info.json  > /etc/rsyslog.d/host_events.conf
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/syncd_events_info.json  > /etc/rsyslog.d/syncd_events.conf
+    systemctl restart rsyslog


@zbud-msft @qiluo-msft In our testing this introduces a race between eventd's postStartAction and rsyslog-config service. rsyslog-config.service will overwrite /etc/rsyslog.conf and when at the same time we restart rsyslogd we'll get rsyslogd exited and then eventd service start failure.

stepanblyschak · 2024-10-17T15:07:46Z

files/build_templates/docker_image_ctl.j2

+    export EVENTD_STATE=$(sonic-db-cli -s CONFIG_DB HGET 'FEATURE|eventd' 'state')
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/events_info.json  > /etc/rsyslog.d/host_events.conf
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/syncd_events_info.json  > /etc/rsyslog.d/syncd_events.conf
+    systemctl restart rsyslog


In case this fails eventd docker will be still running

stepanblyschak · 2024-10-17T15:12:18Z

files/build_templates/docker_image_ctl.j2

+    export EVENTD_STATE=$(sonic-db-cli -s CONFIG_DB HGET 'FEATURE|eventd' 'state')
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/events_info.json  > /etc/rsyslog.d/host_events.conf
+    j2 -f json --import-env=ENVIRONMENT /usr/share/sonic/templates/rsyslog_plugin/rsyslog_plugin.conf.j2 /usr/share/sonic/templates/rsyslog_plugin/syncd_events_info.json  > /etc/rsyslog.d/syncd_events.conf
+    systemctl restart rsyslog


@zbud-msft @qiluo-msft We will loose syslog messages during boot up

stepanblyschak · 2024-10-18T11:51:00Z

@zbud-msft @qiluo-msft Could you please have a look - #20544 ?

## How I did it Remove eventd enabled/slim image check from Dockerfile (build time). As part of Dockerfile expose eventd_enabled and slim image flags to ENV which will be used docker_init/start.sh to check if rsyslog plugin should be moved to rsyslog.d #### How to verify it Manual test/pipeline

…et#20248)" This reverts commit 561479e.

…et#20248)" This reverts commit c5dbba3.

#20946) This reverts commit c5dbba3.

#20947) Reverts #20248 and fixes #20544 This reverts commit 561479e.

…et#20248)" (sonic-net#20947) Reverts sonic-net#20248 and fixes sonic-net#20544 This reverts commit 561479e.

zbud-msft added 4 commits September 12, 2024 21:33

Initial commit

f2ac98c

Initial commit

1591e81

Initial commit

bee0ac9

Initial commit

a952520

zbud-msft changed the title ~~[Not4Review] eventd_enabled flag at runtime~~ Create runtime flags to check if eventd enabled Sep 13, 2024

zbud-msft changed the title ~~Create runtime flags to check if eventd enabled~~ Move eventd enabled check from build time to runtime Sep 13, 2024

zbud-msft added the Request for 202311 Branch label Sep 13, 2024

zbud-msft marked this pull request as ready for review September 13, 2024 18:00

zbud-msft requested review from qiluo-msft, xumia and lguohan as code owners September 13, 2024 18:00

qiluo-msft reviewed Sep 13, 2024

View reviewed changes

slave.mk Outdated Show resolved Hide resolved

qiluo-msft reviewed Sep 13, 2024

View reviewed changes

dockers/docker-dhcp-relay/start.sh Outdated Show resolved Hide resolved

qiluo-msft reviewed Sep 13, 2024

View reviewed changes

dockers/docker-dhcp-relay/Dockerfile.j2 Outdated Show resolved Hide resolved

zbud-msft added 2 commits September 13, 2024 22:53

Address comments

f38f365

Fix Dockerfile

45cddcd

qiluo-msft reviewed Sep 16, 2024

View reviewed changes

dockers/docker-dhcp-relay/start.sh Outdated Show resolved Hide resolved

qiluo-msft reviewed Sep 16, 2024

View reviewed changes

dockers/docker-fpm-frr/docker_init.sh Outdated Show resolved Hide resolved

qiluo-msft reviewed Sep 16, 2024

View reviewed changes

dockers/docker-orchagent/docker-init.j2 Outdated Show resolved Hide resolved

yxieca added the Request for 202405 Branch label Sep 16, 2024

Address comments

2af5430

zbud-msft removed Request for 202405 Branch labels Sep 16, 2024

qiluo-msft previously approved these changes Sep 16, 2024

View reviewed changes

Fix j2

b2a5ff8

zbud-msft dismissed qiluo-msft’s stale review via b2a5ff8 September 16, 2024 23:45

zbud-msft added 2 commits September 17, 2024 00:54

Run j2 as part of docker init

b9aeb73

Copy regex to rsyslog.d

3c83844

qiluo-msft approved these changes Sep 17, 2024

View reviewed changes

qiluo-msft reviewed Sep 17, 2024

View reviewed changes

qiluo-msft requested changes Sep 17, 2024

View reviewed changes

zbud-msft added 3 commits September 17, 2024 20:47

Use config db instead of build args

41048e7

Add back line

c27d744

Fix host events

7c37ed6

qiluo-msft approved these changes Sep 19, 2024

View reviewed changes

qiluo-msft merged commit 561479e into sonic-net:master Sep 23, 2024
23 checks passed

zbud-msft added the Request for 202405 Branch label Sep 25, 2024

bingwang-ms added the Approved for 202405 Branch label Sep 25, 2024

mssonicbld mentioned this pull request Sep 25, 2024

[action] [PR:20248] Move eventd enabled check from build time to runtime (#20248) #20351

Merged

mssonicbld added the Created PR to 202405 Branch label Sep 25, 2024

mssonicbld added Included in 202405 Branch and removed Created PR to 202405 Branch labels Sep 26, 2024

stepanblyschak reviewed Oct 17, 2024

View reviewed changes

zbud-msft added a commit to zbud-msft/sonic-buildimage that referenced this pull request Nov 27, 2024

Revert "Move eventd enabled check from build time to runtime (sonic-n…

005b214

…et#20248)" This reverts commit 561479e.

zbud-msft added a commit to zbud-msft/sonic-buildimage that referenced this pull request Nov 27, 2024

Revert "Move eventd enabled check from build time to runtime (sonic-n…

197e957

…et#20248)" This reverts commit c5dbba3.

zbud-msft mentioned this pull request Nov 27, 2024

Revert "Move eventd enabled check from build time to runtime" #20947

Merged

bingwang-ms pushed a commit that referenced this pull request Dec 1, 2024

Revert "Move eventd enabled check from build time to runtime (#20248)" (

2bf3d24

#20946) This reverts commit c5dbba3.

lguohan pushed a commit that referenced this pull request Dec 4, 2024

Revert "Move eventd enabled check from build time to runtime (#20248)" (

3a09f61

#20947) Reverts #20248 and fixes #20544 This reverts commit 561479e.

wumiaont mentioned this pull request Dec 12, 2024

[eventd]: Eventd failing to start due to rsyslogd on multi-asic #20775

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move eventd enabled check from build time to runtime #20248

Move eventd enabled check from build time to runtime #20248

zbud-msft commented Sep 12, 2024 •

edited

Loading

qiluo-msft Sep 17, 2024 •

edited

Loading

qiluo-msft left a comment

StormLiangMS commented Sep 25, 2024

StormLiangMS commented Sep 25, 2024

bingwang-ms commented Sep 25, 2024

mssonicbld commented Sep 25, 2024

stepanblyschak left a comment

stepanblyschak Oct 17, 2024

stepanblyschak Oct 17, 2024

stepanblyschak Oct 17, 2024

stepanblyschak Oct 17, 2024

stepanblyschak Oct 17, 2024

stepanblyschak commented Oct 18, 2024

Move eventd enabled check from build time to runtime #20248

Move eventd enabled check from build time to runtime #20248

Conversation

zbud-msft commented Sep 12, 2024 • edited Loading

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

qiluo-msft Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

StormLiangMS commented Sep 25, 2024

StormLiangMS commented Sep 25, 2024

bingwang-ms commented Sep 25, 2024

mssonicbld commented Sep 25, 2024

stepanblyschak left a comment

Choose a reason for hiding this comment

stepanblyschak Oct 17, 2024

Choose a reason for hiding this comment

stepanblyschak Oct 17, 2024

Choose a reason for hiding this comment

stepanblyschak Oct 17, 2024

Choose a reason for hiding this comment

stepanblyschak Oct 17, 2024

Choose a reason for hiding this comment

stepanblyschak Oct 17, 2024

Choose a reason for hiding this comment

stepanblyschak commented Oct 18, 2024

zbud-msft commented Sep 12, 2024 •

edited

Loading

qiluo-msft Sep 17, 2024 •

edited

Loading