sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

fixed lots of places that paniced on a failed transaction_commit,

Browse Source 
thinking it was a failure of a transaction cancel
(This used to be commit 22dbe158ed62ae47bbcb41bba3db345294f75437)
This commit is contained in:
Andrew Tridgell 2008-08-08 11:42:06 +10:00 committed by Michael Adam
parent 312a04528c
commit fe3dd9b3e6
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/groupdb/mapping_tdb.c
View File

@ -521,7 +521,7 @@ static NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
if (db->transaction_commit(db) != 0) {
DEBUG(0, ("transaction_commit failed\n"));
status = NT_STATUS_INTERNAL_DB_CORRUPTION;
goto cancel;
return status;
}
return NT_STATUS_OK;
@ -705,7 +705,7 @@ static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
if (db->transaction_commit(db) != 0) {
DEBUG(0, ("transaction_commit failed\n"));
status = NT_STATUS_INTERNAL_DB_CORRUPTION;
goto cancel;
return status;
}
return NT_STATUS_OK;

3
source3/lib/account_pol.c
View File

@ -283,7 +283,8 @@ bool init_account_policy(void)
if (db->transaction_commit(db) != 0) {
DEBUG(0, ("transaction_commit failed\n"));
goto cancel;
TALLOC_FREE(db);
return false;
}
return True;

29
source3/lib/dbwrap_ctdb.c
View File

@ -669,19 +669,9 @@ again:
}
}
if (ctdb_replay_transaction(h) != 0) {
DEBUG(0,(__location__ " Failed to replay transaction\n"));
ctdbd_control_local(messaging_ctdbd_connection(), failure_control,
h->ctx->db_id, CTDB_CTRL_FLAG_NOREPLY,
tdb_null, NULL, NULL, NULL);
h->ctx->transaction = NULL;
talloc_free(h);
ctx->transaction = NULL;
return -1;
}
if (++retries == 10) {
DEBUG(0,(__location__ " Giving up transaction on db 0x%08x after %d retries\n",
h->ctx->db_id, retries));
DEBUG(0,(__location__ " Giving up transaction on db 0x%08x after %d retries failure_control=%u\n",
h->ctx->db_id, retries, (unsigned)failure_control));
ctdbd_control_local(messaging_ctdbd_connection(), failure_control,
h->ctx->db_id, CTDB_CTRL_FLAG_NOREPLY,
tdb_null, NULL, NULL, NULL);
@ -690,6 +680,18 @@ again:
ctx->transaction = NULL;
return -1;
}
if (ctdb_replay_transaction(h) != 0) {
DEBUG(0,(__location__ " Failed to replay transaction failure_control=%u\n",
(unsigned)failure_control));
ctdbd_control_local(messaging_ctdbd_connection(), failure_control,
h->ctx->db_id, CTDB_CTRL_FLAG_NOREPLY,
tdb_null, NULL, NULL, NULL);
h->ctx->transaction = NULL;
talloc_free(h);
ctx->transaction = NULL;
return -1;
}
goto again;
} else {
failure_control = CTDB_CONTROL_TRANS2_ERROR;
@ -698,7 +700,8 @@ again:
/* do the real commit locally */
ret = tdb_transaction_commit(h->ctx->wtdb->tdb);
if (ret != 0) {
DEBUG(0,(__location__ " Failed to commit transaction\n"));
DEBUG(0,(__location__ " Failed to commit transaction failure_control=%u\n",
(unsigned)failure_control));
ctdbd_control_local(messaging_ctdbd_connection(), failure_control, h->ctx->db_id,
CTDB_CTRL_FLAG_NOREPLY, tdb_null, NULL, NULL, NULL);
h->ctx->transaction = NULL;

2
source3/lib/sharesec.c
View File

@ -109,7 +109,7 @@ static bool share_info_db_init(void)
if (share_db->transaction_commit(share_db) != 0) {
DEBUG(0, ("transaction_commit failed\n"));
goto cancel;
return false;
}
return true;

9
source3/passdb/pdb_tdb.c
View File

@ -804,7 +804,7 @@ static bool tdbsam_convert(struct db_context *db, int32 from)
if (db->transaction_commit(db) != 0) {
DEBUG(0, ("Could not commit transaction\n"));
goto cancel;
return false;
}
return true;
@ -1064,7 +1064,7 @@ static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods,
if (db_sam->transaction_commit(db_sam) != 0) {
DEBUG(0, ("Could not commit transaction\n"));
goto cancel;
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
return NT_STATUS_OK;
@ -1191,7 +1191,7 @@ static bool tdb_update_sam(struct pdb_methods *my_methods, struct samu* newpwd,
if (db_sam->transaction_commit(db_sam) != 0) {
DEBUG(0, ("Could not commit transaction\n"));
goto cancel;
return false;
}
return true;
@ -1344,7 +1344,8 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
* account back?
*/
DEBUG(0, ("transaction_commit failed\n"));
goto cancel;
TALLOC_FREE(new_acct);
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
TALLOC_FREE(new_acct );