From a446ca06df009d954003fc821dfa8a0442add218 Mon Sep 17 00:00:00 2001 From: zhiru Date: Thu, 27 Jun 2019 15:52:22 +0800 Subject: [PATCH] update Former-commit-id: fd63b5e267c522b854b94eb302a5c43f0e33d6bb --- cpp/src/db/DBImpl.cpp | 1 + cpp/src/db/MySQLConnectionPool.h | 2 +- cpp/src/db/MySQLMetaImpl.cpp | 5 +++-- cpp/src/server/DBWrapper.cpp | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index e39942d3..c7ee986c 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -600,6 +600,7 @@ void DBImpl::BackgroundCompaction(std::set table_ids) { int ttl = 1; if (options_.mode == "cluster") { ttl = meta::D_SEC; + ENGINE_LOG_DEBUG << "Server mode is cluster. Clean up files with ttl = " << std::to_string(ttl) << "seconds."; } meta_ptr_->CleanUpFilesWithTTL(ttl); } diff --git a/cpp/src/db/MySQLConnectionPool.h b/cpp/src/db/MySQLConnectionPool.h index 63ae6582..ade150a6 100644 --- a/cpp/src/db/MySQLConnectionPool.h +++ b/cpp/src/db/MySQLConnectionPool.h @@ -56,7 +56,7 @@ public: // ENGINE_LOG_DEBUG << "conns_in_use_ in release: " << conns_in_use_ << std::endl; --conns_in_use_; if (conns_in_use_ < 0) { - ENGINE_LOG_ERROR << "conns_in_use_ in release less than zero: " << conns_in_use_ << std::endl; + ENGINE_LOG_WARNING << "MySQLConnetionPool::release: conns_in_use_ is less than zero. conns_in_use_ = " << conns_in_use_ << std::endl; } } diff --git a/cpp/src/db/MySQLMetaImpl.cpp b/cpp/src/db/MySQLMetaImpl.cpp index 4384e26d..5c0725ef 100644 --- a/cpp/src/db/MySQLMetaImpl.cpp +++ b/cpp/src/db/MySQLMetaImpl.cpp @@ -448,9 +448,10 @@ namespace meta { Query deleteTableFilesQuery = connectionPtr->query(); // deleteTableFilesQuery << "UPDATE TableFiles " << - "SET state = " << std::to_string(TableSchema::TO_DELETE) << ", " << + "SET file_type = " << std::to_string(TableSchema::TO_DELETE) << ", " << "updated_time = " << std::to_string(utils::GetMicroSecTimeStamp()) << " " << - "WHERE table_id = " << quote << table_id << ";"; + "WHERE table_id = " << quote << table_id << " AND " << + "file_type <> " << std::to_string(TableSchema::TO_DELETE) << ";"; if (!deleteTableFilesQuery.exec()) { ENGINE_LOG_ERROR << "QUERY ERROR WHEN DELETING TABLE FILES"; diff --git a/cpp/src/server/DBWrapper.cpp b/cpp/src/server/DBWrapper.cpp index c38c5d88..6ad308a8 100644 --- a/cpp/src/server/DBWrapper.cpp +++ b/cpp/src/server/DBWrapper.cpp @@ -23,7 +23,9 @@ DBWrapper::DBWrapper() { if(index_size > 0) {//ensure larger than zero, unit is MB opt.index_trigger_size = (size_t)index_size * engine::ONE_MB; } - opt.mode = config.GetValue(CONFIG_CLUSTER_MODE, "single"); + ConfigNode& serverConfig = ServerConfig::GetInstance().GetConfig(CONFIG_SERVER); + opt.mode = serverConfig.GetValue(CONFIG_CLUSTER_MODE, "single"); +// std::cout << "mode = " << opt.mode << std::endl; CommonUtil::CreateDirectory(opt.meta.path); -- GitLab