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.

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

[202205] Fix issue: set has_timer attribute to true for platform monitor service (#15816) #15624

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

Junchao-Mellanox
Copy link
Collaborator

@Junchao-Mellanox Junchao-Mellanox commented Jun 26, 2023

Backport PR #15816

Why I did it

There is a redundant line in init_cfg.json.j2. It would cause pmon service always has "has_timer=False". However, we know that PMON has a timer now. So, I try to fix it here.

Work item tracking
  • Microsoft ADO (number only):

How I did it

Remove the redundant line

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211

Tested branch (Please provide the tested image version)

  • 202205-fix-pmon-timer-build.1-b35f5b882

Description for the changelog

Link to config_db schema for YANG module changes

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

@@ -36,7 +36,6 @@
("database", "always_enabled", false, "always_enabled"),
("lldp", "enabled", true, "enabled"),
("pmon", "enabled", true, "enabled"),
("pmon", "enabled", false, "enabled"),
Copy link
Contributor

Choose a reason for hiding this comment

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

@Junchao-Mellanox why NOT remove ("pmon", "enabled", true, "enabled")? and keep it same as previous

        "pmon": {
            "state": "enabled",
            "has_timer": false,
            "has_global_scope": true,
            "has_per_asic_scope": "False",
            "auto_restart": "enabled",
            "high_mem_alert": "disabled"
        },

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We will use a timer to start pmon in fastreboot/warmreboot flow. By doing this, we would save fast reboot traffic down time.

@prgeor
Copy link
Contributor

prgeor commented Jun 28, 2023

@Junchao-Mellanox please raise a PR for master and let it be cherry-picked to 202205. @yxieca FYI

@Junchao-Mellanox
Copy link
Collaborator Author

@Junchao-Mellanox please raise a PR for master and let it be cherry-picked to 202205. @yxieca FYI

Hi @prgeor , this is the PR for master, and it cannot be cherry-picked to 202205 cleanly, so I added this PR for 202205.

@liat-grozovik
Copy link
Collaborator

@prgeor can you please review following comments?
@yxieca please merge once approved.

@yxieca
Copy link
Contributor

yxieca commented Jul 6, 2023

@Junchao-Mellanox please raise a PR for master and let it be cherry-picked to 202205. @yxieca FYI

Hi @prgeor , this is the PR for master, and it cannot be cherry-picked to 202205 cleanly, so I added this PR for 202205.

@Junchao-Mellanox can you mention the master branch PR in this PR for record?

@Junchao-Mellanox
Copy link
Collaborator Author

Junchao-Mellanox commented Jul 7, 2023

Master PR: #15816

@Junchao-Mellanox
Copy link
Collaborator Author

Junchao-Mellanox commented Jul 13, 2023

Hi @yxieca , since we already have #15334 in master/202211/202305 which makes PMON delayed by an event driven mechanism , i have closed the master PR. I created a new master PR only remove the redundant line. I suppose we still need current PR in 202205 because we are not going to cherry-pick 15334 to 202205.

@liat-grozovik liat-grozovik changed the title [202205] Fix issue: set has_timer attribute to true for platform monitor service [202205] Fix issue: set has_timer attribute to true for platform monitor service (#15816) Jul 14, 2023
@liat-grozovik
Copy link
Collaborator

@yxieca is it ok to be merged now?

@yxieca
Copy link
Contributor

yxieca commented Jul 14, 2023

@yxieca is it ok to be merged now?

@prgeor can you chime ine?

@Junchao-Mellanox
Copy link
Collaborator Author

Hi @prgeor , the master PR has been merged: #15816. As there is not clean cherry-pick, could you please also approve this PR?

@liat-grozovik
Copy link
Collaborator

@prgeor kindly reminder
@yxieca recommend to merge to 202205 as a bug fix

@Junchao-Mellanox
Copy link
Collaborator Author

Hi @yxieca , could you please help merge this?

@yxieca yxieca merged commit 874ca68 into sonic-net:202205 Sep 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants