Merge pull request #5572 from inikep/PS-9395-8.0-percona-202404

PS-9395 [8.0]: Merge RocksDB tags: percona-202401 to percona-202404 from fb-mysql-8.0.32

Author: inikep

azure-pipelines.yml

@@ -278,30 +278,16 @@ jobs:
         CompilerVer: 8
         BuildType: Debug
 
-      ${{ if or(ne(variables['Build.Reason'], 'PullRequest'), contains(variables['Build.SourceBranchName'], 'fullci')) }}:
-        clang-7 RelWithDebInfo [Ubuntu 20.04 Focal]:
-          imageName: 'ubuntu-20.04'
-          Compiler: clang
-          CompilerVer: 7
-          BuildType: RelWithDebInfo
-
-      ${{ if or(ne(variables['Build.Reason'], 'PullRequest'), contains(variables['Build.SourceBranchName'], 'fullci')) }}:
-        clang-7 Debug [Ubuntu 20.04 Focal]:
-          imageName: 'ubuntu-20.04'
-          Compiler: clang
-          CompilerVer: 7
-          BuildType: Debug
-
-      clang-6 RelWithDebInfo [Ubuntu 20.04 Focal]:
+      clang-7 RelWithDebInfo [Ubuntu 20.04 Focal]:
         imageName: 'ubuntu-20.04'
         Compiler: clang
-        CompilerVer: 6.0
+        CompilerVer: 7
         BuildType: RelWithDebInfo
 
-      clang-6 Debug [Ubuntu 20.04 Focal]:
+      clang-7 Debug [Ubuntu 20.04 Focal]:
         imageName: 'ubuntu-20.04'
         Compiler: clang
-        CompilerVer: 6.0
+        CompilerVer: 7
         BuildType: Debug
 
 

include/memory_debugging.h

@@ -42,11 +42,27 @@
 #include <valgrind/memcheck.h>
 
 #define MEM_UNDEFINED(a, len) VALGRIND_MAKE_MEM_UNDEFINED(a, len)
-#define MEM_DEFINED_IF_ADDRESSABLE(a, len) \
-  VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(a, len)
+// #define MEM_DEFINED_IF_ADDRESSABLE(a, len)
+//   VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(a, len)
 #define MEM_NOACCESS(a, len) VALGRIND_MAKE_MEM_NOACCESS(a, len)
 #define MEM_CHECK_ADDRESSABLE(a, len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a, len)
 
+#elif defined(HAVE_ASAN)
+
+#include <cassert>
+#include <sanitizer/asan_interface.h>
+
+#define MEM_MALLOCLIKE_BLOCK(p1, p2, p3, p4) ASAN_UNPOISON_MEMORY_REGION(p1, p2)
+#define MEM_FREELIKE_BLOCK(p1, p2, p3, p4) ASAN_POISON_MEMORY_REGION(p1, p2)
+
+#define MEM_UNDEFINED(a, len) ASAN_UNPOISON_MEMORY_REGION(a, len)
+#define MEM_NOACCESS(a, len) ASAN_POISON_MEMORY_REGION(a, len)
+
+// In the case of error, this will immediatelly terminate the process instead of
+// printing an error and continuing, which is more common for ASan errors.
+// Change it to log and continue if that becomes an issue.
+#define MEM_CHECK_ADDRESSABLE(a, len) assert(!__asan_region_is_poisoned(a, len))
+
 #else /* HAVE_VALGRIND */
 
 #define MEM_MALLOCLIKE_BLOCK(p1, p2, p3, p4) \
@@ -56,13 +72,18 @@
   do {                             \
   } while (0)
 #define MEM_UNDEFINED(a, len) ((void)0)
-#define MEM_DEFINED_IF_ADDRESSABLE(a, len) ((void)0)
+// #define MEM_DEFINED_IF_ADDRESSABLE(a, len) ((void)0)
 #define MEM_NOACCESS(a, len) ((void)0)
 #define MEM_CHECK_ADDRESSABLE(a, len) ((void)0)
 
-#endif
+#endif /* HAVE_VALGRIND */
+
+// Not used in the current sources. If it starts being used after a rebase,
+// somehow implement it (could be an unconditional unpoison?) for the HAVE_ASAN
+// case above.
+#pragma GCC poison MEM_DEFINED_IF_ADDRESSABLE
 
-#if !defined(NDEBUG) || defined(HAVE_VALGRIND)
+#if !defined(NDEBUG) || defined(HAVE_VALGRIND) || defined(HAVE_ASAN)
 
 /**
   Put bad content in memory to be sure it will segfault if dereferenced.

mysql-test/include/restart_with_mysqld_safe.inc

@@ -29,12 +29,19 @@ let $MYSQL_TIMEZONE= `SELECT @@time_zone`;
 let $MYSQL_PIDFILE= `SELECT @@pid_file`;
 let $MYSQL_PORT= `SELECT @@port`;
 let $MYSQL_MESSAGESDIR= `SELECT @@lc_messages_dir`;
-let $MYSQLX_PORT= `SELECT @@mysqlx_port`;
-let $MYSQLX_SOCKET= `SELECT @@mysqlx_socket`;
 let $start_page_size= `select @@innodb_page_size`;
 let $other_page_size_k= `SELECT $start_page_size DIV 1024`;
 let $other_page_size_nk= `SELECT CONCAT($other_page_size_k,'k')`;
 
+let $have_mysqlx= `SELECT count(plugin_status) > 0 FROM information_schema.plugins WHERE plugin_name LIKE 'mysqlx' and plugin_status LIKE 'ACTIVE'`;
+
+--let $MYSQLX_ARGS= ""
+if ($have_mysqlx) {
+  --let $MYSQLX_SOCKET= `SELECT @@mysqlx_socket`
+  --let $MYSQLX_PORT= `SELECT @@mysqlx_port`
+  --let $MYSQLX_ARGS= --mysqlx_socket=$MYSQLX_SOCKET --mysqlx_port=$MYSQLX_PORT
+}
+
 # mysqld_path to be passed to --ledir
 # use test;
 perl;
@@ -60,7 +67,7 @@ EOF
 --shutdown_server
 --source include/wait_until_disconnected.inc
 
---exec sh $MYSQLD_SAFE --defaults-file=$MYSQLTEST_VARDIR/my.cnf --server_id=$_server_id --log-error=$MYSQLTEST_VARDIR/log/mysqld.$_server_id.err --basedir=$MYSQL_BASEDIR --ledir=$mysqld_path --mysqld=$mysqld_bin --datadir=$MYSQLD_DATADIR --socket=$MYSQL_SOCKET --mysqlx_socket=$MYSQLX_SOCKET --pid-file=$MYSQL_PIDFILE --port=$MYSQL_PORT --mysqlx_port=$MYSQLX_PORT --timezone=SYSTEM --log-output=file --loose-debug-sync-timeout=600 --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB  --secure-file-priv="" --core-file --lc-messages-dir=$MYSQL_MESSAGESDIR --innodb-page-size=$other_page_size_nk --log-error-verbosity=3 --plugin-dir=$MYSQL_PLUGINDIR --plugin-load=$plugin_list $mysqld_extra_settings  < /dev/null > /dev/null 2>&1 &
+--exec sh $MYSQLD_SAFE --defaults-file=$MYSQLTEST_VARDIR/my.cnf --server_id=$_server_id --log-error=$MYSQLTEST_VARDIR/log/mysqld.$_server_id.err --basedir=$MYSQL_BASEDIR --ledir=$mysqld_path --mysqld=$mysqld_bin --datadir=$MYSQLD_DATADIR --socket=$MYSQL_SOCKET --pid-file=$MYSQL_PIDFILE --port=$MYSQL_PORT $MYSQLX_ARGS --timezone=SYSTEM --log-output=file --loose-debug-sync-timeout=600 --default-storage-engine=InnoDB --default-tmp-storage-engine=InnoDB  --secure-file-priv="" --core-file --lc-messages-dir=$MYSQL_MESSAGESDIR --innodb-page-size=$other_page_size_nk --log-error-verbosity=3 --plugin-dir=$MYSQL_PLUGINDIR --plugin-load=$plugin_list $mysqld_extra_settings  < /dev/null > /dev/null 2>&1 &
 
 --enable_reconnect
 --source include/wait_until_connected_again.inc

mysql-test/suite/auth_sec/t/skip_grant_protocols-master.opt

@@ -1 +1 @@
---mysqlx=OFF
+--loose-mysqlx=OFF

mysql-test/suite/auth_sec/t/skip_grant_protocols_windows-master.opt

@@ -1 +1 @@
---mysqlx=OFF
+--loose-mysqlx=OFF

mysql-test/suite/clone/include/clone_connection_begin.inc

@@ -64,6 +64,8 @@ if ($SERVER_ID != 1) {
 # A. Check if we need monitoring process. Taken from mysqld_safe.test
 if ($inst_monitor) {
 
+  --let $have_mysqlx= `SELECT count(plugin_status) > 0 FROM information_schema.plugins WHERE plugin_name LIKE 'mysqlx' and plugin_status LIKE 'ACTIVE'`
+
   # 1. Set variables to be used in parameters of mysqld_safe.
   --let $SERVER_ID= `SELECT @@server_id`
   --let $MYSQLD_DATADIR= `SELECT @@datadir`
@@ -74,7 +76,12 @@ if ($inst_monitor) {
   --let $MYSQL_SOCKET= `SELECT @@socket`
   --let $MYSQLX_SOCKET= `SELECT @@mysqlx_socket`
   --let $MYSQL_PORT= `SELECT @@port`
-  --let $MYSQLX_PORT= `SELECT @@mysqlx_port`
+  --let $MYSQLX_ARGS= ""
+  if ($have_mysqlx) {
+    --let $MYSQLX_SOCKET= `SELECT @@mysqlx_socket`
+    --let $MYSQLX_PORT= `SELECT @@mysqlx_port`
+    --let $MYSQLX_ARGS= --mysqlx_socket=$MYSQLX_SOCKET --mysqlx_port=$MYSQLX_PORT
+  }
   --let $MYSQL_PLUGIN_DIR = `SELECT @@plugin_dir`
 
   --let $page_size= `select @@innodb_page_size`

mysql-test/suite/innodb/t/upgrade_compressed_recv-master.opt

@@ -1 +1 @@
---mysqlx=OFF
+--loose-mysqlx=OFF

mysql-test/suite/perfschema/t/transaction_nested_events-master.opt

@@ -14,4 +14,4 @@
 --loose-performance-schema-consumer-events-waits-current=OFF
 --loose-performance-schema-consumer-events-waits-history=OFF
 --loose-performance-schema-consumer-events-waits-history-long=OFF
---mysqlx=OFF
+--loose-mysqlx=OFF

mysql-test/suite/rocksdb/combinations

@@ -104,6 +104,7 @@ start transaction with consistent snapshot;
 select VALUE > 0 as 'Has opened snapshots' from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS';
 
 connection default;
+set sql_log_bin = 0;
 set rocksdb_bulk_load=1;
 set rocksdb_bulk_load_size=100000;
 --disable_query_log
@@ -115,6 +116,7 @@ eval LOAD DATA INFILE '$file' INTO TABLE t2;
 eval LOAD DATA INFILE '$file' INTO TABLE t3;
 --enable_query_log
 set rocksdb_bulk_load=0;
+set sql_log_bin = 1;
 
 --remove_file $file