mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Post-merge fix: Rdb_io_watchdog doesn't support windows

Browse source 
So disable it there for now.
This commit is contained in:
Sergei Petrunia 2017-07-31 17:34:47 +00:00
commit 61ca3cf524
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
storage/rocksdb/CMakeLists.txt
View file

@ -126,7 +126,7 @@ endif()
INCLUDE(build_rocksdb.cmake) INCLUDE(build_rocksdb.cmake)
ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib set(rocksdb_aux_lib_sources
ha_rocksdb_proto.h ha_rocksdb_proto.h
logger.h logger.h
rdb_comparator.h rdb_comparator.h
@ -143,6 +143,16 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib
rdb_mariadb_port.h rdb_mariadb_port.h
) )
if(WIN32)
else()
list(APPEND rocksdb_aux_lib_sources
rdb_io_watchdog.cc
rdb_io_watchdog.h
)
endif()
ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib ${rocksdb_aux_lib_sources})
ADD_DEPENDENCIES(rocksdb_aux_lib GenError) ADD_DEPENDENCIES(rocksdb_aux_lib GenError)
# MARIAROCKS-TODO: how to properly depend on -lrt ? # MARIAROCKS-TODO: how to properly depend on -lrt ?

13
storage/rocksdb/ha_rocksdb.cc
View file

@ -164,8 +164,10 @@ Rdb_cf_manager cf_manager;
Rdb_ddl_manager ddl_manager; Rdb_ddl_manager ddl_manager;
const char *m_mysql_gtid; const char *m_mysql_gtid;
Rdb_binlog_manager binlog_manager; Rdb_binlog_manager binlog_manager;
Rdb_io_watchdog *io_watchdog = nullptr;
#ifndef _WIN32
Rdb_io_watchdog *io_watchdog = nullptr;
#endif
/** /**
MyRocks background thread control MyRocks background thread control
N.B. This is besides RocksDB's own background threads N.B. This is besides RocksDB's own background threads
@ -544,15 +546,18 @@ static void rocksdb_set_io_write_timeout(
void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) { void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) {
DBUG_ASSERT(save != nullptr); DBUG_ASSERT(save != nullptr);
DBUG_ASSERT(rdb != nullptr); DBUG_ASSERT(rdb != nullptr);
#ifndef _WIN32
DBUG_ASSERT(io_watchdog != nullptr); DBUG_ASSERT(io_watchdog != nullptr);
#endif
RDB_MUTEX_LOCK_CHECK(rdb_sysvars_mutex); RDB_MUTEX_LOCK_CHECK(rdb_sysvars_mutex);
const uint32_t new_val = *static_cast<const uint32_t *>(save); const uint32_t new_val = *static_cast<const uint32_t *>(save);
rocksdb_io_write_timeout_secs = new_val; rocksdb_io_write_timeout_secs = new_val;
#ifndef _WIN32
io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs); io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
#endif
RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex); RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);
} }
@ -3971,8 +3976,10 @@ static int rocksdb_init_func(void *const p) {
directories.push_back(myrocks::rocksdb_wal_dir); directories.push_back(myrocks::rocksdb_wal_dir);
} }
#ifndef _WIN32
io_watchdog = new Rdb_io_watchdog(directories); io_watchdog = new Rdb_io_watchdog(directories);
io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs); io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
#endif
// NO_LINT_DEBUG // NO_LINT_DEBUG
sql_print_information("MyRocks storage engine plugin has been successfully " sql_print_information("MyRocks storage engine plugin has been successfully "
@ -4061,8 +4068,10 @@ static int rocksdb_done_func(void *const p) {
delete commit_latency_stats; delete commit_latency_stats;
commit_latency_stats = nullptr; commit_latency_stats = nullptr;
#ifndef _WIN32
delete io_watchdog; delete io_watchdog;
io_watchdog = nullptr; io_watchdog = nullptr;
#endif
// Disown the cache data since we're shutting down. // Disown the cache data since we're shutting down.
// This results in memory leaks but it improved the shutdown time. // This results in memory leaks but it improved the shutdown time.

4
storage/rocksdb/rdb_io_watchdog.h
View file

@ -34,6 +34,9 @@
namespace myrocks { namespace myrocks {
// Rdb_io_watchdog does not support Windows ATM.
#ifndef _WIN32
class Rdb_io_watchdog { class Rdb_io_watchdog {
const int RDB_IO_WRITE_BUFFER_SIZE = 4096; const int RDB_IO_WRITE_BUFFER_SIZE = 4096;
const char *const RDB_IO_DUMMY_FILE_NAME = "myrocks_io_watchdog_write_file"; const char *const RDB_IO_DUMMY_FILE_NAME = "myrocks_io_watchdog_write_file";
@ -110,4 +113,5 @@ class Rdb_io_watchdog {
Rdb_io_watchdog &operator=(const Rdb_io_watchdog &) = delete; Rdb_io_watchdog &operator=(const Rdb_io_watchdog &) = delete;
}; };
#endif
} // namespace myrocks } // namespace myrocks