Skip to content

Lock dtran_mtx in fdb_free_tran to guard concurrent dtran teardown #6125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dorinhogea wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −9
Open

Lock dtran_mtx in fdb_free_tran to guard concurrent dtran teardown #6125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions db/fdb_fend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4135,10 +4135,14 @@ static void _free_fdb_tran(fdb_distributed_tran_t *dtran, fdb_tran_t *tran)
*/
void fdb_free_tran(sqlclntstate *clnt, fdb_tran_t *tran)
{
fdb_distributed_tran_t *dtran = clnt->dbtran.dtran;
fdb_distributed_tran_t *dtran;
uuidstr_t us;

Pthread_mutex_lock(&clnt->dtran_mtx);

dtran = clnt->dbtran.dtran;
if (!dtran) {
Pthread_mutex_unlock(&clnt->dtran_mtx);
logmsg(LOGMSG_ERROR, "%s no dtran\n", __func__);
return;
}
Expand All @@ -4156,6 +4160,8 @@ void fdb_free_tran(sqlclntstate *clnt, fdb_tran_t *tran)
free(dtran);
clnt->dbtran.dtran = 0;
}

Pthread_mutex_unlock(&clnt->dtran_mtx);
}

extern char gbl_dbname[];
Expand All @@ -4168,39 +4174,50 @@ void fdb_client_set_identityBlob(sqlclntstate *clnt, cdb2_hndl_tp *hndl)
cdb2_setIdentityBlob(hndl, externalComdb2getAuthIdBlob(clnt->authdata));
} else if (clnt->use_db_identity) {
cdb2_setDbIdentityBlob(hndl);
} else {
/* No fresh identity for this call (eg. teardown/rollback after the
* triggering query's protobuf buffer was already freed). Clear any
* blob left over from an earlier statement on this handle instead of
* leaving a dangling pointer into freed memory. */
cdb2_setIdentityBlob(hndl, NULL);
}
}

int fdb_trans_commit(sqlclntstate *clnt, enum trans_clntcomm sideeffects, int *is_distributed)
{
fdb_distributed_tran_t *dtran = clnt->dbtran.dtran;
fdb_distributed_tran_t *dtran;
fdb_tran_t *tran, *tmp;
fdb_msg_t *msg;
int rc = 0;
uuidstr_t tus;

*is_distributed = 0;

if (!dtran)
Pthread_mutex_lock(&clnt->dtran_mtx);

dtran = clnt->dbtran.dtran;
if (!dtran) {
Pthread_mutex_unlock(&clnt->dtran_mtx);
return 0;
}

/* nop, this is the remote part that reuses the same dbtran data structure
*/
if (dtran->remoted == 1) {
/* this is on remote side, the structure is different, see
* fdb_bend_sql.c */
fdb_svc_trans_destroy(clnt);
Pthread_mutex_unlock(&clnt->dtran_mtx);
return 0;
}

msg = (fdb_msg_t *)calloc(1, fdb_msg_size());
if (!msg) {
Pthread_mutex_unlock(&clnt->dtran_mtx);
logmsg(LOGMSG_ERROR, "%s malloc\n", __func__);
return FDB_ERR_MALLOC;
}

Pthread_mutex_lock(&clnt->dtran_mtx);

if (clnt->use_2pc && listc_size(&dtran->fdb_trans) > 0) {
clnt->is_coordinator = 1;
}
Expand Down Expand Up @@ -4337,31 +4354,36 @@ int fdb_trans_commit(sqlclntstate *clnt, enum trans_clntcomm sideeffects, int *i

int fdb_trans_rollback(sqlclntstate *clnt)
{
fdb_distributed_tran_t *dtran = clnt->dbtran.dtran;
fdb_distributed_tran_t *dtran;
fdb_tran_t *tran, *tmp;
fdb_msg_t *msg;
int rc = 0;

if (!dtran)
Pthread_mutex_lock(&clnt->dtran_mtx);

dtran = clnt->dbtran.dtran;
if (!dtran) {
Pthread_mutex_unlock(&clnt->dtran_mtx);
return 0;
}

/* nop, this is the remote part that reuses the same dbtran data structure
*/
if (dtran->remoted == 1) {
/* this is on remote side, the structure is different, see
* fdb_bend_sql.c */
fdb_svc_trans_destroy(clnt);
Pthread_mutex_unlock(&clnt->dtran_mtx);
return 0;
}

msg = (fdb_msg_t *)calloc(1, fdb_msg_size());
if (!msg) {
Pthread_mutex_unlock(&clnt->dtran_mtx);
logmsg(LOGMSG_ERROR, "%s malloc\n", __func__);
return FDB_ERR_MALLOC;
}

Pthread_mutex_lock(&clnt->dtran_mtx);

LISTC_FOR_EACH(&dtran->fdb_trans, tran, lnk)
{
if (tran->is_cdb2api) {
Expand Down
Loading