Skip to content

new fdb locking locking #5821

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 3 commits into
base: main
Choose a base branch
from
+1,652 −1,525
Open

new fdb locking locking #5821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01412ea
Fdb locking version 2:
dorinhogea Feb 1, 2026
da7c92c
do not run cdb2api with table_mtx acquired; accept and correct duplic…
dorinhogea Mar 13, 2026
a0dce40
fix remote table version 0 regression
dorinhogea Mar 18, 2026
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
2 changes: 1 addition & 1 deletion db/comdb2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3707,7 +3707,7 @@ int is_tablename_queue(const char *);

int rename_table_options(void *tran, struct dbtable *db, const char *newname);

int comdb2_get_verify_remote_schemas(void);
int comdb2_get_verify_remote_schemas(struct sqlclntstate *clnt);
void comdb2_set_verify_remote_schemas(void);

const char *thrman_get_where(struct thr_handle *thr);
Expand Down
2 changes: 1 addition & 1 deletion db/db_fingerprint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ void add_fingerprint(struct sqlclntstate *clnt, sqlite3_stmt *stmt, struct strin
char *params = NULL;
int calc_query_plan = gbl_query_plans && !is_lua;
if (calc_query_plan) {
query_plan_ref = form_query_plan(stmt);
query_plan_ref = form_query_plan(clnt, stmt);
calc_fingerprint(query_plan_ref ? string_ref_cstr(query_plan_ref) : NULL, &temp, plan_fingerprint);
if (gbl_sample_queries && query_plan_ref && param_count(clnt) > 0) {
// only get params string if we need it
Expand Down
4 changes: 2 additions & 2 deletions db/db_query_plan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern hash_t *gbl_fingerprint_hash;
extern pthread_mutex_t gbl_fingerprint_hash_mu;

// return NULL if no plan
struct string_ref *form_query_plan(sqlite3_stmt *stmt)
struct string_ref *form_query_plan(struct sqlclntstate *clnt, sqlite3_stmt *stmt)
{
struct string_ref *query_plan_ref;
Op *op;
Expand Down Expand Up @@ -61,7 +61,7 @@ struct string_ref *form_query_plan(sqlite3_stmt *stmt)

strbuf_appendf(query_plan_buf, "open %s cursor on ", operation);
describe_cursor(v, pc, &c);
print_cursor_description(query_plan_buf, &c, 0);
print_cursor_description(clnt, query_plan_buf, &c, 0);
}

query_plan_ref = strbuf_len(query_plan_buf) > 0 ? create_string_ref((char *)strbuf_buf(query_plan_buf)) : NULL;
Expand Down
10 changes: 6 additions & 4 deletions db/disttxn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,8 +1873,8 @@ int participant_has_failed(const char *dist_txnid, const char *coordinator_name,
int rcode, int outrc, const char *errmsg)
{
if (gbl_debug_disttxn_trace) {
logmsg(LOGMSG_USER, "DISTTXN %s dist_txnid %s rcode=%d outrc=%d errmsg=%s\n", __func__, dist_txnid, rcode,
outrc, errmsg);
logmsg(LOGMSG_USER, "DISTTXN %s FAILED dist_txnid %s rcode=%d outrc=%d errmsg=%s\n", __func__, dist_txnid,
rcode, outrc, errmsg);
}
Pthread_mutex_lock(&part_lk);
participant_t *p = hash_find(participant_hash, &dist_txnid);
Expand All @@ -1891,7 +1891,8 @@ int participant_has_failed(const char *dist_txnid, const char *coordinator_name,
void participant_has_propagated(const char *dist_txnid, const char *coordinator_name, const char *coordinator_master)
{
if (gbl_debug_disttxn_trace) {
logmsg(LOGMSG_USER, "DISTTXN %s dist_txnid %s\n", __func__, dist_txnid);
logmsg(LOGMSG_USER, "DISTTXN %s PROPAGATED %s master %s dist_txnid %s\n", __func__, coordinator_name,
coordinator_master, dist_txnid);
}
send_coordinator_propagated(dist_txnid, coordinator_name, coordinator_master);
disable_sanc_heartbeats(dist_txnid, 1);
Expand All @@ -1902,7 +1903,8 @@ static int participant_wait_int(const char *dist_txnid, const char *coordinator_
const char *coordinator_master)
{
if (gbl_debug_disttxn_trace) {
logmsg(LOGMSG_USER, "DISTTXN %s dist_txnid %s\n", __func__, dist_txnid);
logmsg(LOGMSG_USER, "DISTTXN %s WAIT %s tier %s master %s dist_txnid %s\n", __func__, coordinator_name,
coordinator_tier, coordinator_master, dist_txnid);
}
int rtn = 0, first = 1, lock_desired = 0;

Expand Down
Loading
Loading