Skip to content

MDEV-37092 galera_new_cluster installed under WITH_WSREP=OFF #4151

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
Open
wants to merge 1 commit into
base: 11.8
Choose a base branch
from
Open

MDEV-37092 galera_new_cluster installed under WITH_WSREP=OFF #4151

wants to merge 1 commit into from

Conversation

grooverdan
Copy link
Member

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

Description

galera_new_cluster is a script intended solely for use with galera and shouldn't be installed unless WITH_WSREP=ON.

Thanks Michal Schorm for the bug report.

Release Notes

per jira issue.

How can this PR be tested?

compile WITH_WSREP=OFF

If the changes are not amenable to automated testing, please explain why not and carefully describe how to test manually.

Basing the PR against the correct MariaDB version

  • 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.

PR quality check

  • 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.

@grooverdan grooverdan added the MariaDB Foundation Pull requests created by MariaDB Foundation label Jun 27, 2025
janlindstrom
janlindstrom requested changes Jun 27, 2025
View reviewed changes
Copy link
Contributor

@janlindstrom janlindstrom left a comment

Choose a reason for hiding this comment

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

LGTM, but you could have used 10.6 branch.

@grooverdan
Copy link
Member Author

grooverdan commented Jun 27, 2025 •
edited
Loading

The 10.6 and 10.11, and 11.4 branch have the same effect with it under cmake/systemd.cmake

        IF(WITH_WSREP)
          SET(SYSTEMD_SCRIPTS ${SYSTEMD_SCRIPTS} galera_new_cluster galera_recovery)
        ENDIF()

@grooverdan
MDEV-37092 galera_new_cluster installed under WITH_WSREP=OFF
93bab0b 
galera_new_cluster is a script intended solely for use with galera
and shouldn't be installed unless WITH_WSREP=ON.

In 11.6 the installation became part of scripts/CMakeList.txt
and no-longer had a WITH_WSREP=ON condition around installing this file.
The galera_new_cluster in systemd.cmake had no effect as the
script is a generated file and not in the source directory.

Changes:

The scripts/CMakeList.txt has a condition WITH_WSREP=ON for installing
the galera_new_cluster script.

The legacy reference in cmake/systemd.cmake is removed.

Thanks Michal Schorm for the bug report.
@grooverdan grooverdan requested a review from janlindstrom July 4, 2025 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janlindstrom janlindstrom Awaiting requested review from janlindstrom

Assignees
No one assigned
Labels
MariaDB Foundation Pull requests created by MariaDB Foundation
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@grooverdan @janlindstrom