add timestamp for deleting suffix when flushdb

include/pika_db.h

@@ -148,9 +148,6 @@ class DB : public std::enable_shared_from_this<DB>, public pstd::noncopyable {
   bool IsBgSaving();
   BgSaveInfo bgsave_info();
   pstd::Status GetKeyNum(std::vector<storage::KeyInfo>* key_info);
-  void ResetIsFlushingDBToFalse() {
-    is_flushing_db_.store(false);
-  }
 
  private:
   bool opened_ = false;
@@ -163,7 +160,6 @@ class DB : public std::enable_shared_from_this<DB>, public pstd::noncopyable {
   pstd::Mutex key_info_protector_;
   std::atomic<bool> binlog_io_error_;
   std::shared_mutex dbs_rw_;
-  std::atomic<bool> is_flushing_db_;
   // class may be shared, using shared_ptr would be a better choice
   std::shared_ptr<pstd::lock::LockMgr> lock_mgr_;
   std::shared_ptr<storage::Storage> storage_;

include/pika_server.h

@@ -202,7 +202,6 @@ class PikaServer : public pstd::noncopyable {
    * Flushall & Flushdb used
    */
   void PurgeDir(const std::string& path);
-  void PurgeDirWithCallBack(const std::string& path, const std::function<void()>& call_back);
   void PurgeDirTaskSchedule(void (*function)(void*), void* arg);
 
   /*

src/pika_admin.cc

@@ -558,14 +558,14 @@ bool FlushallCmd::DoWithoutLock(std::shared_ptr<DB> db) {
   if (!db) {
     LOG(ERROR) << "Flushall, but DB not found";
     return false;
-  } else {
-    bool success = db->FlushDBWithoutLock();
-    if (!success) {
-      //if the db is not flushed, return before clear the cache
-      return success;
-    }
-    DoUpdateCache(db);
   }
+  bool success = db->FlushDBWithoutLock();
+  if (!success) {
+    // if the db is not flushed, return before clear the cache
+    return success;
+  }
+  DoUpdateCache(db);
+
   return true;
 }
 void FlushallCmd::DoBinlog() {

src/pika_db.cc

@@ -44,7 +44,6 @@ DB::DB(std::string db_name, const std::string& db_path,
   pstd::CreatePath(log_path_);
   lock_mgr_ = std::make_shared<pstd::lock::LockMgr>(1000, 0, std::make_shared<pstd::lock::MutexFactoryImpl>());
   binlog_io_error_.store(false);
-  is_flushing_db_.store(false);
   opened_ = s.ok();
   assert(storage_);
   assert(s.ok());
@@ -198,20 +197,18 @@ bool DB::FlushDBWithoutLock() {
     return false;
   }
 
-  bool expected = false;
-  if (!is_flushing_db_.compare_exchange_strong(expected, true, std::memory_order::memory_order_seq_cst)) {
-    LOG(WARNING) << db_name_ <<  ": Aborting curr FlushDB task due to the previous FlushDB task is still executing (deleting old db path is an async task)";
-    return false;
-  }
-
   LOG(INFO) << db_name_ << " Delete old db...";
   storage_.reset();
 
   std::string dbpath = db_path_;
   if (dbpath[dbpath.length() - 1] == '/') {
     dbpath.erase(dbpath.length() - 1);
   }
-  dbpath.append("_deleting/");
+  std::string delete_suffix("_deleting_");
+  delete_suffix.append(std::to_string(NowMicros()));
+  delete_suffix.append("/");
+  dbpath.append(delete_suffix);
+  LOG(INFO) << "remaned:" << dbpath;
   auto rename_success = pstd::RenameFile(db_path_, dbpath);
   storage_ = std::make_shared<storage::Storage>(g_pika_conf->db_instance_num(),
       g_pika_conf->default_slot_num(), g_pika_conf->classic_mode());
@@ -225,9 +222,7 @@ bool DB::FlushDBWithoutLock() {
   }
   LOG(INFO) << db_name_ << " Open new db success";
 
-  //when dbpath successfully deleted, a call back fun will reset flushing db flag to false, so the next FlushDB task can be exec
-  auto reset_flag_call_back = [this]{ this->ResetIsFlushingDBToFalse(); };
-  g_pika_server->PurgeDirWithCallBack(dbpath, reset_flag_call_back);
+  g_pika_server->PurgeDir(dbpath);
   return true;
 }
 

src/pika_server.cc

@@ -41,21 +41,6 @@ void DoPurgeDir(void* arg) {
   LOG(INFO) << "Delete dir: " << *path << " done";
 }
 
-struct PurgeDirArgsWithCallBackArgs {
-  PurgeDirArgsWithCallBackArgs(std::string path, const std::function<void()>& call_back)
-      : path_(std::move(path)), call_back_(call_back) {}
-  std::string path_;
-  std::function<void()> call_back_;
-};
-
-void DoPurgeDirWithCallBack(void* arg) {
-  std::unique_ptr<PurgeDirArgsWithCallBackArgs> args(static_cast<PurgeDirArgsWithCallBackArgs*>(arg));
-  LOG(INFO) << "Delete dir: " << args->path_ << " start";
-  pstd::DeleteDir(args->path_);
-  LOG(INFO) << "Delete dir: " << args->path_ << " done";
-  args->call_back_();
-}
-
 
 PikaServer::PikaServer()
     : exit_(false),
@@ -810,10 +795,6 @@ void PikaServer::PurgeDir(const std::string& path) {
   PurgeDirTaskSchedule(&DoPurgeDir, static_cast<void*>(dir_path));
 }
 
-void PikaServer::PurgeDirWithCallBack(const std::string& path, const std::function<void()>& call_back) {
-  auto args = new PurgeDirArgsWithCallBackArgs(path, call_back);
-  PurgeDirTaskSchedule(&DoPurgeDirWithCallBack, static_cast<void*>(args));
-}
 
 void PikaServer::PurgeDirTaskSchedule(void (*function)(void*), void* arg) {
   purge_thread_.set_thread_name("PurgeDirTask");