experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Confirmed commit: removed is_valid_confirming_commit global variable

Browse source
This commit is contained in:
Olof hagsand 2022-10-26 11:00:44 +02:00
parent 05b31508a1
commit ba48521d99
1 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/backend/backend_confirm.c
View file

@ -71,14 +71,6 @@
#include "clixon_backend_commit.h" #include "clixon_backend_commit.h"
#include "backend_client.h" #include "backend_client.h"
/*
* Local constants
*/
/*! Use a global variable to :
* if an RPC bearing <commit/> satisfies conditions to cancel the rollback timer
*/
#undef _GLOBAL_VALID_CONFIRMING_COMMIT
/* /*
* Local types * Local types
*/ */
@ -93,14 +85,6 @@ struct confirmed_commit {
void *cc_arg; /* clicon_handle that will be passed to rollback_fn() */ void *cc_arg; /* clicon_handle that will be passed to rollback_fn() */
}; };
#ifdef _GLOBAL_VALID_CONFIRMING_COMMIT
/*
* Local global variables
*/
/* if an RPC bearing <commit/> satisfies conditions to cancel the rollback timer */
static int _is_valid_confirming_commit = 0;
#endif
int int
confirmed_commit_init(clicon_handle h) confirmed_commit_init(clicon_handle h)
{ {
@ -514,12 +498,7 @@ handle_confirmed_commit(clicon_handle h,
* confirmed-commit must be handled once the transaction has begun and after all the plugins' validate callbacks * confirmed-commit must be handled once the transaction has begun and after all the plugins' validate callbacks
* have been called. * have been called.
*/ */
#ifdef _GLOBAL_VALID_CONFIRMING_COMMIT
cc_valid = _is_valid_confirming_commit;
// assert(cc_valid == check_valid_confirming_commit(h, xe, session_id));
#else
cc_valid = check_valid_confirming_commit(h, xe, session_id); cc_valid = check_valid_confirming_commit(h, xe, session_id);
#endif
if (cc_valid) { if (cc_valid) {
if (cancel_rollback_event(h) < 0) { if (cancel_rollback_event(h) < 0) {
clicon_err(OE_DAEMON, 0, "A valid confirming-commit was received, but the corresponding rollback event was not found"); clicon_err(OE_DAEMON, 0, "A valid confirming-commit was received, but the corresponding rollback event was not found");
@ -815,10 +794,6 @@ from_client_confirmed_commit(clicon_handle h,
if ((cc_valid = check_valid_confirming_commit(h, xe, myid)) < 0) if ((cc_valid = check_valid_confirming_commit(h, xe, myid)) < 0)
goto done; goto done;
#ifdef _GLOBAL_VALID_CONFIRMING_COMMIT
_is_valid_confirming_commit = cc_valid;
#endif
/* If <confirmed/> is *not* present, this will conclude the confirmed-commit, so cancel the rollback. */ /* If <confirmed/> is *not* present, this will conclude the confirmed-commit, so cancel the rollback. */
if (!xe_confirmed(xe) && cc_valid) { if (!xe_confirmed(xe) && cc_valid) {
cancel_confirmed_commit(h); cancel_confirmed_commit(h);