remove rebuild index guard when job finished (#4722)

* remove rebuild index guard when job finished * fix reenter problem Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>
vesoft-inc · Oct 17, 2022 · edb8fff · edb8fff
1 parent 8002213
commit edb8fff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/storage/admin/RebuildIndexTask.cpp b/src/storage/admin/RebuildIndexTask.cpp
@@ -17,6 +17,17 @@ const int32_t kReserveNum = 1024 * 4;
 bool RebuildIndexTask::check() {
   return env_->kvstore_ != nullptr;
 }
+void RebuildIndexTask::finish(nebula::cpp2::ErrorCode rc) {
+  if (changedSpaceGuard_) {
+    auto space = *ctx_.parameters_.space_id_ref();
+    for (auto it = env_->rebuildIndexGuard_->begin(); it != env_->rebuildIndexGuard_->end(); ++it) {
+      if (std::get<0>(it->first) == space) {
+        env_->rebuildIndexGuard_->insert_or_assign(it->first, IndexState::FINISHED);
+      }
+    }
+  }
+  AdminTask::finish(rc);
+}
 
 RebuildIndexTask::RebuildIndexTask(StorageEnv* env, TaskContext&& ctx)
     : AdminTask(env, std::move(ctx)) {
@@ -71,6 +82,7 @@ ErrorOr<nebula::cpp2::ErrorCode, std::vector<AdminSubTask>> RebuildIndexTask::ge
   for (const auto& part : parts) {
     env_->rebuildIndexGuard_->insert_or_assign(std::make_tuple(space_, part), IndexState::STARTING);
     TaskFunction task = std::bind(&RebuildIndexTask::invoke, this, space_, part, items);
+    changedSpaceGuard_ = true;
     tasks.emplace_back(std::move(task));
   }
   return tasks;

diff --git a/src/storage/admin/RebuildIndexTask.h b/src/storage/admin/RebuildIndexTask.h
@@ -23,6 +23,8 @@ using IndexItems = std::vector<std::shared_ptr<meta::cpp2::IndexItem>>;
  */
 class RebuildIndexTask : public AdminTask {
  public:
+  using AdminTask::finish;
+
   RebuildIndexTask(StorageEnv* env, TaskContext&& ctx);
 
   ~RebuildIndexTask() {
@@ -31,6 +33,8 @@ class RebuildIndexTask : public AdminTask {
 
   bool check() override;
 
+  void finish(nebula::cpp2::ErrorCode rc) override;
+
   /**
    * @brief Generate subtasks for rebuilding index.
    *
@@ -71,6 +75,7 @@ class RebuildIndexTask : public AdminTask {
 
  protected:
   GraphSpaceID space_;
+  bool changedSpaceGuard_{false};
 };
 
 }  // namespace storage