Fix ddl kv lock timeout

src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp

@@ -667,18 +667,26 @@ int ObTabletDDLKvMgr::unregister_from_tablet(const SCN &ddl_start_scn, ObDDLKvMg
 int ObTabletDDLKvMgr::rdlock(const int64_t timeout_us, uint32_t &tid)
 {
   int ret = OB_SUCCESS;
-  if (OB_SUCC(lock_.rdlock(ObLatchIds::TABLET_DDL_KV_MGR_LOCK, timeout_us))) {
+  const int64_t abs_timeout_us = timeout_us + ObTimeUtility::current_time();
+  if (OB_SUCC(lock_.rdlock(ObLatchIds::TABLET_DDL_KV_MGR_LOCK, abs_timeout_us))) {
     tid = static_cast<uint32_t>(GETTID());
   }
+  if (OB_TIMEOUT == ret) {
+    ret = OB_EAGAIN;
+  }
   return ret;
 }
 
 int ObTabletDDLKvMgr::wrlock(const int64_t timeout_us, uint32_t &tid)
 {
   int ret = OB_SUCCESS;
-  if (OB_SUCC(lock_.wrlock(ObLatchIds::TABLET_DDL_KV_MGR_LOCK, timeout_us))) {
+  const int64_t abs_timeout_us = timeout_us + ObTimeUtility::current_time();
+  if (OB_SUCC(lock_.wrlock(ObLatchIds::TABLET_DDL_KV_MGR_LOCK, abs_timeout_us))) {
     tid = static_cast<uint32_t>(GETTID());
   }
+  if (OB_TIMEOUT == ret) {
+    ret = OB_EAGAIN;
+  }
   return ret;
 }