From 6d3dcc7c4c55a3997166aa662328a06a67b77efe Mon Sep 17 00:00:00 2001 From: Handora Date: Thu, 9 Feb 2023 14:12:54 +0000 Subject: [PATCH] add condition for protection code --- src/storage/memtable/ob_memtable.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/storage/memtable/ob_memtable.cpp b/src/storage/memtable/ob_memtable.cpp index 29f5dc42d..e7e000080 100644 --- a/src/storage/memtable/ob_memtable.cpp +++ b/src/storage/memtable/ob_memtable.cpp @@ -2632,7 +2632,13 @@ int ObMemtable::mvcc_write_(storage::ObStoreCtx &ctx, TRANS_LOG(ERROR, "double lock detected", K(*key), K(*value), K(ctx), K(res)); } if (!res.has_insert()) { - TRANS_LOG(ERROR, "sstable conflict will occurred when already inserted", K(ctx), KPC(this)); + if (blocksstable::ObDmlFlag::DF_LOCK != arg.data_->dml_flag_) { + TRANS_LOG(ERROR, "sstable conflict will occurred when already inserted", + K(ctx), KPC(this), K(arg)); + } else { + TRANS_LOG(WARN, "sstable conflict will occurred when lock operation", + K(ctx), KPC(this), K(arg)); + } } else { // Tip1: mvcc_write guarantee the tnode will not be inserted if error is reported (void)mvcc_engine_.mvcc_undo(value);