Skip to content
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

simple fixes to fdb trace messages #4956

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

simple fixes to fdb trace messages #4956

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions db/fdb_bend_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ int fdb_svc_trans_rollback(char *tid, enum transaction_level lvl,
}

if (gbl_fdb_track) {
logmsg(LOGMSG_USER, "%p commiting tid=%s\n", (void *)pthread_self(),
logmsg(LOGMSG_USER, "%p rolling back tid=%s\n", (void *)pthread_self(),
us);
}

Expand Down Expand Up @@ -783,7 +783,7 @@ int fdb_svc_cursor_insert(sqlclntstate *clnt, char *tblname,
convert_failure_reason_str(&clnt->fail_reason, db->tablename,
"SQLite format", ".ONDISK", errs,
sizeof(errs));

logmsg(LOGMSG_ERROR, "%s:%d sqlite_to_ondisk failed. rc: %d, err: %s\n", __func__, __LINE__, rc, errs);
rc = -1;
free(row);
goto done;
Expand Down
4 changes: 2 additions & 2 deletions db/fdb_fend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4171,7 +4171,7 @@ int fdb_trans_commit(sqlclntstate *clnt, enum trans_clntcomm sideeffects)
fdb_tran_t *tran, *tmp;
fdb_msg_t *msg;
int rc = 0;

uuidstr_t tus;
if (!dtran)
return 0;

Expand Down Expand Up @@ -4239,7 +4239,7 @@ int fdb_trans_commit(sqlclntstate *clnt, enum trans_clntcomm sideeffects)
}
}
if (gbl_fdb_track)
logmsg(LOGMSG_USER, "%s Send Commit tid=%llx db=\"%s\" rc=%d\n", __func__, *(unsigned long long *)tran->tid,
logmsg(LOGMSG_USER, "%s Send Commit tid=%s db=\"%s\" rc=%d\n", __func__, comdb2uuidstr((unsigned char *)tran->tid, tus),
tran->fdb->dbname, rc);
}

Expand Down