Meta add slow log and update floyd

Qihoo360 · Jan 8, 2018 · b074ee4 · b074ee4
1 parent 90e684c
commit b074ee4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/meta/zp_meta_client_conn.cc b/src/meta/zp_meta_client_conn.cc
@@ -83,7 +83,16 @@ int ZPMetaClientConn::DealMessage() {
 
   g_meta_server->PlusQueryNum();
 
+  uint64_t start_us = slash::NowMicros();
+
   cmd->Do(&request_, &response_);
   res_ = &response_;
+
+  int64_t duration = slash::NowMicros() - start_us;
+  if (g_zp_conf->slowlog_slower_than() > 0
+      && duration > g_zp_conf->slowlog_slower_than()) {
+    LOG(WARNING) << "slow client command:" << cmd->name()
+      << ", duration(us): " << duration;
+  }
   return 0;
 }
diff --git a/src/meta/zp_meta_server.cc b/src/meta/zp_meta_server.cc
@@ -605,8 +605,8 @@ Status ZPMetaServer::GetMetaStatus(ZPMeta::MetaCmdResponse_MetaStatus* ms) {
   std::string* floyd_status = ms->mutable_consistency_stautus();
   floyd_->GetServerStatus(floyd_status);
   ZPMeta::MigrateStatus migrate_s;
-  Status s = migrate_register_->Check(&migrate_s);
-  if (s.ok()) {
+  if (IsLeader()
+      && migrate_register_->Check(&migrate_s).ok()) {
     ms->mutable_migrate_status()->CopyFrom(migrate_s);
   }
   return Status::OK();
@@ -1009,7 +1009,7 @@ void ZPMetaServer::InitClientCmdTable() {
         listmetaptr));
 
   // MetaStatus Command
-  Cmd* meta_status_ptr = new MetaStatusCmd(kCmdFlagsRead | kCmdFlagsRedirect);
+  Cmd* meta_status_ptr = new MetaStatusCmd(kCmdFlagsRead);
   cmds_.insert(std::pair<int, Cmd*>(static_cast<int>(ZPMeta::Type::METASTATUS),
         meta_status_ptr));
 

diff --git a/src/meta/zp_meta_server.h b/src/meta/zp_meta_server.h
@@ -160,7 +160,6 @@ class ZPMetaServer  {
     return role_ != MetaRole::kNone;
   }
 
-
  private:
   // Server related
   std::atomic<bool> should_exit_;

diff --git a/src/node/zp_data_partition.cc b/src/node/zp_data_partition.cc
@@ -823,7 +823,8 @@ void Partition::DoBinlogCommand(const PartitionSyncOption& option,
   int64_t duration = slash::NowMicros() - start_us;
   zp_data_server->PlusLatencyStat(
     StatType::kSync, table_name_, cmd->type_, duration / 1000);
-  if (duration > g_zp_conf->slowlog_slower_than()) {
+  if (g_zp_conf->slowlog_slower_than() > 0
+      && duration > g_zp_conf->slowlog_slower_than()) {
     LOG(WARNING) << "slow sync command:" << cmd->name()
       << ", duration(us): " << duration
       << ", For " << table_name_ << "_" << partition_id_;
@@ -928,7 +929,8 @@ void Partition::DoCommand(const Cmd* cmd, const client::CmdRequest &req,
   int64_t duration = slash::NowMicros() - start_us;
   zp_data_server->PlusLatencyStat(
     StatType::kClient, table_name_, cmd->type_, duration / 1000);
-  if (duration > g_zp_conf->slowlog_slower_than()) {
+  if (g_zp_conf->slowlog_slower_than() > 0
+      && duration > g_zp_conf->slowlog_slower_than()) {
     LOG(WARNING) << "slow client command:" << cmd->name()
       << ", duration(us): " << duration
       << ", For " << table_name_ << "_" << partition_id_;

diff --git a/third/floyd b/third/floyd