- commits - lists.mariadb.org

[Commits] 33bf0a34a15: Update test.
by jan 11 Mar '19

11 Mar '19

revision-id: 33bf0a34a15fa02ed3a656d372fe7d7b168bff8e (mariadb-10.2.22-49-g33bf0a34a15) parent(s): 1e4344ec86f26e35a6c400d5a02d4e981cbe45c2 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 12:20:09 +0200 message: Update test. --- mysql-test/suite/galera/r/galera_kill_smallchanges.result | 5 ++--- mysql-test/suite/galera/t/galera_kill_smallchanges.test | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_kill_smallchanges.result b/mysql-test/suite/galera/r/galera_kill_smallchanges.result index 7542727b100..09f3921f022 100644 --- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result +++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result @@ -7,9 +7,8 @@ connection node_1; INSERT INTO t1 VALUES (1); connection node_2; connection node_2a; -call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); -SELECT COUNT(*) = 1 FROM t1; -COUNT(*) = 1 +SELECT COUNT(*) FROM t1; +COUNT(*) 1 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE = 2 diff --git a/mysql-test/suite/galera/t/galera_kill_smallchanges.test b/mysql-test/suite/galera/t/galera_kill_smallchanges.test index fa726094671..b9c8f3b428d 100644 --- a/mysql-test/suite/galera/t/galera_kill_smallchanges.test +++ b/mysql-test/suite/galera/t/galera_kill_smallchanges.test @@ -3,7 +3,6 @@ # --source include/galera_cluster.inc ---source include/have_innodb.inc --connection node_1 @@ -28,9 +27,7 @@ INSERT INTO t1 VALUES (1); --source include/galera_connect.inc --connection node_2a -call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); - -SELECT COUNT(*) = 1 FROM t1; +SELECT COUNT(*) FROM t1; SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; --connection node_1

1 0

[Commits] 594160778e5: Ignore warning.
by jan 11 Mar '19

11 Mar '19

revision-id: 594160778e518dcc8ffabdbc8b2a5e12a93318de (mariadb-10.2.22-49-g594160778e5) parent(s): f7ebae2b17e1674ec255070814cbe472da1ae41b author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 12:16:46 +0200 message: Ignore warning. --- mysql-test/suite/galera/suite.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index 8b7b7034fac..6e53e6e2e31 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -75,6 +75,7 @@ push @::global_suppressions, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer $JOINED$. Message ignored.|, qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled. Expect abort.|, qr(WSREP: Action message in non-primary configuration from member [0-9]*), + qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*), qr(WSREP: discarding established .*), qr|WSREP: .*core_handle_uuid_msg.*|, qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0. WSREP_SYNC_WAIT_BEFORE_READ is on),

1 0

[Commits] 4f8a21caa26: Update results.
by jan 11 Mar '19

11 Mar '19

revision-id: 4f8a21caa269be6e8091fbb93aac01f88d0eb6e0 (mariadb-10.2.22-49-g4f8a21caa26) parent(s): ec96d5ab41e458b6397f5bbe83736f9c1405acf9 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 12:14:09 +0200 message: Update results. --- mysql-test/suite/galera/r/galera_kill_smallchanges.result | 2 -- mysql-test/suite/galera/r/galera_var_slave_threads.result | 13 ++++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_kill_smallchanges.result b/mysql-test/suite/galera/r/galera_kill_smallchanges.result index e4d7161c71a..7542727b100 100644 --- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result +++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result @@ -1,6 +1,4 @@ connection node_1; -connection node_2; -connection node_1; SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; connection node_2; diff --git a/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-test/suite/galera/r/galera_var_slave_threads.result index c28cc091ae9..eda30755aed 100644 --- a/mysql-test/suite/galera/r/galera_var_slave_threads.result +++ b/mysql-test/suite/galera/r/galera_var_slave_threads.result @@ -12,6 +12,7 @@ Warning 1292 Truncated incorrect wsrep_slave_threads value: '0' SELECT @@wsrep_slave_threads = 1; @@wsrep_slave_threads = 1 1 +# wsrep_slave_threads = 1 SET GLOBAL wsrep_slave_threads = 1; SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) @@ -20,15 +21,17 @@ SET GLOBAL wsrep_slave_threads = 64; connection node_1; INSERT INTO t1 VALUES (1); connection node_2; -SELECT COUNT(*) = 1 FROM t1; -COUNT(*) = 1 +SELECT COUNT(*) FROM t1; +COUNT(*) 1 +# wsrep_slave_threads = 64 SET GLOBAL wsrep_slave_threads = 1; connection node_1; connection node_2; SELECT COUNT(*) FROM t2; COUNT(*) -64 +66 +# wsrep_slave_threads = 1 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) 1 @@ -42,11 +45,15 @@ connection node_1; CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=INNODB; connection node_2; SET GLOBAL wsrep_slave_threads = 4; +# wsrep_slave_threads = 4 SET GLOBAL wsrep_slave_threads = 1; connection node_1; INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); DROP TABLE t1; connection node_2; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';

1 0

[Commits] bf5bd08607c: Merge branch '10.2' of github.com:MariaDB/server into 10.2
by jan 11 Mar '19

11 Mar '19

revision-id: bf5bd08607c2a2790eb93c49924733e4cc48ed01 (mariadb-10.2.22-51-gbf5bd08607c) parent(s): e50c7b0b27cc7e651abd0e67b8bd142b007bd61c 3ea49d35bd93c515f3da55b846850ba1125971a0 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 12:07:06 +0200 message: Merge branch '10.2' of github.com:MariaDB/server into 10.2 CMakeLists.txt | 9 +++++++++ cmake/os/Linux.cmake | 2 +- cmake/plugin.cmake | 2 +- mysql-test/suite/galera/disabled.def | 2 +- mysql-test/suite/galera/r/galera_var_notify_cmd.result | 1 + scripts/wsrep_sst_mariabackup.sh | 4 ++-- 6 files changed, 15 insertions(+), 5 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index f11cd61b6c4,1296d494b76..77b6f7ef99e --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -27,10 -26,10 +27,10 @@@ galera_as_slave_replication_bundle : MD galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events galera_binlog_stmt_autoinc : MDEV-13549 auto_increment mismatch galera_flush : MariaDB does not have global.thread_statistics -galera_gcache_recover_manytrx : MDEV-18834 Galera test failure +galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST -galera_ist_mariabackup : MDEV-18829 test leaves port open +galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail - galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status + galera_ist_progress: MDEV-15236 fails when trying to read transfer status galera_kill_applier : race condition at the start of the test galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl galera_migrate : MariaDB does not support START SLAVE USER

1 0

[Commits] 39d5bb89408: Apply and record 10.4 and Galera 4 versions of tests and results.
by jan 11 Mar '19

11 Mar '19

revision-id: 39d5bb89408be2d85d92a50beda0ee3a369bfeb6 (mariadb-10.4.3-54-g39d5bb89408) parent(s): 0790e0a47001b791ea6395cf6d4a60f532c4b520 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 11:55:35 +0200 message: Apply and record 10.4 and Galera 4 versions of tests and results. --- mysql-test/suite/galera/r/MW-44.result | 7 +++++++ .../r/galera_ipv6_mariabackup_section.result | 8 +++++++- .../r/galera_ipv6_rsync_section.result | 5 +++++ .../t/galera_ipv6_mariabackup_section.test | 21 ++++++++++----------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result index a07719daca1..6973e4c78c9 100644 --- a/mysql-test/suite/galera/r/MW-44.result +++ b/mysql-test/suite/galera/r/MW-44.result @@ -1,5 +1,10 @@ +connection node_2; +connection node_1; +connection node_1; TRUNCATE TABLE mysql.general_log; +connection node_2; TRUNCATE TABLE mysql.general_log; +connection node_1; SELECT Argument FROM mysql.general_log; Argument SET GLOBAL general_log='ON'; @@ -12,8 +17,10 @@ SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument argument CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB ALTER TABLE t1 ADD COLUMN f2 INTEGER +connection node_2; SELECT Argument FROM mysql.general_log; Argument DROP TABLE t1; SET GLOBAL general_log='OFF'; +connection node_1; SET GLOBAL general_log='OFF'; diff --git a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result index 53e35939a79..8ec1ff090ff 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result +++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result @@ -1,18 +1,24 @@ +connection node_2; +connection node_1; SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses'; VARIABLE_VALUE LIKE '%[::1]%' 1 SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE = 3 1 +connection node_2; SET GLOBAL wsrep_provider_options='gmcast.isolate=1'; +connection node_1; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); +connection node_2; SET GLOBAL wsrep_provider_options='gmcast.isolate=0'; SELECT COUNT(*) = 1 FROM t1; COUNT(*) = 1 1 DROP TABLE t1; +connection node_1; include/assert_grep.inc [Streaming the backup to joiner at \[::1\]] include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:] include/assert_grep.inc [IST receiver addr using tcp://\[::1\]] -include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]] +include/assert_grep.inc [Prepared IST receiver for 3-6, listening at: tcp://\[::1\]] diff --git a/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result b/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result index a2bf5f4d98c..3f810d3eb97 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result +++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result @@ -1,12 +1,17 @@ +connection node_2; +connection node_1; SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses'; VARIABLE_VALUE LIKE '%[::1]%' 1 SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; VARIABLE_VALUE = 3 1 +connection node_2; SET GLOBAL wsrep_provider_options='gmcast.isolate=1'; +connection node_1; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); +connection node_2; SET GLOBAL wsrep_provider_options='gmcast.isolate=0'; SELECT COUNT(*) = 1 FROM t1; COUNT(*) = 1 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test index 95cd1a5bea5..71d17c133a5 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test @@ -39,31 +39,30 @@ DROP TABLE t1; --let $assert_only_after = CURRENT_TEST # The SSTs happen when nodes are started first time ---let $assert_count= 2 +--let $assert_count = 2 --let $assert_text = Streaming the backup to joiner at \[::1\] --let $assert_select = Streaming the backup to joiner at \[::1\] --source include/assert_grep.inc -# There will be 1 ISTs donated from node_1 in Galera 3. +# There will be 3 ISTs donated from node_1 in Galera 4. # Two first happen at the initial startup to populate the certification # index. The third one is from the IST which happens during the actual test. ---let $assert_count= 1 +--let $assert_count = 3 --let $assert_text = async IST sender starting to serve tcp://\[::1\]: --let $assert_select = async IST sender starting to serve tcp://\[::1\]: --source include/assert_grep.inc ---connection node_2 --let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.2.err ---let $assert_only_after = CURRENT_TEST -# There is one ISTs on joiner at Galera 3. ---let $assert_count= 1 +# There are two ISTs on joiner, the first at the initial startup, the second +# during the actual test. +--let $assert_count = 2 --let $assert_text = IST receiver addr using tcp://\[::1\] --let $assert_select = IST receiver addr using tcp://\[::1\] --source include/assert_grep.inc -# There will be only one Prepared IST and in Galera 3 segnos are not printed ---let $assert_count= 1 ---let $assert_text = Prepared IST receiver, listening at: tcp://\[::1\] ---let $assert_select = Prepared IST receiver, listening at: tcp://\[::1\] +# The receiver expects seqnos 3-6 only once. +--let $assert_count = 1 +--let $assert_text = Prepared IST receiver for 3-6, listening at: tcp://\[::1\] +--let $assert_select = Prepared IST receiver for 3-6, listening at: tcp://\[::1\] --source include/assert_grep.inc

1 0

[Commits] e50c7b0b27c: Ignore warning.
by jan 11 Mar '19

11 Mar '19

revision-id: e50c7b0b27cc7e651abd0e67b8bd142b007bd61c (mariadb-10.2.22-50-ge50c7b0b27c) parent(s): cd0837c28a93beb8427ecc11308dc74408bd11df author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 08:29:00 +0200 message: Ignore warning. --- mysql-test/suite/galera/suite.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index 8b7b7034fac..6e53e6e2e31 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -75,6 +75,7 @@ push @::global_suppressions, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer $JOINED$. Message ignored.|, qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled. Expect abort.|, qr(WSREP: Action message in non-primary configuration from member [0-9]*), + qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*), qr(WSREP: discarding established .*), qr|WSREP: .*core_handle_uuid_msg.*|, qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0. WSREP_SYNC_WAIT_BEFORE_READ is on),

1 0

[Commits] cd0837c28a9: Test fix.
by jan 10 Mar '19

10 Mar '19

revision-id: cd0837c28a93beb8427ecc11308dc74408bd11df (mariadb-10.2.22-49-gcd0837c28a9) parent(s): fde7d61d0a716a35a3065d0bfcb4a830e7106c85 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-10 20:13:24 +0200 message: Test fix. --- mysql-test/suite/galera/r/galera_var_slave_threads.result | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-test/suite/galera/r/galera_var_slave_threads.result index c28cc091ae9..eda30755aed 100644 --- a/mysql-test/suite/galera/r/galera_var_slave_threads.result +++ b/mysql-test/suite/galera/r/galera_var_slave_threads.result @@ -12,6 +12,7 @@ Warning 1292 Truncated incorrect wsrep_slave_threads value: '0' SELECT @@wsrep_slave_threads = 1; @@wsrep_slave_threads = 1 1 +# wsrep_slave_threads = 1 SET GLOBAL wsrep_slave_threads = 1; SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) @@ -20,15 +21,17 @@ SET GLOBAL wsrep_slave_threads = 64; connection node_1; INSERT INTO t1 VALUES (1); connection node_2; -SELECT COUNT(*) = 1 FROM t1; -COUNT(*) = 1 +SELECT COUNT(*) FROM t1; +COUNT(*) 1 +# wsrep_slave_threads = 64 SET GLOBAL wsrep_slave_threads = 1; connection node_1; connection node_2; SELECT COUNT(*) FROM t2; COUNT(*) -64 +66 +# wsrep_slave_threads = 1 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) 1 @@ -42,11 +45,15 @@ connection node_1; CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=INNODB; connection node_2; SET GLOBAL wsrep_slave_threads = 4; +# wsrep_slave_threads = 4 SET GLOBAL wsrep_slave_threads = 1; connection node_1; INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); DROP TABLE t1; connection node_2; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';

1 0

[Commits] eaada99db61: Update to latest rocksdb (only changes comments)
by Sergei Petrunia 10 Mar '19

10 Mar '19

revision-id: eaada99db613a54988df644a94780c7e60edd498 (fb-prod201801-218-geaada99db61) parent(s): 0d6bf4d98febd26b290430ad796e63ce3bce9a3c author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-03-10 20:07:07 +0300 message: Update to latest rocksdb (only changes comments) --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index c0a1babb157..7a8c777d488 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit c0a1babb157b83b1eb41820fd7652e23b81f8c48 +Subproject commit 7a8c777d4880cde8fd96135f6cc216223371a9f4

1 0

[Commits] 7a8c777d4: Add comments about use of toku_time.h
by Sergei Petrunia 10 Mar '19

10 Mar '19

revision-id: 7a8c777d4880cde8fd96135f6cc216223371a9f4 (v5.8-1023-g7a8c777d4) parent(s): c0a1babb157b83b1eb41820fd7652e23b81f8c48 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-03-10 20:06:03 +0300 message: Add comments about use of toku_time.h - Which functions are needed - Can we use RocksDB's portability layer instead (yes) --- .../range_locking/portability/toku_time.h | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/utilities/transactions/range_locking/portability/toku_time.h b/utilities/transactions/range_locking/portability/toku_time.h index de0b0c354..dc8e366e5 100644 --- a/utilities/transactions/range_locking/portability/toku_time.h +++ b/utilities/transactions/range_locking/portability/toku_time.h @@ -47,6 +47,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. # include <sys/platform/ppc.h> #endif +#if 0 static inline float toku_tdiff (struct timeval *a, struct timeval *b) { return (float)((a->tv_sec - b->tv_sec) + 1e-6 * (a->tv_usec - b->tv_usec)); } @@ -61,6 +62,7 @@ typedef int clockid_t; #define CLOCK_REALTIME 0x01867234 #endif int toku_clock_gettime(clockid_t clk_id, struct timespec *ts) __attribute__((__visibility__("default"))); +#endif // *************** Performance timers ************************ // What do you really want from a performance timer: @@ -83,6 +85,7 @@ int toku_clock_gettime(clockid_t clk_id, struct timespec *ts) __attribute__((__v // The decision here is that these times are really accurate only on modern machines with modern OSs. typedef uint64_t tokutime_t; // Time type used in by tokutek timers. +#if 0 // The value of tokutime_t is not specified here. // It might be microseconds since 1/1/1970 (if gettimeofday() is // used), or clock cycles since boot (if rdtsc is used). Or something @@ -100,6 +103,8 @@ typedef uint64_t tokutime_t; // Time type used in by tokutek timers. // double tokutime_to_seconds(tokutime_t) __attribute__((__visibility__("default"))); // Convert tokutime to seconds. +#endif + // Get the value of tokutime for right now. We want this to be fast, so we expose the implementation as RDTSC. static inline tokutime_t toku_time_now(void) { #if defined(__x86_64__) || defined(__i386__) @@ -123,6 +128,7 @@ static inline uint64_t toku_current_time_microsec(void) { return t.tv_sec * (1UL * 1000 * 1000) + t.tv_usec; } +#if 0 // sleep microseconds static inline void toku_sleep_microsec(uint64_t ms) { struct timeval t; @@ -132,3 +138,20 @@ static inline void toku_sleep_microsec(uint64_t ms) { select(0, NULL, NULL, NULL, &t); } +#endif + +/* + PORT: Usage of this file: + + uint64_t toku_current_time_microsec() // uses gettimeoday + is used to track how much time various operations took (for example, lock + escalation). (TODO: it is not clear why these operations are tracked with + microsecond precision while others use nanoseconds) + + tokutime_t toku_time_now() // uses rdtsc + seems to be used for a very similar purpose. This has greater precision + + RocksDB environment provides Env::Default()->NowMicros() and NowNanos() which + should be adequate substitutes. +*/ +

1 0

[Commits] fde7d61d0a7: Test fixes.
by jan 10 Mar '19

10 Mar '19

revision-id: fde7d61d0a716a35a3065d0bfcb4a830e7106c85 (mariadb-10.2.22-48-gfde7d61d0a7) parent(s): cdb2dc82c181c8257016de1cba9c5563bc32986f author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-10 17:15:27 +0200 message: Test fixes. --- mysql-test/suite/galera/r/galera_kill_smallchanges.result | 2 +- mysql-test/suite/galera/t/galera_kill_smallchanges.test | 4 ++-- mysql-test/suite/galera/t/galera_var_slave_threads.test | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_kill_smallchanges.result b/mysql-test/suite/galera/r/galera_kill_smallchanges.result index 07d1d12ef9e..e4d7161c71a 100644 --- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result +++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result @@ -1,6 +1,5 @@ connection node_1; connection node_2; -call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); connection node_1; SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; @@ -10,6 +9,7 @@ connection node_1; INSERT INTO t1 VALUES (1); connection node_2; connection node_2a; +call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); SELECT COUNT(*) = 1 FROM t1; COUNT(*) = 1 1 diff --git a/mysql-test/suite/galera/t/galera_kill_smallchanges.test b/mysql-test/suite/galera/t/galera_kill_smallchanges.test index 07c9dd52b3e..3f39478fcd5 100644 --- a/mysql-test/suite/galera/t/galera_kill_smallchanges.test +++ b/mysql-test/suite/galera/t/galera_kill_smallchanges.test @@ -9,8 +9,6 @@ --let $node_2=node_2 --source include/auto_increment_offset_save.inc -call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); - --connection node_1 # Enable the master to continue running during the split-brain situation that @@ -34,6 +32,8 @@ INSERT INTO t1 VALUES (1); --source include/galera_connect.inc --connection node_2a +call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); + SELECT COUNT(*) = 1 FROM t1; SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; diff --git a/mysql-test/suite/galera/t/galera_var_slave_threads.test b/mysql-test/suite/galera/t/galera_var_slave_threads.test index 80edcb2aff9..be612bb74e9 100644 --- a/mysql-test/suite/galera/t/galera_var_slave_threads.test +++ b/mysql-test/suite/galera/t/galera_var_slave_threads.test @@ -19,6 +19,7 @@ SET GLOBAL wsrep_slave_threads = 0; SHOW WARNINGS; SELECT @@wsrep_slave_threads = 1; +--echo # wsrep_slave_threads = 1 SET GLOBAL wsrep_slave_threads = 1; # There is a separate wsrep_aborter thread at all times SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; @@ -37,8 +38,9 @@ INSERT INTO t1 VALUES (1); --let $wait_condition = SELECT COUNT(*) = 1 FROM t1; --source include/wait_condition.inc -SELECT COUNT(*) = 1 FROM t1; +SELECT COUNT(*) FROM t1; +--echo # wsrep_slave_threads = 64 --let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%'); --source include/wait_condition.inc @@ -53,7 +55,7 @@ SET GLOBAL wsrep_slave_threads = 1; --disable_result_log --disable_query_log # Generate 64 replication events ---let $count = 64 +--let $count = 66 while ($count) { INSERT INTO t2 VALUES (DEFAULT); @@ -65,11 +67,11 @@ while ($count) --connection node_2 SELECT COUNT(*) FROM t2; +--echo # wsrep_slave_threads = 1 --let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%') --source include/wait_condition.inc SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; - --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig DROP TABLE t1; @@ -84,6 +86,7 @@ CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=INNODB; --connection node_2 SET GLOBAL wsrep_slave_threads = 4; +--echo # wsrep_slave_threads = 4 --let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%') --source include/wait_condition.inc @@ -93,6 +96,9 @@ SET GLOBAL wsrep_slave_threads = 1; INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); DROP TABLE t1; --connection node_2

1 0