fix rpc error

obdev · footka · ob-robot · commit 0f85e9bf7305 · 2026-04-16T08:20:36.000Z
Co-authored-by: footka &lt;672528926@qq.com&gt;
diff --git a/deps/oblib/src/rpc/obrpc/ob_local_procedure_call.h b/deps/oblib/src/rpc/obrpc/ob_local_procedure_call.h
@@ -244,6 +244,7 @@ int post(ObRpcProxy& proxy, ObRpcPacketCode pcode, const Input& args, UCB* ucb,
         } else {
           if (OB_NOT_NULL(new_cb)) {
             auto *newcb = reinterpret_cast<UCB*>(new_cb);
+            set_ucb_args(newcb, args);
             init_ucb(proxy, newcb, start_ts, payload_sz);
           }
           int64_t receive_ts = ObTimeUtility::current_time();
diff --git a/src/storage/tx/ob_trans_service_v4.cpp b/src/storage/tx/ob_trans_service_v4.cpp
@@ -210,7 +210,7 @@ int ObTransService::do_commit_tx_(ObTxDesc &tx,
   return ret;
 }
 
-#define DELETED_UNRETRYABLE_ERROR(ret) (OB_LS_IS_DELETED == ret || OB_TENANT_HAS_BEEN_DROPPED)
+#define DELETED_UNRETRYABLE_ERROR(ret) (OB_LS_IS_DELETED == ret || OB_TENANT_HAS_BEEN_DROPPED == ret)
 /*
  * try send commit msg to coordinator, and register retry task
  * if msg send fail, the retry task will retry later

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ int post(ObRpcProxy& proxy, ObRpcPacketCode pcode, const Input& args, UCB* ucb,`
`244`	`244`	`} else {`
`245`	`245`	`if (OB_NOT_NULL(new_cb)) {`
`246`	`246`	`auto newcb = reinterpret_cast<UCB>(new_cb);`
	`247`	`+ set_ucb_args(newcb, args);`
`247`	`248`	`init_ucb(proxy, newcb, start_ts, payload_sz);`
`248`	`249`	`}`
`249`	`250`	`int64_t receive_ts = ObTimeUtility::current_time();`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ int ObTransService::do_commit_tx_(ObTxDesc &tx,`
`210`	`210`	`return ret;`
`211`	`211`	`}`
`212`	`212`
`213`		`-#define DELETED_UNRETRYABLE_ERROR(ret) (OB_LS_IS_DELETED == ret \|\| OB_TENANT_HAS_BEEN_DROPPED)`
	`213`	`+#define DELETED_UNRETRYABLE_ERROR(ret) (OB_LS_IS_DELETED == ret \|\| OB_TENANT_HAS_BEEN_DROPPED == ret)`
`214`	`214`	`/*`
`215`	`215`	`* try send commit msg to coordinator, and register retry task`
`216`	`216`	`* if msg send fail, the retry task will retry later`