diff --git a/apps/backend/backend_confirm.c b/apps/backend/backend_confirm.c index b21b13bc..7c774ab8 100644 --- a/apps/backend/backend_confirm.c +++ b/apps/backend/backend_confirm.c @@ -71,14 +71,6 @@ #include "clixon_backend_commit.h" #include "backend_client.h" -/* - * Local constants - */ -/*! Use a global variable to : - * if an RPC bearing satisfies conditions to cancel the rollback timer - */ -#undef _GLOBAL_VALID_CONFIRMING_COMMIT - /* * Local types */ @@ -93,14 +85,6 @@ struct confirmed_commit { void *cc_arg; /* clicon_handle that will be passed to rollback_fn() */ }; -#ifdef _GLOBAL_VALID_CONFIRMING_COMMIT -/* - * Local global variables - */ -/* if an RPC bearing satisfies conditions to cancel the rollback timer */ -static int _is_valid_confirming_commit = 0; -#endif - int 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 * 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); -#endif if (cc_valid) { 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"); @@ -815,10 +794,6 @@ from_client_confirmed_commit(clicon_handle h, if ((cc_valid = check_valid_confirming_commit(h, xe, myid)) < 0) goto done; -#ifdef _GLOBAL_VALID_CONFIRMING_COMMIT - _is_valid_confirming_commit = cc_valid; -#endif - /* If is *not* present, this will conclude the confirmed-commit, so cancel the rollback. */ if (!xe_confirmed(xe) && cc_valid) { cancel_confirmed_commit(h);