hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: rewrite the return code of tablelock

Browse Source
This commit is contained in:
obdev 2024-02-07 19:55:15 +00:00 committed by ob-robot
parent 448b751d18
commit beb3fcc1f6
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/tablelock/ob_table_lock_service.cpp
View File

@ -606,6 +606,7 @@ int ObTableLockService::lock_table(ObTxDesc &tx_desc,
ctx.lock_op_type_ = arg.op_type_;
ctx.is_from_sql_ = arg.is_from_sql_;
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -633,6 +634,7 @@ int ObTableLockService::unlock_table(ObTxDesc &tx_desc,
ctx.tx_param_ = tx_param;
ctx.lock_op_type_ = arg.op_type_;
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -664,6 +666,7 @@ int ObTableLockService::lock_tablet(ObTxDesc &tx_desc,
} else if (OB_FAIL(process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_))) {
LOG_WARN("process lock task failed", K(ret), K(arg));
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -697,6 +700,7 @@ int ObTableLockService::lock_tablet(ObTxDesc &tx_desc,
} else if (OB_FAIL(process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_))) {
LOG_WARN("process lock task failed", K(ret), K(arg));
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -729,6 +733,7 @@ int ObTableLockService::unlock_tablet(ObTxDesc &tx_desc,
} else if (OB_FAIL(process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_))) {
LOG_WARN("process lock task failed", K(ret), K(arg));
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -762,6 +767,7 @@ int ObTableLockService::unlock_tablet(ObTxDesc &tx_desc,
} else if (OB_FAIL(process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_))) {
LOG_WARN("process lock task failed", K(ret), K(arg));
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -795,6 +801,7 @@ int ObTableLockService::lock_tablet(ObTxDesc &tx_desc,
} else if (OB_FAIL(process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_))) {
LOG_WARN("process lock task failed", K(ret), K(arg));
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -829,6 +836,7 @@ int ObTableLockService::unlock_tablet(ObTxDesc &tx_desc,
} else if (OB_FAIL(process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_))) {
LOG_WARN("process lock task failed", K(ret), K(arg));
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -894,6 +902,7 @@ int ObTableLockService::lock_partition(ObTxDesc &tx_desc,
ctx.lock_op_type_ = arg.op_type_;
ctx.is_from_sql_ = arg.is_from_sql_;
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -924,6 +933,7 @@ int ObTableLockService::unlock_partition(ObTxDesc &tx_desc,
ctx.tx_param_ = tx_param;
ctx.lock_op_type_ = arg.op_type_;
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -954,6 +964,7 @@ int ObTableLockService::lock_subpartition(ObTxDesc &tx_desc,
ctx.lock_op_type_ = arg.op_type_;
ctx.is_from_sql_ = arg.is_from_sql_;
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -984,6 +995,7 @@ int ObTableLockService::unlock_subpartition(ObTxDesc &tx_desc,
ctx.tx_param_ = tx_param;
ctx.lock_op_type_ = arg.op_type_;
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -1016,6 +1028,7 @@ int ObTableLockService::lock_obj(ObTxDesc &tx_desc,
} else {
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -1049,6 +1062,7 @@ int ObTableLockService::unlock_obj(ObTxDesc &tx_desc,
} else {
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -1083,6 +1097,7 @@ int ObTableLockService::lock_obj(ObTxDesc &tx_desc,
} else {
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -1118,6 +1133,7 @@ int ObTableLockService::unlock_obj(ObTxDesc &tx_desc,
} else {
ret = process_lock_task_(ctx, arg.lock_mode_, arg.owner_id_);
}
ret = rewrite_return_code_(ret);
}
return ret;
}
@ -2749,7 +2765,9 @@ int ObTableLockService::rewrite_return_code_(const int ret) const
{
int rewrite_rcode = ret;
// rewrite to OB_EAGAIN, to make sure the ddl process will retry again.
if (OB_TRANS_KILLED == ret) {
if (OB_TRANS_KILLED == ret ||
OB_OBJ_UNLOCK_CONFLICT == ret ||
OB_OBJ_LOCK_NOT_COMPLETED == ret) {
rewrite_rcode = OB_EAGAIN;
}
return rewrite_rcode;