diff options
| -rw-r--r-- | src/exchange/taler-exchange-wirewatch.c | 10 | ||||
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 40 | ||||
| -rw-r--r-- | src/include/taler_exchangedb_plugin.h | 14 |
3 files changed, 63 insertions, 1 deletions
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c index 6b63de76a..58c8f82a5 100644 --- a/src/exchange/taler-exchange-wirewatch.c +++ b/src/exchange/taler-exchange-wirewatch.c @@ -226,6 +226,8 @@ shutdown_task (void *cls) while (NULL != (wa = wa_head)) { + enum GNUNET_DB_QueryStatus qs; + if (NULL != wa->hh) { TALER_BANK_credit_history_cancel (wa->hh); @@ -239,7 +241,13 @@ shutdown_task (void *cls) db_plugin->rollback (db_plugin->cls); wa->started_transaction = false; } - // FIXME: delete shard lock here (#7124) + qs = db_plugin->abort_shard (db_plugin->cls, + wa_pos->job_name, + wa_pos->shard_start, + wa_pos->shard_end); + if (qs <= 0) + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Failed to abort work shard on shutdown\n"); GNUNET_free (wa->job_name); GNUNET_free (wa); } diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 9d3171c2e..ff2dcbf42 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -3354,6 +3354,15 @@ prepare_statements (struct PostgresClosure *pg) " ORDER BY end_row DESC" " LIMIT 1;", 1), + /* Used in #postgres_abort_shard() */ + GNUNET_PQ_make_prepare ( + "abort_shard", + "UPDATE work_shards" + " SET last_attempt=0" + " WHERE job_name = $1 " + " AND start_row = $2 " + " AND end_row = $3;", + 3), /* Used in #postgres_begin_shard() */ GNUNET_PQ_make_prepare ( "claim_next_shard", @@ -12587,6 +12596,35 @@ commit: /** + * Function called to abort work on a shard. + * + * @param cls the @e cls of this struct with the plugin-specific state + * @param job_name name of the operation to abort a word shard for + * @param start_row inclusive start row of the shard + * @param end_row exclusive end row of the shard + * @return transaction status code + */ +static enum GNUNET_DB_QueryStatus +postgres_abort_shard (void *cls, + const char *job_name, + uint64_t start_row, + uint64_t end_row) +{ + struct PostgresClosure *pg = cls; + struct GNUNET_PQ_QueryParam params[] = { + GNUNET_PQ_query_param_string (job_name), + GNUNET_PQ_query_param_uint64 (&start_row), + GNUNET_PQ_query_param_uint64 (&end_row), + GNUNET_PQ_query_param_end + }; + + return GNUNET_PQ_eval_prepared_non_select (pg->conn, + "abort_shard", + params); +} + + +/** * Function called to persist that work on a shard was completed. * * @param cls the @e cls of this struct with the plugin-specific state @@ -13889,6 +13927,8 @@ libtaler_plugin_exchangedb_postgres_init (void *cls) = &postgres_insert_records_by_table; plugin->begin_shard = &postgres_begin_shard; + plugin->abort_shard + = &postgres_abort_shard; plugin->complete_shard = &postgres_complete_shard; plugin->begin_revolving_shard diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 18f2fd924..abc7a7aa1 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -4296,6 +4296,20 @@ struct TALER_EXCHANGEDB_Plugin uint64_t *start_row, uint64_t *end_row); + /** + * Function called to abort work on a shard. + * + * @param cls the @e cls of this struct with the plugin-specific state + * @param job_name name of the operation to abort a word shard for + * @param start_row inclusive start row of the shard + * @param end_row exclusive end row of the shard + * @return transaction status code + */ + enum GNUNET_DB_QueryStatus + (*abort_shard)(void *cls, + const char *job_name, + uint64_t start_row, + uint64_t end_row); /** * Function called to persist that work on a shard was completed. |