change errno

src/storage/compaction/ob_tablet_merge_task.h

@@ -194,7 +194,8 @@ public:
         || OB_TABLE_IS_DELETED == dag_ret_
         || OB_TENANT_HAS_BEEN_DROPPED == dag_ret_
         || OB_LS_NOT_EXIST == dag_ret_
-        || OB_TABLET_NOT_EXIST == dag_ret_;
+        || OB_TABLET_NOT_EXIST == dag_ret_
+        || OB_CANCELED == dag_ret_;
   }
   int get_tablet_and_compat_mode();
   virtual int64_t to_string(char* buf, const int64_t buf_len) const override;

src/storage/ls/ob_ls_tablet_service.cpp

@@ -1051,7 +1051,11 @@ int ObLSTabletService::update_tablet_table_store(
     ret = OB_INVALID_ARGUMENT;
     LOG_WARN("invalid args", K(ret), K(tablet_id), K(param));
   } else if (OB_FAIL(ObTabletCreateDeleteHelper::acquire_tablet(key, new_tablet_handle, true/*only acquire*/))) {
-    LOG_WARN("failed to acquire tablet", K(ret), K(key));
+    if (OB_ENTRY_NOT_EXIST == ret) {
+      ret = OB_TABLET_NOT_EXIST;
+    } else {
+      LOG_WARN("failed to acquire tablet", K(ret), K(key));
+    }
   } else {
     new_tablet = new_tablet_handle.get_obj();
     time_guard.click("Acquire");