Skip to content

Commit

Permalink
MDEV-30318 : galera error messages in mariadb log without galera enabled
Browse files Browse the repository at this point in the history 
Do not compile wsrep_provider plugin if WITH_WSREP is not enabled.
We should not enable wsrep_provider plugin if WSREP_ON=OFF and
at that case we can only print information that Plugin
'wsrep-provider' is disabled.

Make sure tests require Galera library 26.4.14 if needed.
  • Loading branch information
@vuvova
Jan Lindström authored and vuvova committed Feb 14, 2023
1 parent 00f202b commit 2988db1
Show file tree
Hide file tree
Showing 10 changed files with 126 additions and 106 deletions.
1 change: 1 addition & 0 deletions mysql-test/suite/wsrep/r/wsrep_provider_plugin.result
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Correct Galera library found
CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
SET GLOBAL wsrep_provider_repl_max_ws_size=1;
SHOW VARIABLES LIKE 'wsrep_provider_repl_max_ws_size';
Expand Down
1 change: 1 addition & 0 deletions mysql-test/suite/wsrep/r/wsrep_provider_plugin_basic.result
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Correct Galera library found
select variable_type, global_value from information_schema.system_variables where variable_name = 'wsrep_provider_socket_recv_buf_size';
variable_type global_value
VARCHAR auto
Expand Down
188 changes: 87 additions & 101 deletions mysql-test/suite/wsrep/r/wsrep_provider_plugin_defaults.result
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Correct Galera library found
SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_provider%';
COUNT(*)
90
89
SELECT * FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES
WHERE VARIABLE_NAME LIKE 'wsrep_provider_%' AND VARIABLE_NAME NOT IN (
'wsrep_provider',
Expand Down Expand Up @@ -87,14 +88,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_CAUSAL_KEEPALIVE_PERIOD
SESSION_VALUE NULL
GLOBAL_VALUE PT1S
GLOBAL_VALUE 1.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT1S
DEFAULT_VALUE 1.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
Expand All @@ -117,29 +118,29 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_DELAYED_KEEP_PERIOD
SESSION_VALUE NULL
GLOBAL_VALUE PT30S
GLOBAL_VALUE 30.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT30S
DEFAULT_VALUE 30.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_DELAY_MARGIN
SESSION_VALUE NULL
GLOBAL_VALUE PT1S
GLOBAL_VALUE 1.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT1S
DEFAULT_VALUE 1.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
Expand All @@ -162,29 +163,29 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_INACTIVE_CHECK_PERIOD
SESSION_VALUE NULL
GLOBAL_VALUE PT0.5S
GLOBAL_VALUE 0.500000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT0.5S
DEFAULT_VALUE 0.500000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_INACTIVE_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT15S
GLOBAL_VALUE 15.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT15S
DEFAULT_VALUE 15.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
Expand All @@ -207,44 +208,44 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_INSTALL_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT7.5S
GLOBAL_VALUE 7.500000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT7.5S
DEFAULT_VALUE 7.500000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_JOIN_RETRANS_PERIOD
SESSION_VALUE NULL
GLOBAL_VALUE PT1S
GLOBAL_VALUE 1.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT1S
DEFAULT_VALUE 1.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_KEEPALIVE_PERIOD
SESSION_VALUE NULL
GLOBAL_VALUE PT1S
GLOBAL_VALUE 1.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT1S
DEFAULT_VALUE 1.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
Expand Down Expand Up @@ -282,29 +283,29 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_STATS_REPORT_PERIOD
SESSION_VALUE NULL
GLOBAL_VALUE PT1M
GLOBAL_VALUE 60.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT1M
DEFAULT_VALUE 60.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_SUSPECT_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT5S
GLOBAL_VALUE 5.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT5S
DEFAULT_VALUE 5.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
Expand Down Expand Up @@ -357,14 +358,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_EVS_VIEW_FORGET_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE P1D
GLOBAL_VALUE 86400.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE P1D
DEFAULT_VALUE 86400.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
Expand Down Expand Up @@ -717,14 +718,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_GMCAST_PEER_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT3S
GLOBAL_VALUE 3.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT3S
DEFAULT_VALUE 3.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
Expand All @@ -747,14 +748,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_GMCAST_TIME_WAIT
SESSION_VALUE NULL
GLOBAL_VALUE PT5S
GLOBAL_VALUE 5.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT5S
DEFAULT_VALUE 5.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
Expand Down Expand Up @@ -807,14 +808,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_PC_ANNOUNCE_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT3S
GLOBAL_VALUE 3.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT3S
DEFAULT_VALUE 3.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
Expand Down Expand Up @@ -882,14 +883,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_PC_LINGER
SESSION_VALUE NULL
GLOBAL_VALUE PT20S
GLOBAL_VALUE 20.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT20S
DEFAULT_VALUE 20.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
Expand Down Expand Up @@ -957,14 +958,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_PC_WAIT_PRIM_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT30S
GLOBAL_VALUE 30.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT30S
DEFAULT_VALUE 30.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
Expand All @@ -985,21 +986,6 @@ ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_PROTONET_BACKEND
SESSION_VALUE NULL
GLOBAL_VALUE asio
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE asio
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_PROTONET_VERSION
SESSION_VALUE NULL
GLOBAL_VALUE 0
Expand All @@ -1017,14 +1003,14 @@ COMMAND_LINE_ARGUMENT REQUIRED
GLOBAL_VALUE_PATH NULL
VARIABLE_NAME WSREP_PROVIDER_REPL_CAUSAL_READ_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE PT30S
GLOBAL_VALUE 30.000000
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE PT30S
DEFAULT_VALUE 30.000000
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_TYPE DOUBLE
VARIABLE_COMMENT Wsrep provider option
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_MIN_VALUE 2.2250738585072e-308
NUMERIC_MAX_VALUE 1.797693134862316e308
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
Expand Down
5 changes: 5 additions & 0 deletions mysql-test/suite/wsrep/r/wsrep_provider_plugin_wsrep_off.result
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SELECT @@wsrep_on;
@@wsrep_on
0
select variable_type, global_value from information_schema.system_variables where variable_name = 'wsrep_provider%';
variable_type global_value
3 changes: 3 additions & 0 deletions mysql-test/suite/wsrep/t/wsrep_provider_plugin.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
--source include/have_wsrep.inc
--source include/have_innodb.inc

--let $galera_version=26.4.14
source include/check_galera_version.inc;

CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;

SET GLOBAL wsrep_provider_repl_max_ws_size=1;
Expand Down
Loading

0 comments on commit 2988db1

Please sign in to comment.