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

Fixing memory-leak in table direct insert

Browse Source
This commit is contained in:
obdev
2023-02-08 10:58:11 +08:00
committed by ob-robot
parent e9d6a79f8f
commit d51d7d7dab
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/observer/table_load/ob_table_load_store.cpp
View File

@ -879,6 +879,39 @@ int ObTableLoadStore::px_finish_trans(const ObTableLoadTransId &trans_id)
return ret; return ret;
} }
int ObTableLoadStore::px_abandon_trans(const ObTableLoadTransId &trans_id)
{
int ret = OB_SUCCESS;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("ObTableLoadStore not init", KR(ret), KP(this));
} else {
LOG_INFO("store px abandon trans", K(trans_id));
ObTableLoadStoreTrans *trans = nullptr;
if (OB_FAIL(store_ctx_->get_trans(trans_id, trans))) {
if (OB_UNLIKELY(OB_ENTRY_NOT_EXIST != ret)) {
LOG_WARN("fail to get trans", KR(ret));
} else {
ret = OB_SUCCESS;
}
} else if (OB_UNLIKELY(trans_id != trans->get_trans_ctx()->trans_id_)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid trans id", KR(ret), K(trans_id), KPC(trans));
} else if (OB_FAIL(trans->set_trans_status_abort())) {
LOG_WARN("fail to set trans status abort", KR(ret));
} else if (OB_FAIL(store_ctx_->abort_trans(trans))) {
LOG_WARN("fail to abort trans", KR(ret));
} else if (OB_FAIL(px_clean_up_trans(trans))) {
LOG_WARN("fail to clean up trans", KR(ret));
}
if (OB_NOT_NULL(trans)) {
store_ctx_->put_trans(trans);
trans = nullptr;
}
}
return ret;
}
int ObTableLoadStore::px_write(const ObTableLoadTransId &trans_id, int ObTableLoadStore::px_write(const ObTableLoadTransId &trans_id,
const ObTabletID &tablet_id, const ObIArray<ObNewRow> &row_array) const ObTabletID &tablet_id, const ObIArray<ObNewRow> &row_array)
{ {
@ -915,33 +948,22 @@ int ObTableLoadStore::px_write(const ObTableLoadTransId &trans_id,
return ret; return ret;
} }
int ObTableLoadStore::px_clean_up(const ObTableLoadTransId &trans_id) int ObTableLoadStore::px_clean_up_trans(ObTableLoadStoreTrans *trans)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("ObTableLoadStore not init", KR(ret), KP(this)); LOG_WARN("ObTableLoadStore not init", KR(ret), KP(this));
} else { } else {
ObTableLoadStoreTrans *trans = nullptr;
ObTableLoadTransStoreWriter *store_writer = nullptr; ObTableLoadTransStoreWriter *store_writer = nullptr;
if (OB_FAIL(store_ctx_->get_trans(trans_id, trans))) { if (OB_FAIL(trans->get_store_writer_for_clean_up(store_writer))) {
if (OB_UNLIKELY(OB_ENTRY_NOT_EXIST != ret)) {
LOG_WARN("fail to get trans", KR(ret));
} else {
ret = OB_SUCCESS;
}
} else if (OB_FAIL(trans->get_store_writer_for_clean_up(store_writer))) {
LOG_WARN("fail to get store writer for clean up", KR(ret)); LOG_WARN("fail to get store writer for clean up", KR(ret));
} else if (OB_FAIL(store_writer->clean_up(PX_DEFAULT_SESSION_ID))) { } else if (OB_FAIL(store_writer->clean_up(PX_DEFAULT_SESSION_ID))) {
LOG_WARN("fail to clean up store writer", KR(ret)); LOG_WARN("fail to clean up store writer", KR(ret));
} }
if (OB_NOT_NULL(trans)) { if (OB_NOT_NULL(store_writer)) {
if (OB_NOT_NULL(store_writer)) { trans->put_store_writer(store_writer);
trans->put_store_writer(store_writer); store_writer = nullptr;
store_writer = nullptr;
}
store_ctx_->put_trans(trans);
trans = nullptr;
} }
} }
return ret; return ret;

3
src/observer/table_load/ob_table_load_store.h
View File

@ -75,11 +75,12 @@ public:
static const int32_t PX_DEFAULT_SESSION_ID = 1; static const int32_t PX_DEFAULT_SESSION_ID = 1;
int px_start_trans(const table::ObTableLoadTransId &trans_id); int px_start_trans(const table::ObTableLoadTransId &trans_id);
int px_finish_trans(const table::ObTableLoadTransId &trans_id); int px_finish_trans(const table::ObTableLoadTransId &trans_id);
int px_abandon_trans(const table::ObTableLoadTransId &trans_id);
int px_write(const table::ObTableLoadTransId &trans_id, int px_write(const table::ObTableLoadTransId &trans_id,
const ObTabletID &tablet_id, const ObTabletID &tablet_id,
const common::ObIArray<common::ObNewRow> &row_array); const common::ObIArray<common::ObNewRow> &row_array);
int px_clean_up(const table::ObTableLoadTransId &trans_id);
private: private:
int px_clean_up_trans(ObTableLoadStoreTrans *trans);
int px_flush(ObTableLoadStoreTrans *trans); int px_flush(ObTableLoadStoreTrans *trans);
private: private:

4
src/sql/engine/cmd/ob_table_direct_insert_service.cpp
View File

@ -120,8 +120,8 @@ int ObTableDirectInsertService::close_task(const uint64_t table_id,
LOG_WARN("fail to finish direct load trans", KR(ret), K(trans_id)); LOG_WARN("fail to finish direct load trans", KR(ret), K(trans_id));
} }
} else { } else {
if (OB_FAIL(store.px_clean_up(trans_id))) { if (OB_FAIL(store.px_abandon_trans(trans_id))) {
LOG_WARN("failed to do px clean up", KR(ret)); LOG_WARN("fail to abandon direct load trans", KR(ret));
} }
} }
} }