From 000fca250be4105f26f8d96a2e19cf2d3ac86a0b Mon Sep 17 00:00:00 2001 From: Jorge-Rodriguez Date: Wed, 25 Jan 2023 10:05:37 +0200 Subject: [PATCH 1/4] Add missing options to CHANGE MASTER TO --- plugins/modules/mysql_replication.py | 189 ++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 2 deletions(-) diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py index 5d1a0e5..be7584a 100644 --- a/plugins/modules/mysql_replication.py +++ b/plugins/modules/mysql_replication.py @@ -19,6 +19,7 @@ description: author: - Balazs Pocze (@banyek) - Andrew Klychkov (@Andersson007) +- Jorge Rodriguez (@Jorge-Rodriguez) options: mode: description: @@ -42,6 +43,11 @@ options: - resetreplica - resetreplicaall default: getreplica + primary_bind: + description: + - Same as the C(MASTER_BIND) mysql variable. + type: str + version_added: 3.6.0 primary_host: description: - Same as the C(MASTER_HOST) mysql variable. @@ -62,11 +68,21 @@ options: - Same as the C(MASTER_PORT) mysql variable. type: int aliases: [master_port] + primary_heartbeat_period: + description: + - Same as the C(MASTER_HEARTBEAT_PERIOD) mysql variable. + type: int + version_added: 3.6.0 primary_connect_retry: description: - Same as the C(MASTER_CONNECT_RETRY) mysql variable. type: int aliases: [master_connect_retry] + primary_retry_count: + description: + - Same as the C(MASTER_RETRY_COUNT) mysql variable. + type: int + version_added: 3.6.0 primary_log_file: description: - Same as the C(MASTER_LOG_FILE) mysql variable. @@ -116,6 +132,20 @@ options: L(MySQL encrypted replication documentation,https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypted-connections.html). type: str aliases: [master_ssl_cert] + primary_ssl_crl: + description: + - Same as the C(MASTER_SSL_CRL) mysql variable. + - For details, refer to + L(MySQL encrypted replication documentation,https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypted-connections.html). + type: str + version_added: 3.6.0 + primary_ssl_crlpath: + description: + - Same as the C(MASTER_SSL_CRLPATH) mysql variable. + - For details, refer to + L(MySQL encrypted replication documentation,https://dev.mysql.com/doc/refman/8.0/en/replication-solutions-encrypted-connections.html). + type: str + version_added: 3.6.0 primary_ssl_key: description: - Same as the C(MASTER_SSL_KEY) mysql variable. @@ -133,10 +163,15 @@ options: aliases: [master_ssl_cipher] primary_ssl_verify_server_cert: description: - - Same as mysql variable. + - Same as the C(SOURCE_SSL_VERIFY_SERVER_CERT) mysql variable. type: bool default: false - version_added: '3.5.0' + version_added: 3.5.0 + primary_tls_version: + description: + - Same as the C(MASTER_TLS_VERSION) mysql variable. + type: str + version_added: 3.6.0 primary_auto_position: description: - Whether the host uses GTID based replication or not. @@ -144,6 +179,24 @@ options: type: bool default: false aliases: [master_auto_position] + ignore_server_ids: + description: + - List of server IDs whose events are ignored. + type: list + elements: str + version_added: 3.6.0 + do_domain_ids: + description: + - Same as MariaDB variable. + type: list + elements: str + version_added: 3.6.0 + ignore_domain_ids: + description: + - Same as MariaDB variable. + type: list + elements: str + version_added: 3.6.0 primary_use_gtid: description: - Configures the replica to use the MariaDB Global Transaction ID. @@ -164,6 +217,62 @@ options: type: int version_added: '0.1.0' aliases: [master_delay] + privilege_checks_user: + description: + - Same as mysql variable. + choices: [account] + type: str + version_added: 3.6.0 + require_row_format: + description: + - Same as mysql variable. + type: bool + default: False + version_added: 3.6.0 + require_table_primary_key_check: + description: + - Same as mysql variable. + choices: ["stream", "on", "off"] + type: str + version_added: 3.6.0 + source_connection_auto_failover: + description: + - Same as mysql variable. + type: bool + default: False + version_added: 3.6.0 + primary_compression_algorithms: + description: + - Same as the C(MASTER_COMPRESSION_ALGORITHMS) mysql variable. + type: str + version_added: 3.6.0 + primary_zstd_compression_level: + description: + - Same as the C(MASTER_ZSTD_COMPRESSION_LEVEL) mysql variable. Valid values are in the range [1-22] + type: int + choices: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] + version_added: 3.6.0 + primary_tls_ciphersuites: + description: + - Same as the C(MASTER_TLS_CIPHERSUITES) mysql variable. + type: str + version_added: 3.6.0 + primary_public_key_path: + description: + - Same as the C(MASTER_PUBLIC_KEY_PATH) mysql variable. + type: str + version_added: 3.6.0 + get_primary_public_key: + description: + - Same as the C(GET_MASTER_PUBLIC_KEY) mysql variable. + type: bool + default: False + version_added: 3.6.0 + network_namespace: + description: + - Same as mysql variable. + type: str + version_added: 3.6.0 connection_name: description: - Name of the primary connection. @@ -449,11 +558,14 @@ def main(): 'resetreplica', 'resetreplicaall']), primary_auto_position=dict(type='bool', default=False, aliases=['master_auto_position']), + primary_bind=dict(type='str'), primary_host=dict(type='str', aliases=['master_host']), primary_user=dict(type='str', aliases=['master_user']), primary_password=dict(type='str', no_log=True, aliases=['master_password']), primary_port=dict(type='int', aliases=['master_port']), + primary_heartbeat_period=dict(type='int'), primary_connect_retry=dict(type='int', aliases=['master_connect_retry']), + primary_retry_count=dict(type='int'), primary_log_file=dict(type='str', aliases=['master_log_file']), primary_log_pos=dict(type='int', aliases=['master_log_pos']), relay_log_file=dict(type='str'), @@ -462,13 +574,29 @@ def main(): primary_ssl_ca=dict(type='str', aliases=['master_ssl_ca']), primary_ssl_capath=dict(type='str', aliases=['master_ssl_capath']), primary_ssl_cert=dict(type='str', aliases=['master_ssl_cert']), + primary_ssl_crl=dict(type='str'), + primary_ssl_crlpath=dict(type='str'), primary_ssl_key=dict(type='str', no_log=False, aliases=['master_ssl_key']), primary_ssl_cipher=dict(type='str', aliases=['master_ssl_cipher']), primary_ssl_verify_server_cert=dict(type='bool', default=False), + primary_tls_version=dict(type='str'), + primary_compression_algorithms=dict(type='str'), + primary_zstd_compression_level=dict(type='int', choices=list(range(1, 23))), + primary_tls_ciphersuites=dict(type='str'), + primary_public_key_path=dict(type='str'), + get_primary_public_key=dict(type='bool', default=False), primary_use_gtid=dict(type='str', choices=[ 'current_pos', 'replica_pos', 'disabled'], aliases=['master_use_gtid']), + ignore_server_ids=dict(type='list', elements="str"), + do_domain_ids=dict(type='list', elements="str"), + ignore_domain_ids=dict(type='list', elements="str"), primary_delay=dict(type='int', aliases=['master_delay']), connection_name=dict(type='str'), + privilege_checks_user=dict(type='str', choices=['account']), + require_row_format=dict(type='bool', default=False), + require_table_primary_key_check=dict(type='str', choices=['stream', 'on', 'off']), + source_connection_auto_failover=dict(type='bool', default=False), + network_namespace=dict(type='str'), channel=dict(type='str'), fail_on_error=dict(type='bool', default=False), ) @@ -479,11 +607,14 @@ def main(): ], ) mode = module.params["mode"] + primary_bind = module.params["primary_bind"] primary_host = module.params["primary_host"] primary_user = module.params["primary_user"] primary_password = module.params["primary_password"] primary_port = module.params["primary_port"] + primary_heartbeat_period = module.params["primary_heartbeat_period"] primary_connect_retry = module.params["primary_connect_retry"] + primary_retry_count = module.params["primary_retry_count"] primary_log_file = module.params["primary_log_file"] primary_log_pos = module.params["primary_log_pos"] relay_log_file = module.params["relay_log_file"] @@ -492,10 +623,26 @@ def main(): primary_ssl_ca = module.params["primary_ssl_ca"] primary_ssl_capath = module.params["primary_ssl_capath"] primary_ssl_cert = module.params["primary_ssl_cert"] + primary_ssl_crl = module.params["primary_ssl_crl"] + primary_ssl_crlpath = module.params["primary_ssl_crlpath"] primary_ssl_key = module.params["primary_ssl_key"] primary_ssl_cipher = module.params["primary_ssl_cipher"] primary_ssl_verify_server_cert = module.params["primary_ssl_verify_server_cert"] + primary_tls_version = module.params["primary_tls_version"] + primary_compression_algorithms = module.params["primary_compression_algorithms"] + primary_zstd_compression_level = module.params["primary_zstd_compression_level"] + primary_tls_ciphersuites = module.params["primary_tls_ciphersuites"] + primary_public_key_path = module.params["primary_public_key_path"] + get_primary_public_key = module.params["get_primary_public_key"] primary_auto_position = module.params["primary_auto_position"] + ignore_server_ids = module.params["ignore_server_ids"] + do_domain_ids = module.params["do_domain_ids"] + ignore_domain_ids = module.params["ignore_domain_ids"] + privilege_checks_user = module.params["privilege_checks_user"] + require_row_format = module.params["require_row_format"] + require_table_primary_key_check = module.params["require_table_primary_key_check"] + source_connection_auto_failover = module.params["source_connection_auto_failover"] + network_namespace = module.params["network_namespace"] ssl_cert = module.params["client_cert"] ssl_key = module.params["client_key"] ssl_ca = module.params["ca_cert"] @@ -568,6 +715,8 @@ def main(): elif mode == 'changeprimary': chm = [] result = {} + if primary_bind is not None: + chm.append("MASTER_BIND='%s'" % primary_bind) if primary_host is not None: chm.append("MASTER_HOST='%s'" % primary_host) if primary_user is not None: @@ -576,8 +725,12 @@ def main(): chm.append("MASTER_PASSWORD='%s'" % primary_password) if primary_port is not None: chm.append("MASTER_PORT=%s" % primary_port) + if primary_heartbeat_period is not None: + chm.append("MASTER_HEARTBEAT_PERIOD='%s'" % primary_heartbeat_period) if primary_connect_retry is not None: chm.append("MASTER_CONNECT_RETRY=%s" % primary_connect_retry) + if primary_retry_count is not None: + chm.append("MASTER_RETRY_COUNT='%s'" % primary_retry_count) if primary_log_file is not None: chm.append("MASTER_LOG_FILE='%s'" % primary_log_file) if primary_log_pos is not None: @@ -599,16 +752,48 @@ def main(): chm.append("MASTER_SSL_CAPATH='%s'" % primary_ssl_capath) if primary_ssl_cert is not None: chm.append("MASTER_SSL_CERT='%s'" % primary_ssl_cert) + if primary_ssl_crl is not None: + chm.append("MASTER_SSL_CRL='%s'" % primary_ssl_crl) + if primary_ssl_crlpath is not None: + chm.append("MASTER_SSL_CRLPATH='%s'" % primary_ssl_crlpath) if primary_ssl_key is not None: chm.append("MASTER_SSL_KEY='%s'" % primary_ssl_key) if primary_ssl_cipher is not None: chm.append("MASTER_SSL_CIPHER='%s'" % primary_ssl_cipher) + if primary_tls_version is not None: + chm.append("MASTER_TLS_VERSION='%s'" % primary_tls_version) + if primary_compression_algorithms is not None: + chm.append("MASTER_COMPRESSION_ALGORITHMS='%s'" % primary_compression_algorithms) + if primary_zstd_compression_level is not None: + chm.append("MASTER_ZSTD_COMPRESSION_LEVEL='%s'" % primary_zstd_compression_level) + if primary_tls_ciphersuites is not None: + chm.append("MASTER_TLS_CIPHERSUITES='%s'" % primary_tls_ciphersuites) + if primary_public_key_path is not None: + chm.append("MASTER_PUBLIC_KEY_PATH='%s'" % primary_public_key_path) + if get_primary_public_key: + chm.append("GET_MASTER_PUBLIC_KEY=1") if primary_ssl_verify_server_cert: chm.append("SOURCE_SSL_VERIFY_SERVER_CERT=1") if primary_auto_position: chm.append("MASTER_AUTO_POSITION=1") if primary_use_gtid is not None: chm.append("MASTER_USE_GTID=%s" % primary_use_gtid) + if ignore_server_ids: + chm.append("IGNORE_SERVER_IDS='%s'" % ','.join(ignore_server_ids)) + if do_domain_ids: + chm.append("DO_DOMAIN_IDS='%s'" % ','.join(do_domain_ids)) + if ignore_domain_ids: + chm.append("IGNORE_DOMAIN_IDS='%s'" % ','.join(ignore_domain_ids)) + if privilege_checks_user is not None: + chm.append("PRIVILEGE_CHECKS_USER='%s'" % privilege_checks_user) + if require_row_format: + chm.append("REQUIRE_ROW_FORMAT=1") + if require_table_primary_key_check is not None: + chm.append("REQUIRE_TABLE_PRIMARY_KEY_CHECK='%s'" % require_table_primary_key_check) + if source_connection_auto_failover: + chm.append("SOURCE_CONNECTION_AUTO_FAILOVER=1") + if network_namespace is not None: + chm.append("NETWORK_NAMESPACE='%s'" % network_namespace) try: changeprimary(cursor, chm, connection_name, channel) except mysql_driver.Warning as e: From cd29b797654e571dc04c481e4d667c80252e1550 Mon Sep 17 00:00:00 2001 From: Jorge-Rodriguez Date: Wed, 25 Jan 2023 10:05:37 +0200 Subject: [PATCH 2/4] Add changelog fragment --- .../fragments/59-mysql_replication_verify_server_cert.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/59-mysql_replication_verify_server_cert.yaml diff --git a/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml b/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml new file mode 100644 index 0000000..e03352d --- /dev/null +++ b/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - "mysql_replication - add the new options: ``primary_bind``, ``primary_heartbeat_period``, ``primary_retry_count``, ``primary_ssl_crl``, ``primary_ssl_crlpath``, ``primary_tls_version``, ``ignore_server_ids``, ``do_domain_ids``, ``ignore_domain_ids``, ``privilege_checks_user``, ``require_row_format``, ``require_table_primary_key_check``, ``source_connection_auto_failover``, ``primary_compression_algorithms``, ``primary_zstd_compression_level``, ``primary_tls_ciphersuites``, ``primary_public_key_path``, ``get_primary_public_key``, ``network_namespace`` (https://github.com/ansible-collections/community.mysql/issues/59)." From d60693cc9bc52e3b76940875fd0aa189b00f2bda Mon Sep 17 00:00:00 2001 From: Jorge-Rodriguez Date: Wed, 25 Jan 2023 13:47:48 +0200 Subject: [PATCH 3/4] Add two missing options --- ...-mysql_replication_verify_server_cert.yaml | 2 +- plugins/modules/mysql_replication.py | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml b/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml index e03352d..b55e08a 100644 --- a/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml +++ b/changelogs/fragments/59-mysql_replication_verify_server_cert.yaml @@ -1,3 +1,3 @@ --- minor_changes: - - "mysql_replication - add the new options: ``primary_bind``, ``primary_heartbeat_period``, ``primary_retry_count``, ``primary_ssl_crl``, ``primary_ssl_crlpath``, ``primary_tls_version``, ``ignore_server_ids``, ``do_domain_ids``, ``ignore_domain_ids``, ``privilege_checks_user``, ``require_row_format``, ``require_table_primary_key_check``, ``source_connection_auto_failover``, ``primary_compression_algorithms``, ``primary_zstd_compression_level``, ``primary_tls_ciphersuites``, ``primary_public_key_path``, ``get_primary_public_key``, ``network_namespace`` (https://github.com/ansible-collections/community.mysql/issues/59)." + - "mysql_replication - add the new options: ``assign_gtids_to_anonymous_transactions``, ``gtid_only``, ``primary_bind``, ``primary_heartbeat_period``, ``primary_retry_count``, ``primary_ssl_crl``, ``primary_ssl_crlpath``, ``primary_tls_version``, ``ignore_server_ids``, ``do_domain_ids``, ``ignore_domain_ids``, ``privilege_checks_user``, ``require_row_format``, ``require_table_primary_key_check``, ``source_connection_auto_failover``, ``primary_compression_algorithms``, ``primary_zstd_compression_level``, ``primary_tls_ciphersuites``, ``primary_public_key_path``, ``get_primary_public_key``, ``network_namespace`` (https://github.com/ansible-collections/community.mysql/issues/59)." diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py index be7584a..503e953 100644 --- a/plugins/modules/mysql_replication.py +++ b/plugins/modules/mysql_replication.py @@ -235,6 +235,12 @@ options: choices: ["stream", "on", "off"] type: str version_added: 3.6.0 + assign_gtids_to_annonymous_transactions: + description: + - Same as the C(ASSIGN_GTIDS_TO_ANNONYMOUS_TRANSACTIONS) mysql variable. + - Choices: ["OFF", "LOCAL", uuid] + type: str + version_added: 3.6.0 source_connection_auto_failover: description: - Same as mysql variable. @@ -273,6 +279,12 @@ options: - Same as mysql variable. type: str version_added: 3.6.0 + gtid_only: + description: + - Same as mysql variable. + type: bool + default: False + version_added: 3.6.0 connection_name: description: - Name of the primary connection. @@ -391,6 +403,7 @@ queries: ''' import os +import re import warnings from ansible.module_utils.basic import AnsibleModule @@ -591,10 +604,12 @@ def main(): do_domain_ids=dict(type='list', elements="str"), ignore_domain_ids=dict(type='list', elements="str"), primary_delay=dict(type='int', aliases=['master_delay']), + gtid_only=dict(type='bool', default=False) connection_name=dict(type='str'), privilege_checks_user=dict(type='str', choices=['account']), require_row_format=dict(type='bool', default=False), require_table_primary_key_check=dict(type='str', choices=['stream', 'on', 'off']), + assign_gtids_to_anonymous_transactions=dict(type='str') source_connection_auto_failover=dict(type='bool', default=False), network_namespace=dict(type='str'), channel=dict(type='str'), @@ -641,6 +656,9 @@ def main(): privilege_checks_user = module.params["privilege_checks_user"] require_row_format = module.params["require_row_format"] require_table_primary_key_check = module.params["require_table_primary_key_check"] + assign_gtids_to_anonymous_transactions = module.params["assign_gtids_to_anonymous_transactions"] + if re.fullmatch(r'^(?:[0-9A-F]{8}-[0-9A-F]{4}-[1-5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}|off|local)$', assign_gtids_to_anonymous_transactions, re.I) is None: + module.fail_json(msg="assign_gtids_to_anonymous_transactions must be a UUID, 'OFF' or 'LOCAL'") source_connection_auto_failover = module.params["source_connection_auto_failover"] network_namespace = module.params["network_namespace"] ssl_cert = module.params["client_cert"] @@ -654,6 +672,7 @@ def main(): primary_use_gtid = 'no' else: primary_use_gtid = module.params["primary_use_gtid"] + gtid_only = module.params["gtid_only"] connection_name = module.params["connection_name"] channel = module.params['channel'] fail_on_error = module.params['fail_on_error'] @@ -790,10 +809,17 @@ def main(): chm.append("REQUIRE_ROW_FORMAT=1") if require_table_primary_key_check is not None: chm.append("REQUIRE_TABLE_PRIMARY_KEY_CHECK='%s'" % require_table_primary_key_check) + if assign_gtids_to_anonymous_transactions is not None: + chm.append("ASSIGN_GTIDS_TO_ANONYMOUS_FUNCTION='%s'" % assign_gtids_to_anonymous_transactions) if source_connection_auto_failover: chm.append("SOURCE_CONNECTION_AUTO_FAILOVER=1") if network_namespace is not None: chm.append("NETWORK_NAMESPACE='%s'" % network_namespace) + if gtid_only is not None: + if gtid_only: + chm.append("GTID_ONLY=1") + else: + chm.append("GTID_ONLY=0") try: changeprimary(cursor, chm, connection_name, channel) except mysql_driver.Warning as e: From f07e3892046b5c1204d11ae6ff26520da2a0d09d Mon Sep 17 00:00:00 2001 From: Jorge-Rodriguez Date: Thu, 26 Jan 2023 11:14:14 +0200 Subject: [PATCH 4/4] First CHANGE MASTER TO tests battery --- .../implementations/mysql/replication.py | 4 + plugins/modules/mysql_replication.py | 20 ++-- .../test_mysql_replication/tasks/main.yml | 3 + ...ysql_replication_changeprimary_options.yml | 101 ++++++++++++++++++ 4 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 tests/integration/targets/test_mysql_replication/tasks/mysql_replication_changeprimary_options.yml diff --git a/plugins/module_utils/implementations/mysql/replication.py b/plugins/module_utils/implementations/mysql/replication.py index 2e50bea..4beda47 100644 --- a/plugins/module_utils/implementations/mysql/replication.py +++ b/plugins/module_utils/implementations/mysql/replication.py @@ -12,3 +12,7 @@ from ansible_collections.community.mysql.plugins.module_utils.version import Loo def uses_replica_terminology(cursor): """Checks if REPLICA must be used instead of SLAVE""" return LooseVersion(get_server_version(cursor)) >= LooseVersion('8.0.22') + +def supports_gtid_only(cursor): + """The GTID_ONLY option is supported since MySQL 8.0.27""" + return LooseVersion(get_server_version(cursor)) >= LooseVersion('8.0.27') diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py index 503e953..5ed7176 100644 --- a/plugins/modules/mysql_replication.py +++ b/plugins/modules/mysql_replication.py @@ -604,12 +604,12 @@ def main(): do_domain_ids=dict(type='list', elements="str"), ignore_domain_ids=dict(type='list', elements="str"), primary_delay=dict(type='int', aliases=['master_delay']), - gtid_only=dict(type='bool', default=False) + gtid_only=dict(type='bool', default=False), connection_name=dict(type='str'), privilege_checks_user=dict(type='str', choices=['account']), require_row_format=dict(type='bool', default=False), require_table_primary_key_check=dict(type='str', choices=['stream', 'on', 'off']), - assign_gtids_to_anonymous_transactions=dict(type='str') + assign_gtids_to_anonymous_transactions=dict(type='str'), source_connection_auto_failover=dict(type='bool', default=False), network_namespace=dict(type='str'), channel=dict(type='str'), @@ -657,7 +657,7 @@ def main(): require_row_format = module.params["require_row_format"] require_table_primary_key_check = module.params["require_table_primary_key_check"] assign_gtids_to_anonymous_transactions = module.params["assign_gtids_to_anonymous_transactions"] - if re.fullmatch(r'^(?:[0-9A-F]{8}-[0-9A-F]{4}-[1-5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}|off|local)$', assign_gtids_to_anonymous_transactions, re.I) is None: + if assign_gtids_to_anonymous_transactions is not None and re.fullmatch(r'^(?:[0-9A-F]{8}-[0-9A-F]{4}-[1-5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}|off|local)$', assign_gtids_to_anonymous_transactions, re.I) is None: module.fail_json(msg="assign_gtids_to_anonymous_transactions must be a UUID, 'OFF' or 'LOCAL'") source_connection_auto_failover = module.params["source_connection_auto_failover"] network_namespace = module.params["network_namespace"] @@ -745,11 +745,11 @@ def main(): if primary_port is not None: chm.append("MASTER_PORT=%s" % primary_port) if primary_heartbeat_period is not None: - chm.append("MASTER_HEARTBEAT_PERIOD='%s'" % primary_heartbeat_period) + chm.append("MASTER_HEARTBEAT_PERIOD=%s" % primary_heartbeat_period) if primary_connect_retry is not None: chm.append("MASTER_CONNECT_RETRY=%s" % primary_connect_retry) if primary_retry_count is not None: - chm.append("MASTER_RETRY_COUNT='%s'" % primary_retry_count) + chm.append("MASTER_RETRY_COUNT=%s" % primary_retry_count) if primary_log_file is not None: chm.append("MASTER_LOG_FILE='%s'" % primary_log_file) if primary_log_pos is not None: @@ -784,7 +784,7 @@ def main(): if primary_compression_algorithms is not None: chm.append("MASTER_COMPRESSION_ALGORITHMS='%s'" % primary_compression_algorithms) if primary_zstd_compression_level is not None: - chm.append("MASTER_ZSTD_COMPRESSION_LEVEL='%s'" % primary_zstd_compression_level) + chm.append("MASTER_ZSTD_COMPRESSION_LEVEL=%s" % primary_zstd_compression_level) if primary_tls_ciphersuites is not None: chm.append("MASTER_TLS_CIPHERSUITES='%s'" % primary_tls_ciphersuites) if primary_public_key_path is not None: @@ -798,11 +798,11 @@ def main(): if primary_use_gtid is not None: chm.append("MASTER_USE_GTID=%s" % primary_use_gtid) if ignore_server_ids: - chm.append("IGNORE_SERVER_IDS='%s'" % ','.join(ignore_server_ids)) + chm.append("IGNORE_SERVER_IDS=(%s)" % ','.join(ignore_server_ids)) if do_domain_ids: - chm.append("DO_DOMAIN_IDS='%s'" % ','.join(do_domain_ids)) + chm.append("DO_DOMAIN_IDS=(%s)" % ','.join(do_domain_ids)) if ignore_domain_ids: - chm.append("IGNORE_DOMAIN_IDS='%s'" % ','.join(ignore_domain_ids)) + chm.append("IGNORE_DOMAIN_IDS=(%s)" % ','.join(ignore_domain_ids)) if privilege_checks_user is not None: chm.append("PRIVILEGE_CHECKS_USER='%s'" % privilege_checks_user) if require_row_format: @@ -815,7 +815,7 @@ def main(): chm.append("SOURCE_CONNECTION_AUTO_FAILOVER=1") if network_namespace is not None: chm.append("NETWORK_NAMESPACE='%s'" % network_namespace) - if gtid_only is not None: + if gtid_only is not None and impl.supports_gtid_only(cursor): if gtid_only: chm.append("GTID_ONLY=1") else: diff --git a/tests/integration/targets/test_mysql_replication/tasks/main.yml b/tests/integration/targets/test_mysql_replication/tasks/main.yml index 044787a..e5cc928 100644 --- a/tests/integration/targets/test_mysql_replication/tasks/main.yml +++ b/tests/integration/targets/test_mysql_replication/tasks/main.yml @@ -15,6 +15,9 @@ # Tests of primary_delay parameter: - import_tasks: mysql_replication_primary_delay.yml +# Tests of CHANGE MASTER TO options +- include: mysql_replication_changeprimary_options.yml + # Tests of channel parameter: - import_tasks: mysql_replication_channel.yml when: diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_changeprimary_options.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_changeprimary_options.yml new file mode 100644 index 0000000..3379c48 --- /dev/null +++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_changeprimary_options.yml @@ -0,0 +1,101 @@ +# Copyright: (c) 2023, Jorge Rodriguez (@Jorge-Rodriguez) +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + +- vars: + mysql_params: &mysql_params + login_user: '{{ mysql_user }}' + login_password: '{{ mysql_password }}' + login_host: 127.0.0.1 + + block: + # Auxiliary step: + - name: Stop Replica + mysql_replication: + <<: *mysql_params + login_port: '{{ mysql_replica1_port }}' + mode: stopreplica + + - name: Test CHANGE MASTER TO options + mysql_replication: + <<: *mysql_params + login_port: '{{ mysql_replica1_port }}' + mode: changeprimary + primary_bind: 127.0.0.1 + primary_retry_count: 12 + primary_ssl_crl: bogus_crl + primary_ssl_crlpath: bogus_crl_path + primary_tls_version: TLSv1.3 + primary_public_key_path: bogus_pub_key_path + get_primary_public_key: yes + ignore_server_ids: '123456789' + network_namespace: 'test_net_namespace' + primary_heartbeat_period: 15 + primary_compression_algorithms: 'zstd' + primary_zstd_compression_level: 15 + register: result + + - assert: + that: + - result is changed + - result.queries == ["CHANGE MASTER TO MASTER_BIND='127.0.0.1',MASTER_HEARTBEAT_PERIOD=15,MASTER_RETRY_COUNT=12,MASTER_SSL_CRL='bogus_crl',MASTER_SSL_CRLPATH='bogus_crl_path',MASTER_TLS_VERSION='TLSv1.3',MASTER_COMPRESSION_ALGORITHMS='zstd',MASTER_ZSTD_COMPRESSION_LEVEL=15,MASTER_PUBLIC_KEY_PATH='bogus_pub_key_path',GET_MASTER_PUBLIC_KEY=1,IGNORE_SERVER_IDS=(123456789),NETWORK_NAMESPACE='test_net_namespace'"] + + # Auxiliary step: + - name: Start replica + mysql_replication: + <<: *mysql_params + login_port: '{{ mysql_replica1_port }}' + mode: startreplica + + # Check primary_bind: + - name: Get standby status + mysql_replication: + <<: *mysql_params + login_port: '{{ mysql_replica1_port }}' + mode: getreplica + register: replica_status + + - assert: + that: + - replica_status.Source_Bind == '127.0.0.1' + - replica_status.Source_Retry_Count == 12 + - replica_status.Source_SSL_Crl == 'bogus_crl' + - replica_status.Source_SSL_Crlpath == 'bogus_crl_path' + - replica_status.Source_TLS_Version == 'TLSv1.3' + - replica_status.Source_public_key_path == 'bogus_pub_key_path' + - replica_status.Get_Source_public_key == 1 + - replica_status.Replicate_Ignore_Server_Ids == '123456789' + - replica_status.Network_Namespace == 'test_net_namespace' + - replica_status is not changed + + - name: Test Results + mysql_query: + <<: *mysql_params + login_port: '{{ mysql_replica1_port }}' + query: SELECT HEARTBEAT_INTERVAL, COMPRESSION_ALGORITHM, ZSTD_COMPRESSION_LEVEL FROM performance_schema.replication_connection_configuration + register: result + + - assert: + that: + - result.query_result[0][0]['COMPRESSION_ALGORITHM'] == 'zstd' + - result.query_result[0][0]['HEARTBEAT_INTERVAL'] == 15.0 + - result.query_result[0][0]['ZSTD_COMPRESSION_LEVEL'] == 15 + +# Missing TESTS +# - privilege_checks_user +# - require_row_format +# - require_table_primary_key_check +# - assign_gtids_To anonymous_transactions +# - GTID_ONLY availabe on MySQL 8.0.27 +# - ztsd_compression_level out of bounds +# - source_connection_auto_failover -> only possible when GTID_MODE = on +# - primary_tls_ciphersuites -> requires SSL enabled + + # - name: Test Results + # mysql_query: + # <<: *mysql_params + # login_port: '{{ mysql_replica1_port }}' + # query: SHOW VARIABLES LIKE '%tls_ciphersuites%' + # register: result + + # - debug: + # var: result