From 6b81883170e8d54d8c2efdb1a6b5b37df43e4b6d Mon Sep 17 00:00:00 2001 From: Alexey Yurchenko Date: Fri, 14 Dec 2018 21:29:17 +0200 Subject: [PATCH] Remove provider defaults check from 'galera_defaults' MTR test From time to time Galera adds new parameters or changes defaults to existing ones. Every time this happens galera_defaults test needs a fix (and a commit) because it insists on checking these defaults. This is making life hard because any Galera update may require a fix to MariaDB code even though it is totally unrelated and defeats the whole idea of a provider living its own life. This commit removes checking for provider defaults to avoid false positive failures on MariaDB side. --- .../suite/galera/r/galera_defaults.result | 1 - .../suite/galera/t/galera_defaults.test | 23 ------------------- 2 files changed, 24 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index 8083784bb01e5..6871ec6d56b8c 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -52,4 +52,3 @@ WSREP_SST_DONOR WSREP_SST_DONOR_REJECTS_QUERIES OFF WSREP_SST_METHOD rsync WSREP_SYNC_WAIT 15 -; ; ; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT30S; evs.info_log_mask = 0; evs.install_timeout = PT15S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; ; gcache.keep_pages_size = 0; gcache.mem_size = 0; ; gcache.page_size = 128M; gcache.recover = no; gcache.size = 10M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; ; gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; ; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; ; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; ;socket.checksum = 2; socket.recv_buf_size = 212992; diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test index 0ad9791630226..3d4a7da7b54de 100644 --- a/mysql-test/suite/galera/t/galera_defaults.test +++ b/mysql-test/suite/galera/t/galera_defaults.test @@ -36,26 +36,3 @@ AND VARIABLE_NAME NOT IN ( 'WSREP_PATCH_VERSION' ) ORDER BY VARIABLE_NAME; - -# wsrep_provider_options -# -# We replace the ones that vary from run to run with placeholders - ---let _WSREP_PROVIDER_OPTIONS = `SELECT @@wsrep_provider_options` ---perl - use strict; - my $wsrep_provider_options = $ENV{'_WSREP_PROVIDER_OPTIONS'}; - $wsrep_provider_options =~ s/base_dir = .*?;/;/sgio; - $wsrep_provider_options =~ s/base_host = .*?;/;/sgio; - $wsrep_provider_options =~ s/base_port = .*?;/;/sgio; - $wsrep_provider_options =~ s/gcache\.dir = .*?;/;/sgio; - $wsrep_provider_options =~ s/gcache\.name = .*?;/;/sgio; - $wsrep_provider_options =~ s/gmcast\.listen_addr = .*?;/;/sgio; - $wsrep_provider_options =~ s/gcs\.recv_q_hard_limit = .*?;/;/sgio; - $wsrep_provider_options =~ s/ist\.recv_addr = .*?;/;/sgio; - $wsrep_provider_options =~ s/evs\.evict = .*?;/;/sgio; - $wsrep_provider_options =~ s/signal = .*?;\s*//sgio; - $wsrep_provider_options =~ s/dbug = .*?;\s*//sgio; - $wsrep_provider_options =~ s/repl.proto_max = .*?;\s*/;/sgio; - print $wsrep_provider_options."\n"; -EOF