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

rpl_start/stop_server.inc fixes #3849

Draft
wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Draft

Conversation

ParadoxV5
Copy link
Contributor

@ParadoxV5 ParadoxV5 commented Feb 21, 2025

  • The Jira issue number for this PR is: MDEV-______

Description

  • rpl_stop_server.inc: re. “can’t use begin/end_include_file”, (re)define $_include_file_depth= 0 in case this is the first --source in a rpl_init.inc-less setup (e.g., multi_source.*)
  • rpl_start_server.inc: move the end_include_file.inc call out of if (!$rpl_server_error) to always close the begin_include_file.inc
  • rpl_reconnect.inc (called by rpl_start_server.inc): skip reconnecting ‘master/slave’ aliases of server_*to lift its practical requirement ofmaster-slave.inc(It failed with “no connection named master/slave” for even arpl_init.incsetup, let alonerpl_init`-less.)

Release Notes

Do our users even use our include/*.incs?

How can this PR be tested?

  • Do we need a test for a test?

PR quality check

  • This is a new feature or a refactoring, and the PR is based against the main branch.
  • This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.
  • I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
  • For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

* `rpl_stop_server.inc`: re. “can’t use `begin`/`end_include_file”,
  (re)define `$_include_file_depth= 0` in case this is the first
  `--source` in a `rpl_init.inc`-less setup (e.g., `multi_source.*`)
* `rpl_start_server.inc`: move the `end_include_file.inc` call out of
  `if (!$rpl_server_error)` to always close the `begin_include_file.inc`
* `rpl_reconnect.inc` (called by rpl_start_server.inc`):
  skip reconnecting ‘master/slave’ aliases of `server_*` to lift its
  practical requirement of `master-slave.inc`
  (It failed with “no connection named master/slave”
   for even a `rpl_init.inc` setup, let alone `rpl_init`-less.)
@ParadoxV5 ParadoxV5 requested review from knielsen and removed request for knielsen February 21, 2025 05:29
@ParadoxV5 ParadoxV5 marked this pull request as draft February 21, 2025 17:42
@ParadoxV5
Copy link
Contributor Author

So there are no connection aliases, only duplicate connections to the same set of servers?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

1 participant