From 5da68b663bbc49b71d32a2498515e23aaa7cec8d Mon Sep 17 00:00:00 2001 From: EvgeniiVR Date: Fri, 30 Aug 2024 05:29:11 -0400 Subject: [PATCH 1/4] add revert failed cb --- apps/backend/backend_plugin.c | 16 ++++++++++++++++ lib/clixon/clixon_plugin.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index 7c905cdcd..af964ffbc 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -806,6 +806,20 @@ plugin_transaction_revert_all(clixon_handle h, return retval; /* ignore errors */ } +/*! Revert a commit for failed plugin + * The revert failed is called for only failed plugin before revert all cb. + */ +static int +plugin_transaction_revert_failed(clixon_plugin_t *cp, + clixon_handle h, + transaction_data_t *td) +{ + trans_cb_t *fn; + + if ((fn = clixon_plugin_api_get(cp)->ca_trans_revert_failed) != NULL) + return plugin_transaction_call_one(h, cp, fn, __FUNCTION__, td); + return 0; +} /*! Call single plugin transaction_commit() in a commit transaction * @@ -848,6 +862,8 @@ plugin_transaction_commit_all(clixon_handle h, while ((cp = clixon_plugin_each(h, cp)) != NULL) { i++; if (plugin_transaction_commit_one(cp, h, td) < 0){ + /*First make an effort ro revert transaction for the failed plugin*/ + plugin_transaction_revert_failed(cp, h, td); /* Make an effort to revert transaction */ plugin_transaction_revert_all(h, td, i-1); goto done; diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h index bf2d6655e..6fb9f9138 100644 --- a/lib/clixon/clixon_plugin.h +++ b/lib/clixon/clixon_plugin.h @@ -402,6 +402,7 @@ struct clixon_plugin_api{ trans_cb_t *cb_trans_complete; /* Transaction validation complete */ trans_cb_t *cb_trans_commit; /* Transaction commit */ trans_cb_t *cb_trans_commit_done; /* Transaction when commit done */ + trans_cb_t *cb_trans_revert_failed; /* Transaction revert failed*/ trans_cb_t *cb_trans_revert; /* Transaction revert */ trans_cb_t *cb_trans_end; /* Transaction completed */ trans_cb_t *cb_trans_abort; /* Transaction aborted */ @@ -424,6 +425,7 @@ struct clixon_plugin_api{ #define ca_trans_complete u.cau_backend.cb_trans_complete #define ca_trans_commit u.cau_backend.cb_trans_commit #define ca_trans_commit_done u.cau_backend.cb_trans_commit_done +#define ca_trans_revert_failed u.cau_backend.cb_trans_revert_failed #define ca_trans_revert u.cau_backend.cb_trans_revert #define ca_trans_end u.cau_backend.cb_trans_end #define ca_trans_abort u.cau_backend.cb_trans_abort From 021a1b4d9534966f109cc5637ec042ba2c0e8b11 Mon Sep 17 00:00:00 2001 From: EvgeniiVR Date: Fri, 30 Aug 2024 05:29:11 -0400 Subject: [PATCH 2/4] add revert failed cb --- apps/backend/backend_plugin.c | 16 ++++++++++++++++ lib/clixon/clixon_plugin.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index 7c905cdcd..af964ffbc 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -806,6 +806,20 @@ plugin_transaction_revert_all(clixon_handle h, return retval; /* ignore errors */ } +/*! Revert a commit for failed plugin + * The revert failed is called for only failed plugin before revert all cb. + */ +static int +plugin_transaction_revert_failed(clixon_plugin_t *cp, + clixon_handle h, + transaction_data_t *td) +{ + trans_cb_t *fn; + + if ((fn = clixon_plugin_api_get(cp)->ca_trans_revert_failed) != NULL) + return plugin_transaction_call_one(h, cp, fn, __FUNCTION__, td); + return 0; +} /*! Call single plugin transaction_commit() in a commit transaction * @@ -848,6 +862,8 @@ plugin_transaction_commit_all(clixon_handle h, while ((cp = clixon_plugin_each(h, cp)) != NULL) { i++; if (plugin_transaction_commit_one(cp, h, td) < 0){ + /*First make an effort ro revert transaction for the failed plugin*/ + plugin_transaction_revert_failed(cp, h, td); /* Make an effort to revert transaction */ plugin_transaction_revert_all(h, td, i-1); goto done; diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h index bf2d6655e..6fb9f9138 100644 --- a/lib/clixon/clixon_plugin.h +++ b/lib/clixon/clixon_plugin.h @@ -402,6 +402,7 @@ struct clixon_plugin_api{ trans_cb_t *cb_trans_complete; /* Transaction validation complete */ trans_cb_t *cb_trans_commit; /* Transaction commit */ trans_cb_t *cb_trans_commit_done; /* Transaction when commit done */ + trans_cb_t *cb_trans_revert_failed; /* Transaction revert failed*/ trans_cb_t *cb_trans_revert; /* Transaction revert */ trans_cb_t *cb_trans_end; /* Transaction completed */ trans_cb_t *cb_trans_abort; /* Transaction aborted */ @@ -424,6 +425,7 @@ struct clixon_plugin_api{ #define ca_trans_complete u.cau_backend.cb_trans_complete #define ca_trans_commit u.cau_backend.cb_trans_commit #define ca_trans_commit_done u.cau_backend.cb_trans_commit_done +#define ca_trans_revert_failed u.cau_backend.cb_trans_revert_failed #define ca_trans_revert u.cau_backend.cb_trans_revert #define ca_trans_end u.cau_backend.cb_trans_end #define ca_trans_abort u.cau_backend.cb_trans_abort From 673879e320629c60a07ecdaffad36818acce2242 Mon Sep 17 00:00:00 2001 From: EvgeniiVR Date: Sun, 8 Sep 2024 15:01:02 -0400 Subject: [PATCH 3/4] add commit failed cb --- apps/backend/backend_plugin.c | 10 +++++----- lib/clixon/clixon_plugin.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index af964ffbc..1d34e42c2 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -807,16 +807,16 @@ plugin_transaction_revert_all(clixon_handle h, } /*! Revert a commit for failed plugin - * The revert failed is called for only failed plugin before revert all cb. + * The commit failed is called for only failed plugin before revert all cb. */ static int -plugin_transaction_revert_failed(clixon_plugin_t *cp, +plugin_transaction_commit_failed(clixon_plugin_t *cp, clixon_handle h, transaction_data_t *td) { trans_cb_t *fn; - if ((fn = clixon_plugin_api_get(cp)->ca_trans_revert_failed) != NULL) + if ((fn = clixon_plugin_api_get(cp)->ca_trans_commit_failed) != NULL) return plugin_transaction_call_one(h, cp, fn, __FUNCTION__, td); return 0; } @@ -862,8 +862,8 @@ plugin_transaction_commit_all(clixon_handle h, while ((cp = clixon_plugin_each(h, cp)) != NULL) { i++; if (plugin_transaction_commit_one(cp, h, td) < 0){ - /*First make an effort ro revert transaction for the failed plugin*/ - plugin_transaction_revert_failed(cp, h, td); + /* First make an effort ro revert transaction for the failed plugin */ + plugin_transaction_commit_failed(cp, h, td); /* Make an effort to revert transaction */ plugin_transaction_revert_all(h, td, i-1); goto done; diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h index 6fb9f9138..e0071f25d 100644 --- a/lib/clixon/clixon_plugin.h +++ b/lib/clixon/clixon_plugin.h @@ -402,7 +402,7 @@ struct clixon_plugin_api{ trans_cb_t *cb_trans_complete; /* Transaction validation complete */ trans_cb_t *cb_trans_commit; /* Transaction commit */ trans_cb_t *cb_trans_commit_done; /* Transaction when commit done */ - trans_cb_t *cb_trans_revert_failed; /* Transaction revert failed*/ + trans_cb_t *cb_trans_commit_failed; /* Transaction revert failed*/ trans_cb_t *cb_trans_revert; /* Transaction revert */ trans_cb_t *cb_trans_end; /* Transaction completed */ trans_cb_t *cb_trans_abort; /* Transaction aborted */ @@ -425,7 +425,7 @@ struct clixon_plugin_api{ #define ca_trans_complete u.cau_backend.cb_trans_complete #define ca_trans_commit u.cau_backend.cb_trans_commit #define ca_trans_commit_done u.cau_backend.cb_trans_commit_done -#define ca_trans_revert_failed u.cau_backend.cb_trans_revert_failed +#define ca_trans_commit_failed u.cau_backend.cb_trans_commit_failed #define ca_trans_revert u.cau_backend.cb_trans_revert #define ca_trans_end u.cau_backend.cb_trans_end #define ca_trans_abort u.cau_backend.cb_trans_abort From bad379aea03a7e8990204e264e8f0bb6653c3f2a Mon Sep 17 00:00:00 2001 From: EvgeniiVR Date: Sun, 8 Sep 2024 15:12:01 -0400 Subject: [PATCH 4/4] add commit failed cb --- lib/clixon/clixon_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h index e0071f25d..b61ff2434 100644 --- a/lib/clixon/clixon_plugin.h +++ b/lib/clixon/clixon_plugin.h @@ -402,7 +402,7 @@ struct clixon_plugin_api{ trans_cb_t *cb_trans_complete; /* Transaction validation complete */ trans_cb_t *cb_trans_commit; /* Transaction commit */ trans_cb_t *cb_trans_commit_done; /* Transaction when commit done */ - trans_cb_t *cb_trans_commit_failed; /* Transaction revert failed*/ + trans_cb_t *cb_trans_commit_failed; /* Transaction commit failed*/ trans_cb_t *cb_trans_revert; /* Transaction revert */ trans_cb_t *cb_trans_end; /* Transaction completed */ trans_cb_t *cb_trans_abort; /* Transaction aborted */