Merge branch 'master' into meta-client-stop

.github/workflows/nightly.yml

@@ -82,7 +82,8 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile.${{ matrix.service }}
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           tags: |
             vesoft/nebula-${{ matrix.service }}:nightly
           push: true

.github/workflows/rc.yml

@@ -82,7 +82,7 @@ jobs:
         id: tagname
       - id: docker
         run: |
-          majorver=$(git tag -l --sort=v:refname | tail -n1 | cut -f1 -d'.')
+          majorver=$(git tag -l --sort=v:refname | tail -n1 | cut -f1 -d".")
           tag=""
           if [[ $majorver == ${{ steps.tagname.outputs.majorver }} ]]; then
             tag="${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:latest"
@@ -99,7 +99,8 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile.${{ matrix.service }}
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           tags: |
             ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.tag }}
             ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.majorver }}

src/graph/executor/StorageAccessExecutor.h

@@ -79,7 +79,8 @@ class StorageAccessExecutor : public Executor {
         return Status::Error(std::move(error));
       }
       case nebula::cpp2::ErrorCode::E_LEADER_CHANGED:
-        return Status::Error("Storage Error: The leader has changed. Try again later");
+        return Status::Error(
+            folly::sformat("Storage Error: Not the leader of {}. Please retry later.", partId));
       case nebula::cpp2::ErrorCode::E_INVALID_FILTER:
         return Status::Error("Storage Error: Invalid filter.");
       case nebula::cpp2::ErrorCode::E_INVALID_UPDATER:
@@ -88,6 +89,8 @@ class StorageAccessExecutor : public Executor {
         return Status::Error("Storage Error: Invalid space vid len.");
       case nebula::cpp2::ErrorCode::E_SPACE_NOT_FOUND:
         return Status::Error("Storage Error: Space not found.");
+      case nebula::cpp2::ErrorCode::E_PART_NOT_FOUND:
+        return Status::Error(folly::sformat("Storage Error: Part {} not found.", partId));
       case nebula::cpp2::ErrorCode::E_TAG_NOT_FOUND:
         return Status::Error("Storage Error: Tag not found.");
       case nebula::cpp2::ErrorCode::E_TAG_PROP_NOT_FOUND:
@@ -108,14 +111,25 @@ class StorageAccessExecutor : public Executor {
             "The not null field doesn't have a default value.");
       case nebula::cpp2::ErrorCode::E_OUT_OF_RANGE:
         return Status::Error("Storage Error: Out of range value.");
-      case nebula::cpp2::ErrorCode::E_ATOMIC_OP_FAILED:
-        return Status::Error("Storage Error: Atomic operation failed.");
       case nebula::cpp2::ErrorCode::E_DATA_CONFLICT_ERROR:
         return Status::Error(
             "Storage Error: More than one request trying to "
             "add/update/delete one edge/vertex at the same time.");
       case nebula::cpp2::ErrorCode::E_FILTER_OUT:
         return Status::OK();
+      case nebula::cpp2::ErrorCode::E_RAFT_TERM_OUT_OF_DATE:
+        return Status::Error(folly::sformat(
+            "Storage Error: Term of part {} is out of date. Please retry later.", partId));
+      case nebula::cpp2::ErrorCode::E_RAFT_WAL_FAIL:
+        return Status::Error("Storage Error: Write wal failed. Probably disk is almost full.");
+      case nebula::cpp2::ErrorCode::E_RAFT_WRITE_BLOCKED:
+        return Status::Error(
+            "Storage Error: Write is blocked when creating snapshot. Please retry later.");
+      case nebula::cpp2::ErrorCode::E_RAFT_BUFFER_OVERFLOW:
+        return Status::Error(folly::sformat(
+            "Storage Error: Part {} raft buffer is full. Please retry later.", partId));
+      case nebula::cpp2::ErrorCode::E_RAFT_ATOMIC_OP_FAILED:
+        return Status::Error("Storage Error: Atomic operation failed.");
       default:
         auto status = Status::Error("Storage Error: part: %d, error: %s(%d).",
                                     partId,

src/interface/common.thrift

@@ -419,9 +419,7 @@ enum ErrorCode {
     E_FIELD_UNSET                     = -3007,
     // Value exceeds the range of type
     E_OUT_OF_RANGE                    = -3008,
-    // Atomic operation failed
-    E_ATOMIC_OP_FAILED                = -3009,
-    E_DATA_CONFLICT_ERROR             = -3010, // data conflict, for index write without toss.
+    E_DATA_CONFLICT_ERROR             = -3010,     // data conflict, for index write without toss.
 
     E_WRITE_STALLED                   = -3011,
 
@@ -473,5 +471,30 @@ enum ErrorCode {
     // get worker id
     E_WORKER_ID_FAILED                = -3062,
 
+    // 35xx for storaged raft
+    E_RAFT_UNKNOWN_PART               = -3500,
+    // Raft consensus errors
+    E_RAFT_LOG_GAP                    = -3501,
+    E_RAFT_LOG_STALE                  = -3502,
+    E_RAFT_TERM_OUT_OF_DATE           = -3503,
+    // Raft state errors
+    E_RAFT_WAITING_SNAPSHOT           = -3511,
+    E_RAFT_SENDING_SNAPSHOT           = -3512,
+    E_RAFT_INVALID_PEER               = -3513,
+    E_RAFT_NOT_READY                  = -3514,
+    E_RAFT_STOPPED                    = -3515,
+    E_RAFT_BAD_ROLE                   = -3516,
+    // Local errors
+    E_RAFT_WAL_FAIL                   = -3521,
+    E_RAFT_HOST_STOPPED               = -3522,
+    E_RAFT_TOO_MANY_REQUESTS          = -3523,
+    E_RAFT_PERSIST_SNAPSHOT_FAILED    = -3524,
+    E_RAFT_RPC_EXCEPTION              = -3525,
+    E_RAFT_NO_WAL_FOUND               = -3526,
+    E_RAFT_HOST_PAUSED                = -3527,
+    E_RAFT_WRITE_BLOCKED              = -3528,
+    E_RAFT_BUFFER_OVERFLOW            = -3529,
+    E_RAFT_ATOMIC_OP_FAILED           = -3530,
+
     E_UNKNOWN                         = -8000,
 } (cpp.enum_strict)

src/interface/raftex.thrift

@@ -22,33 +22,6 @@ enum Status {
     WAITING_SNAPSHOT    = 3; // Waiting for the snapshot.
 } (cpp.enum_strict)
 
-enum ErrorCode {
-    SUCCEEDED = 0;
-
-    E_UNKNOWN_PART = -1;
-
-    // Raft consensus errors
-    E_LOG_GAP = -2;
-    E_LOG_STALE = -3;
-    E_TERM_OUT_OF_DATE = -4;
-
-    // Raft state errors
-    E_WAITING_SNAPSHOT = -5;            // The follower is waiting a snapshot
-    E_BAD_STATE = -6;
-    E_WRONG_LEADER = -7;
-    E_NOT_READY = -8;
-    E_BAD_ROLE = -9,
-
-    // Local errors
-    E_WAL_FAIL = -10;
-    E_HOST_STOPPED = -11;
-    E_TOO_MANY_REQUESTS = -12;
-    E_PERSIST_SNAPSHOT_FAILED = -13;
-    E_RPC_EXCEPTION = -14;              // An thrift internal exception was thrown
-    E_NO_WAL_FOUND = -15;
-    E_APPLY_FAIL = -16;
-    E_HOST_PAUSED = -17;
-}
 
 typedef i64 (cpp.type = "nebula::ClusterID") ClusterID
 typedef i32 (cpp.type = "nebula::GraphSpaceID") GraphSpaceID
@@ -73,8 +46,8 @@ struct AskForVoteRequest {
 
 // Response message for the vote call
 struct AskForVoteResponse {
-    1: ErrorCode error_code;
-    2: TermID    current_term;
+    1: common.ErrorCode error_code;
+    2: TermID           current_term;
 }
 
 // Log entries being sent to follower, logId is not included, it could be calculated by
@@ -98,13 +71,13 @@ struct AppendLogRequest {
 }
 
 struct AppendLogResponse {
-    1: ErrorCode    error_code;
-    2: TermID       current_term;
-    3: string       leader_addr;
-    4: Port         leader_port;
-    5: LogID        committed_log_id;
-    6: LogID        last_matched_log_id;
-    7: TermID       last_matched_log_term;
+    1: common.ErrorCode error_code;
+    2: TermID           current_term;
+    3: string           leader_addr;
+    4: Port             leader_port;
+    5: LogID            committed_log_id;
+    6: LogID            last_matched_log_id;
+    7: TermID           last_matched_log_term;
 }
 
 struct SendSnapshotRequest {
@@ -133,17 +106,17 @@ struct HeartbeatRequest {
 }
 
 struct HeartbeatResponse {
-    1: ErrorCode    error_code;
-    2: TermID       current_term;
-    3: string       leader_addr;
-    4: Port         leader_port;
-    5: LogID        committed_log_id;
-    6: LogID        last_log_id;
-    7: TermID       last_log_term;
+    1: common.ErrorCode error_code;
+    2: TermID           current_term;
+    3: string           leader_addr;
+    4: Port             leader_port;
+    5: LogID            committed_log_id;
+    6: LogID            last_log_id;
+    7: TermID           last_log_term;
 }
 
 struct SendSnapshotResponse {
-    1: ErrorCode    error_code;
+    1: common.ErrorCode error_code;
 }
 
 struct GetStateRequest {
@@ -152,14 +125,14 @@ struct GetStateRequest {
 }
 
 struct GetStateResponse {
-    1: ErrorCode    error_code;
-    2: Role         role;
-    3: TermID       term;
-    4: bool         is_leader;
-    5: LogID        committed_log_id;
-    6: LogID        last_log_id;
-    7: TermID       last_log_term;
-    8: Status       status;
+    1: common.ErrorCode error_code;
+    2: Role             role;
+    3: TermID           term;
+    4: bool             is_leader;
+    5: LogID            committed_log_id;
+    6: LogID            last_log_id;
+    7: TermID           last_log_term;
+    8: Status           status;
 }
 
 service RaftexService {

src/kvstore/Listener.h

@@ -149,13 +149,13 @@ class Listener : public raftex::RaftPart {
     LOG(INFO) << idStr_ << "Find the new leader " << nLeader;
   }
 
-  raftex::cpp2::ErrorCode checkPeer(const HostAddr& candidate) override {
+  nebula::cpp2::ErrorCode checkPeer(const HostAddr& candidate) override {
     CHECK(!raftLock_.try_lock());
     if (peers_.find(candidate) == peers_.end()) {
       LOG(WARNING) << idStr_ << "The candidate " << candidate << " is not in my peers";
-      return raftex::cpp2::ErrorCode::E_WRONG_LEADER;
+      return nebula::cpp2::ErrorCode::E_RAFT_INVALID_PEER;
     }
-    return raftex::cpp2::ErrorCode::SUCCEEDED;
+    return nebula::cpp2::ErrorCode::SUCCEEDED;
   }
 
   // For listener, we just return true directly. Another background thread trigger the actual