change some output log (OpenAtomFoundation#630)

kacha886 · May 16, 2019 · 74c2d88 · 74c2d88
1 parent 652eea2
commit 74c2d88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/pika_repl_client_conn.cc b/src/pika_repl_client_conn.cc
@@ -109,9 +109,9 @@ void PikaReplClientConn::HandleMetaSyncResponse(void* arg) {
   bool force_full_sync = g_pika_server->force_full_sync();
   std::vector<TableStruct> self_table_structs = g_pika_conf->table_structs();
   if (!PikaReplClientConn::IsTableStructConsistent(self_table_structs, master_table_structs)) {
-    LOG(WARNING) << "Self table structs(db size: " << self_table_structs.size()
-      <<  ") inconsistent with master(db size: " << master_table_structs.size()
-      << ", failed to establish master-slave relationship";
+    LOG(WARNING) << "Self table structs(number of databases: " << self_table_structs.size()
+      << ") inconsistent with master(number of databases: " << master_table_structs.size()
+      << "), failed to establish master-slave relationship";
     g_pika_server->SyncError();
     conn->NotifyClose();
     delete task_arg;

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -372,6 +372,7 @@ void PikaServer::InitTableStruct() {
   std::string log_path = g_pika_conf->log_path();
   std::string trash_path = g_pika_conf->trash_path();
   std::vector<TableStruct> table_structs = g_pika_conf->table_structs();
+  slash::RWLock rwl(&tables_rw_, true);
   for (const auto& table : table_structs) {
     std::string name = table.table_name;
     uint32_t num = table.partition_num;