From 363d0d93d4a554f9f574903dc7c16e20dbeb6eb3 Mon Sep 17 00:00:00 2001 From: Aakash Arayambeth Date: Sun, 12 Jan 2025 17:55:55 -0500 Subject: [PATCH] simple fixes to fdb trace messages Signed-off-by: Aakash Arayambeth --- db/fdb_bend_sql.c | 4 ++-- db/fdb_fend.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/fdb_bend_sql.c b/db/fdb_bend_sql.c index 14fc7ceb6d..32550a145c 100644 --- a/db/fdb_bend_sql.c +++ b/db/fdb_bend_sql.c @@ -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); } @@ -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; diff --git a/db/fdb_fend.c b/db/fdb_fend.c index 41e9c20a0d..40c1c1eef0 100644 --- a/db/fdb_fend.c +++ b/db/fdb_fend.c @@ -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; @@ -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); }