database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix transaction non-idempotency error (#749)

Browse Source 
add_pending_version() is not idempotent upon rpc retry.
Transaction will be garbaged collection falsely.
This commit is contained in:
lichaoyong
2019-03-14 10:41:51 +08:00
committed by GitHub
parent cc2fd43c32
commit e970f28dad
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
be/src/olap/delta_writer.cpp
View File

@ -182,9 +182,11 @@ OLAPStatus DeltaWriter::close(google::protobuf::RepeatedPtrField<PTabletInfo>* t
}
RETURN_NOT_OK(_mem_table->close(_writer));
OLAPStatus res = OLAP_SUCCESS;
OLAPStatus res = _table->add_pending_version(_req.partition_id, _req.transaction_id, nullptr);
if (res != OLAP_SUCCESS && res != OLAP_ERR_PUSH_TRANSACTION_ALREADY_EXIST) {
return res;
}
//add pending data to tablet
RETURN_NOT_OK(_table->add_pending_version(_req.partition_id, _req.transaction_id, nullptr));
for (SegmentGroup* segment_group : _segment_group_vec) {
RETURN_NOT_OK(_table->add_pending_segment_group(segment_group));
RETURN_NOT_OK(segment_group->load());
@ -208,7 +210,10 @@ OLAPStatus DeltaWriter::close(google::protobuf::RepeatedPtrField<PTabletInfo>* t
return res;
}
RETURN_NOT_OK(_new_table->add_pending_version(_req.partition_id, _req.transaction_id, nullptr));
res = _new_table->add_pending_version(_req.partition_id, _req.transaction_id, nullptr);
if (res != OLAP_SUCCESS && res != OLAP_ERR_PUSH_TRANSACTION_ALREADY_EXIST) {
return res;
}
for (SegmentGroup* segment_group : _new_segment_group_vec) {
RETURN_NOT_OK(_new_table->add_pending_segment_group(segment_group));
RETURN_NOT_OK(segment_group->load());

2
be/src/olap/olap_header.cpp
View File

@ -294,7 +294,7 @@ OLAPStatus OLAPHeader::add_pending_version(
if (pending_delta(i).transaction_id() == transaction_id) {
LOG(WARNING) << "pending delta already exists in header."
<< "transaction_id: " << transaction_id;
return OLAP_ERR_HEADER_ADD_PENDING_DELTA;
return OLAP_ERR_PUSH_TRANSACTION_ALREADY_EXIST;
}
}