taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

combine auto-commited transactions in refresh/reveal into one big transaction

Browse Source
This commit is contained in:
Christian Grothoff 2022-05-12 13:31:15 +02:00
parent 93eb88a8c9
commit 35b4a51e14
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit 836cdc706d849ec5965b3b7795fcefe95344a969
Subproject commit f6948ba8fbcdfb648ed78ee81a392922ded36b99

51
src/exchange/taler-exchange-httpd_refreshes_reveal.c
View File

@ -444,6 +444,7 @@ resolve_refreshes_reveal_denominations (struct MHD_Connection *connection,
MHD_RESULT ret;
struct TEH_KeyStateHandle *ksh;
uint64_t melt_serial_id;
enum GNUNET_DB_QueryStatus qs;
memset (dks, 0, sizeof (dks));
memset (rrcs, 0, sizeof (rrcs));
@ -768,11 +769,20 @@ clean_age:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Signatures ready, starting DB interaction\n");
// FIXME: do all this (and the above) in ONE DB transaction!
/* Persist operation result in DB */
for (unsigned int r = 0; r<MAX_TRANSACTION_COMMIT_RETRIES; r++)
{
enum GNUNET_DB_QueryStatus qs;
/* Persist operation result in DB */
if (GNUNET_OK !=
TEH_plugin->start (TEH_plugin->cls,
"insert_refresh_reveal batch"))
{
GNUNET_break (0);
ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_DB_START_FAILED,
NULL);
goto cleanup;
}
for (unsigned int i = 0; i<rctx->num_fresh_coins; i++)
{
struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &rrcs[i];
@ -786,18 +796,47 @@ clean_age:
TALER_CNC_KAPPA - 1,
rctx->transfer_privs,
&rctx->gamma_tp);
if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
{
TEH_plugin->rollback (TEH_plugin->cls);
continue;
}
/* 0 == qs is ok, as we did not check for repeated requests */
if (0 > qs)
if (GNUNET_DB_STATUS_HARD_ERROR == qs)
{
GNUNET_break (0);
TEH_plugin->rollback (TEH_plugin->cls);
ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_DB_STORE_FAILED,
"insert_refresh_reveal");
goto cleanup;
}
qs = TEH_plugin->commit (TEH_plugin->cls);
if (qs >= 0)
break; /* success */
if (GNUNET_DB_STATUS_HARD_ERROR == qs)
{
GNUNET_break (0);
TEH_plugin->rollback (TEH_plugin->cls);
ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_DB_COMMIT_FAILED,
NULL);
goto cleanup;
}
TEH_plugin->rollback (TEH_plugin->cls);
}
if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
{
GNUNET_break (0);
TEH_plugin->rollback (TEH_plugin->cls);
ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_DB_SOFT_FAILURE,
NULL);
goto cleanup;
}
/* Generate final (positive) response */
ret = reply_refreshes_reveal_success (connection,
num_fresh_coins,

6
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -1263,7 +1263,8 @@ prepare_statements (struct PostgresClosure *pg)
") SELECT $1, $2, $3, "
" denominations_serial, $5, $6, $7, $8"
" FROM denominations"
" WHERE denom_pub_hash=$4;",
" WHERE denom_pub_hash=$4"
" ON CONFLICT DO NOTHING;",
8),
/* Obtain information about the coins created in a refresh
operation, used in #postgres_get_refresh_reveal() */
@ -1293,7 +1294,8 @@ prepare_statements (struct PostgresClosure *pg)
"(melt_serial_id"
",transfer_pub"
",transfer_privs"
") VALUES ($1, $2, $3);",
") VALUES ($1, $2, $3)"
" ON CONFLICT DO NOTHING;",
3),
/* Used in #postgres_insert_refund() to store refund information */
GNUNET_PQ_make_prepare (

4
src/include/taler_exchangedb_plugin.h
View File

@ -635,8 +635,8 @@ struct TALER_EXCHANGEDB_Reserve
struct TALER_EXCHANGEDB_DenominationKeyMetaData
{
/**
* Start time of the validity period for this key.
*/
* Start time of the validity period for this key.
*/
struct GNUNET_TIME_Timestamp start;
/**