Merge branch 'v2.4.0_qc_sync' into 'v2.4.0_qc' (merge request !301)

fix: data synced with rule does not have rwSet, no printing errors required --bug=1011363

Merge branch 'v2.4.0_qc_sync' into 'v2.4.0_qc' (merge request !301)
fix: data synced with rule does not have rwSet, no printing errors required --bug=1011363
dd590f80 · shaozhuguang · 7d66a402 · a7695d46 · dd590f80
Commit dd590f80 authored May 20, 2025 by shaozhuguang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

blockcontract/block_contract.go blockcontract/block_contract.go +3 -2

No files found.
--- a/blockcontract/block_contract.go
+++ b/blockcontract/block_contract.go
@@ -831,8 +831,9 @@ func (r *BlockRuntime) getTxRWSetsByBlock(store protocol.BlockchainStore, chainI
 				chainId, tx.Payload.TxId, err.Error())
 			return nil, fmt.Errorf("get txRWset failed, %s", err)
 		}
-		if txRWSet == nil { //数据库未找到记录，这不正常，记录日志，初始化空实例
-			r.log.Errorf("not found rwset data in database by txid=%d, please check database", tx.Payload.TxId)
+		if txRWSet == nil { //数据库未找到记录，这不正常，记录日志，初始化空实例 // 在配置了同步规则的节点中，会出现
+			r.log.Warnf("not found rwset data in database by txid=%s, please check if it is correct",
+				tx.Payload.TxId)
 			txRWSet = &commonPb.TxRWSet{}
 		}
 		txRWSets = append(txRWSets, txRWSet)