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

Fix broken runtime config sync #10126

Merged
merged 5 commits into from
Sep 20, 2024
Merged

Fix broken runtime config sync #10126

merged 5 commits into from
Sep 20, 2024
+115 −10

Conversation

Al2Klimov
Copy link
Member

@Al2Klimov Al2Klimov commented Aug 21, 2024 •
edited
Loading

@cla-bot cla-bot bot added the cla/signed label Aug 21, 2024
@icinga-probot icinga-probot bot added this to the 2.13.10 milestone Aug 21, 2024
@icinga-probot icinga-probot bot added area/api REST API area/checks Check execution and results area/configuration DSL, parser, compiler, error handling area/distributed Distributed monitoring (master, satellites, clients) area/runtime Downtimes, comments, dependencies, events blocker Blocks a release or needs immediate attention bug Something isn't working ref/NC labels Aug 21, 2024
@Al2Klimov Al2Klimov force-pushed the broken-runtime-config-sync-2.13 branch from 346d0c1 to cf4a931 Compare August 21, 2024 14:14
@Al2Klimov Al2Klimov changed the title Disallow config modifications via API during reload, fix broken runtime config sync Fix broken runtime config sync Aug 21, 2024
@Al2Klimov Al2Klimov force-pushed the broken-runtime-config-sync-2.13 branch from cf4a931 to dd5aa2c Compare September 17, 2024 14:45
@yhabteab
Copy link
Member

I wouldn't backport this PR to 2.13.x, I mean it's not already backported for a reason, and yet backporting it purely due to a cherry pick dependency doesn't make sense to me. You can easily fix the cherry pick conflicts without having to backport this PR.

@Al2Klimov
Copy link
Member Author

The part I've backported just defines a few classes, this won't break anything 100%.

@yhabteab
Copy link
Member

The part I've backported just defines a few classes, this won't break anything 100%.

But why do you need to backport the classes in the first place then? As I said, the cherry pick conflict is pretty trivial and there is no need to backport something that isn't going to be used anyway.

@Al2Klimov Al2Klimov force-pushed the broken-runtime-config-sync-2.13 branch from dd5aa2c to 80e8c16 Compare September 20, 2024 09:08
yhabteab
yhabteab approved these changes Sep 20, 2024
View reviewed changes
Copy link
Member

@yhabteab yhabteab left a comment

Choose a reason for hiding this comment

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

Please adjust the PR description accordingly!

@yhabteab yhabteab merged commit 377fd59 into support/2.13 Sep 20, 2024
26 checks passed
@yhabteab yhabteab deleted the broken-runtime-config-sync-2.13 branch September 20, 2024 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yhabteab yhabteab yhabteab approved these changes

Assignees
No one assigned
Labels
area/api REST API area/checks Check execution and results area/configuration DSL, parser, compiler, error handling area/distributed Distributed monitoring (master, satellites, clients) area/runtime Downtimes, comments, dependencies, events blocker Blocks a release or needs immediate attention bug Something isn't working cla/signed ref/NC
Projects
None yet
Milestone
2.13.10
Development

Successfully merging this pull request may close these issues.
2 participants
@Al2Klimov @yhabteab