fix comments

vesoft-inc · Dec 14, 2021 · aed13a1 · aed13a1
1 parent 686ae90
commit aed13a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/storage/admin/AdminTask.h b/src/storage/admin/AdminTask.h
@@ -71,7 +71,6 @@ class AdminTask {
   virtual int8_t getPriority() { return static_cast<int8_t>(ctx_.pri_); }
 
   virtual void finish() {
-    isRunning_ = false;
     finish(rc_);
   }
 
@@ -80,7 +79,7 @@ class AdminTask {
               ctx_.jobId_,
               ctx_.taskId_,
               apache::thrift::util::enumNameSafe(rc).c_str());
-    isRunning_ = false;
+    running_ = false;
     nebula::meta::cpp2::StatsItem statsItem;
     ctx_.onFinish_(rc, statsItem);
   }
@@ -113,7 +112,7 @@ class AdminTask {
     rc_.compare_exchange_strong(suc, nebula::cpp2::ErrorCode::E_USER_CANCEL);
   }
 
-  virtual bool isRunning() { return isRunning_; }
+  virtual bool isRunning() { return running_; }
 
   virtual bool isCanceled() { return canceled_; }
 
@@ -122,7 +121,7 @@ class AdminTask {
  public:
   std::atomic<size_t> unFinishedSubTask_;
   SubTaskQueue subtasks_;
-  std::atomic<bool> isRunning_{false};
+  std::atomic<bool> running_{false};
 
  protected:
   StorageEnv* env_;

diff --git a/src/storage/admin/AdminTaskManager.cpp b/src/storage/admin/AdminTaskManager.cpp
@@ -264,7 +264,7 @@ void AdminTaskManager::schedule() {
       continue;
     }
 
-    task->isRunning_ = true;
+    task->running_ = true;
     auto errOrSubTasks = task->genSubTasks();
     if (!nebula::ok(errOrSubTasks)) {
       LOG(ERROR) << folly::sformat(
@@ -369,7 +369,7 @@ bool AdminTaskManager::isFinished(JobID jobID, TaskID taskID) {
   return iter->second->unFinishedSubTask_ == 0;
 }
 
-void AdminTaskManager::cancelJobs(GraphSpaceID spaceId) {
+void AdminTaskManager::cancelTasks(GraphSpaceID spaceId) {
   auto it = tasks_.begin();
   while (it != tasks_.end()) {
     if (it->second->getSpaceId() == spaceId) {
@@ -395,7 +395,7 @@ int32_t AdminTaskManager::runningJobCnt(GraphSpaceID spaceId) {
 }
 
 void AdminTaskManager::waitCancelJobs(GraphSpaceID spaceId) {
-  cancelJobs(spaceId);
+  cancelTasks(spaceId);
   while (runningJobCnt(spaceId) != 0) {
     usleep(1000 * 100);
   }

diff --git a/src/storage/admin/AdminTaskManager.h b/src/storage/admin/AdminTaskManager.h
@@ -53,7 +53,7 @@ class AdminTaskManager : public meta::AdminTaskStatusReporter {
   nebula::cpp2::ErrorCode cancelJob(JobID jobId);
   nebula::cpp2::ErrorCode cancelTask(JobID jobId, TaskID taskId = -1);
 
-  void cancelJobs(GraphSpaceID spaceId);
+  void cancelTasks(GraphSpaceID spaceId);
   int32_t runningJobCnt(GraphSpaceID spaceId);
   void waitCancelJobs(GraphSpaceID spaceId) override;
 

diff --git a/src/storage/admin/StatsTask.cpp b/src/storage/admin/StatsTask.cpp
@@ -75,7 +75,7 @@ nebula::cpp2::ErrorCode StatsTask::genSubTask(GraphSpaceID spaceId,
                                               std::unordered_map<EdgeType, std::string> edges) {
   if (UNLIKELY(canceled_)) {
     LOG(ERROR) << "Stats task is canceled";
-    return nebula::cpp2::ErrorCode::SUCCEEDED;
+    return nebula::cpp2::ErrorCode::E_USER_CANCEL;
   }
 
   auto vIdLenRet = env_->schemaMan_->getSpaceVidLen(spaceId);