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

PS-9533 [8.0]: Introduce cmake option to enable probuilds #5514

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

inikep
Copy link
Collaborator

@inikep inikep commented Dec 4, 2024

Add WITH_PERCONA_PROBUILD cmake option that enables pro features.
ThePROBUILD cmake option is an alias for WITH_PERCONA_PROBUILD.
From source code we have to use #ifdef HAVE_PERCONA_PROBUILD for pro features.

@inikep
Copy link
Collaborator Author

inikep commented Dec 4, 2024

./bin/mysqld-debug --version
/data/mysql-server/percona-8.0-deb-gcc14-add/runtime_output_directory/mysqld-debug  Ver 8.0.40-31-pro-debug for Linux on x86_64 (Source distribution)
SELECT @@version;
@@version
8.0.40-31-pro-debug
/data/mysql-server/percona-8.0-deb-gcc14-add/runtime_output_directory/mysqld-debug --no-defaults --initialize-insecure --loose-skip-ndbcluster --tmpdir=/data/mysql-server/percona-8.0-deb-gcc14-add/mysql-test/var/tmp/ --core-file --datadir=/data/mysql-server/percona-8.0-deb-gcc14-add/mysql-test/var/data/ --secure-file-priv=/data/mysql-server/percona-8.0-deb-gcc14-add/mysql-test/var --innodb_buffer_pool_size=24M --innodb-redo-log-capacity=10M --innodb_autoextend_increment=8 --character-sets-dir=/data/mysql-server/percona-8.0/share/charsets --loose-auto_generate_certs=OFF --loose-sha256_password_auto_generate_rsa_keys=OFF --loose-caching_sha2_password_auto_generate_rsa_keys=OFF --init-file=/data/mysql-server/percona-8.0-deb-gcc14-add/mysql-test/var/tmp/bootstrap.sql
2024-12-04T11:59:53.704362Z 0 [System] [MY-013169] [Server] /data/mysql-server/percona-8.0-deb-gcc14-add/runtime_output_directory/mysqld-debug (mysqld 8.0.40-31-pro-debug) initializing of server in progress as process 727439
2024-12-04T11:59:53.728987Z 1 [System] [MY-013576] [InnoDB] InnoDB initialization has started.
2024-12-04T11:59:55.761935Z 1 [System] [MY-013577] [InnoDB] InnoDB initialization has ended.

configure.cmake Outdated
Comment on lines 559 to 563
IF(WITH_PERCONA_PROBUILD OR PRO_BUILD)
SET(HAVE_PERCONA_PROBUILD 1)
ENDIF()

Copy link
Contributor

@satya-bodapati satya-bodapati Dec 4, 2024

Choose a reason for hiding this comment

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

this is waht I did for pxb

+OPTION(PROBUILD "Build Percona XtraBackup Pro variant" OFF)
+IF (PROBUILD)
+ SET(XTRABACKUP_SUFFIX "-pro")
+ ADD_DEFINITIONS(-DPROBUILD)
+ENDIF()

Copy link
Contributor

Choose a reason for hiding this comment

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

Also I used the cmake option PROBUILD. Better to use same name across all products.

Or if you feel -DPERCONA_PROBUILD=1 is better, I will change it in next release.

@percona-ysorokin your thoughts?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@satya-bodapati I followed WITH_VALGRIND and WITH_PERCONA_TELEMETRY style.
I also added PROBUILD option (in Jira there was PRO_BUILD but probably you changed it later) which is equal to WITH_PERCONA_PROBUILD.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, I changd it may be. so i am using -DPROBUILD=1 for cmake and within source #ifdef PROBUILD

sql/mysqld.cc Outdated Show resolved Hide resolved
Add `WITH_PERCONA_PROBUILD` cmake option that enables pro features.
The`PRO_BUILD` cmake option is an alias for `WITH_PERCONA_PROBUILD`.
From source code we have to use `#ifdef HAVE_PERCONA_PROBUILD` for pro features.
Copy link
Collaborator

@percona-ysorokin percona-ysorokin left a comment

Choose a reason for hiding this comment

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

LGTM

@inikep inikep merged commit d37bf16 into percona:8.0 Dec 4, 2024
7 of 28 checks passed
@inikep inikep deleted the PS-9533-8.0 branch December 4, 2024 15:29
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.

3 participants