From db7606b7f1d1a8dc24d45df695e6dad5b7a83faf Mon Sep 17 00:00:00 2001
From: Alex Xing <90179377+SuperYoko@users.noreply.github.com>
Date: Tue, 31 Jan 2023 10:15:41 +0800
Subject: [PATCH] log enhance (#5261)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>
---
 src/meta/processors/job/JobManager.cpp | 10 +++++++---
 src/storage/admin/AdminTaskManager.cpp |  4 ++--
 src/storage/admin/RebuildIndexTask.cpp |  4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/meta/processors/job/JobManager.cpp b/src/meta/processors/job/JobManager.cpp
index 8b28bb0862a..64fc132f696 100644
--- a/src/meta/processors/job/JobManager.cpp
+++ b/src/meta/processors/job/JobManager.cpp
@@ -308,8 +308,7 @@ nebula::cpp2::ErrorCode JobManager::jobFinished(
     JobID jobId,
     cpp2::JobStatus jobStatus,
     std::optional<nebula::cpp2::ErrorCode> jobErrorCode) {
-  LOG(INFO) << folly::sformat("{}, spaceId={}, jobId={}, result={}",
-                              __func__,
+  LOG(INFO) << folly::sformat("Trying to end job, spaceId={}, jobId={}, target phase status={}",
                               spaceId,
                               jobId,
                               apache::thrift::util::enumNameSafe(jobStatus));
@@ -345,7 +344,7 @@ nebula::cpp2::ErrorCode JobManager::jobFinished(
   }
 
   if (!optJobDesc.setStatus(jobStatus, force)) {
-    // job already been set as finished, failed or stopped
+    LOG(INFO) << "Job already been set as finished, failed or stopped";
     return nebula::cpp2::ErrorCode::E_JOB_ALREADY_FINISH;
   }
 
@@ -360,6 +359,8 @@ nebula::cpp2::ErrorCode JobManager::jobFinished(
       std::unique_ptr<kvstore::KVIterator> iter;
       auto rc = kvStore_->prefix(kDefaultSpaceId, kDefaultPartId, jobKey, &iter);
       if (rc != nebula::cpp2::ErrorCode::SUCCEEDED) {
+        LOG(INFO) << "Failed to end job due to fetch job info failure:"
+                  << apache::thrift::util::enumNameSafe(rc);
         return rc;
       }
       for (; iter->valid(); iter->next()) {
@@ -966,6 +967,9 @@ nebula::cpp2::ErrorCode JobManager::save(const std::string& k, const std::string
   kvStore_->asyncMultiPut(
       kDefaultSpaceId, kDefaultPartId, std::move(data), [&](nebula::cpp2::ErrorCode code) {
         rc = code;
+        if (rc != nebula::cpp2::ErrorCode::SUCCEEDED) {
+          LOG(INFO) << "Save job failed with errorcode: " << apache::thrift::util::enumNameSafe(rc);
+        }
         baton.post();
       });
   baton.wait();
diff --git a/src/storage/admin/AdminTaskManager.cpp b/src/storage/admin/AdminTaskManager.cpp
index 80985f17a40..a3365724afe 100644
--- a/src/storage/admin/AdminTaskManager.cpp
+++ b/src/storage/admin/AdminTaskManager.cpp
@@ -89,7 +89,7 @@ void AdminTaskManager::handleUnreportedTasks() {
         if (errCode == nebula::cpp2::ErrorCode::SUCCEEDED) {
           pStats = &statsItem;
         }
-        LOG(INFO) << folly::sformat("reportTaskFinish(), job={}, task={}, rc={}",
+        LOG(INFO) << folly::sformat("reportTaskFinish(), job={}, task={}, task_rc={}",
                                     jobId,
                                     taskId,
                                     apache::thrift::util::enumNameSafe(errCode));
@@ -131,7 +131,7 @@ void AdminTaskManager::handleUnreportedTasks() {
           continue;
         }
         rc = fut.value().value();
-        LOG(INFO) << folly::sformat("reportTaskFinish(), job={}, task={}, rc={}",
+        LOG(INFO) << folly::sformat("reportTaskFinish(), job={}, task={}, report_rc={}",
                                     jId,
                                     tId,
                                     apache::thrift::util::enumNameSafe(rc));
diff --git a/src/storage/admin/RebuildIndexTask.cpp b/src/storage/admin/RebuildIndexTask.cpp
index bc6e22c98ca..e1f6f62e2dd 100644
--- a/src/storage/admin/RebuildIndexTask.cpp
+++ b/src/storage/admin/RebuildIndexTask.cpp
@@ -18,6 +18,7 @@ bool RebuildIndexTask::check() {
   return env_->kvstore_ != nullptr;
 }
 void RebuildIndexTask::finish(nebula::cpp2::ErrorCode rc) {
+  LOG(INFO) << "Finish rebuild index task in space " << *ctx_.parameters_.space_id_ref();
   if (changedSpaceGuard_) {
     auto space = *ctx_.parameters_.space_id_ref();
     for (auto it = env_->rebuildIndexGuard_->begin(); it != env_->rebuildIndexGuard_->end(); ++it) {
@@ -74,7 +75,8 @@ ErrorOr<nebula::cpp2::ErrorCode, std::vector<AdminSubTask>> RebuildIndexTask::ge
   std::vector<AdminSubTask> tasks;
   for (auto it = env_->rebuildIndexGuard_->cbegin(); it != env_->rebuildIndexGuard_->cend(); ++it) {
     if (std::get<0>(it->first) == space_ && it->second != IndexState::FINISHED) {
-      LOG(INFO) << "This space is building index";
+      LOG(INFO) << "This space " << space_ << " is building index on part "
+                << std::get<1>(it->first) << ", index status: " << static_cast<int32_t>(it->second);
       return nebula::cpp2::ErrorCode::E_REBUILD_INDEX_FAILED;
     }
   }