drop space not exist (#5169)

* drop space not exist * fix test Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com> Co-authored-by: kyle.cao <kyle.cao@vesoft.com>
vesoft-inc · Dec 30, 2022 · d0a81b0 · d0a81b0
1 parent 2cbbbed
commit d0a81b0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -906,6 +906,8 @@ Status MetaClient::handleResponse(const RESP& resp) {
       return Status::Error("Snapshot failure!");
     case nebula::cpp2::ErrorCode::E_SNAPSHOT_RUNNING_JOBS:
       return Status::Error("Snapshot failed encounter running jobs!");
+    case nebula::cpp2::ErrorCode::E_SNAPSHOT_NOT_FOUND:
+      return Status::Error("Snapshot not found!");
     case nebula::cpp2::ErrorCode::E_BLOCK_WRITE_FAILURE:
       return Status::Error("Block write failure!");
     case nebula::cpp2::ErrorCode::E_REBUILD_INDEX_FAILED:

diff --git a/src/common/graph/Response.h b/src/common/graph/Response.h
@@ -98,6 +98,7 @@
   /* Admin Failure */                                                         \
   X(E_SNAPSHOT_FAILURE, -2040)                                                \
   X(E_SNAPSHOT_RUNNING_JOBS, -2056)                                           \
+  X(E_SNAPSHOT_NOT_FOUND, -2057)                                              \
   X(E_BLOCK_WRITE_FAILURE, -2041)                                             \
   X(E_REBUILD_INDEX_FAILURE, -2042)                                           \
   X(E_INDEX_WITH_TTL, -2043)                                                  \

diff --git a/src/common/thrift/ThriftClientManager-inl.h b/src/common/thrift/ThriftClientManager-inl.h
@@ -84,9 +84,7 @@ std::shared_ptr<ClientType> ThriftClientManager<ClientType>::client(const HostAd
     }
   });
   auto clientChannel = apache::thrift::RocketClientChannel::newChannel(std::move(socket));
-  if (timeout >= 0) {
-    clientChannel->setTimeout(timeout);
-  }
+  clientChannel->setTimeout(timeout);
   if (compatibility) {
     clientChannel->setProtocolId(apache::thrift::protocol::T_BINARY_PROTOCOL);
     //    clientChannel->setClientType(THRIFT_UNFRAMED_DEPRECATED);

diff --git a/src/interface/common.thrift b/src/interface/common.thrift
@@ -388,6 +388,7 @@ enum ErrorCode {
     // Admin Failure
     E_SNAPSHOT_FAILURE                = -2040,  // Failed to generate a snapshot
     E_SNAPSHOT_RUNNING_JOBS           = -2056,  // Failed to generate a snapshot because encounter running jobs
+    E_SNAPSHOT_NOT_FOUND              = -2057,  // Snapshot not found when try to drop it
     E_BLOCK_WRITE_FAILURE             = -2041,  // Failed to write block data
     E_REBUILD_INDEX_FAILURE           = -2042,
     E_INDEX_WITH_TTL                  = -2043,  

diff --git a/src/meta/processors/admin/DropSnapshotProcessor.cpp b/src/meta/processors/admin/DropSnapshotProcessor.cpp
@@ -35,6 +35,7 @@ void DropSnapshotProcessor::process(const cpp2::DropSnapshotReq& req) {
     auto retCode = nebula::error(ret);
     if (retCode == nebula::cpp2::ErrorCode::E_KEY_NOT_FOUND) {
       LOG(INFO) << "Snapshot " << snapshot << " does not exist or already dropped.";
+      handleErrorCode(nebula::cpp2::ErrorCode::E_SNAPSHOT_NOT_FOUND);
       onFinished();
       return;
     }

diff --git a/src/meta/test/SnapshotProcessorsTest.cpp b/src/meta/test/SnapshotProcessorsTest.cpp
@@ -484,7 +484,7 @@ TEST_F(SnapshotProcessorsTest, DropNotExist) {
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
-    ASSERT_EQ(resp.code(), nebula::cpp2::ErrorCode::SUCCEEDED);
+    ASSERT_EQ(resp.code(), nebula::cpp2::ErrorCode::E_SNAPSHOT_NOT_FOUND);
 
     ASSERT_EQ(getAllSnapshots().size(), 1);
   }