diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-03-12 11:33:10 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-03-12 11:33:10 +0100 |
| commit | a166ca7fece8bbe3c66dcf0217cc81d20d185ab0 (patch) | |
| tree | b9cf10b1034e3f1d4d9c367ef2faa7e6bd206404 /src/exchange/taler-exchange-aggregator.c | |
| parent | 1ae2ba3d0a035734e4a28432e3246e58338fe9e8 (diff) | |
| download | exchange-a166ca7fece8bbe3c66dcf0217cc81d20d185ab0.tar.gz exchange-a166ca7fece8bbe3c66dcf0217cc81d20d185ab0.tar.bz2 exchange-a166ca7fece8bbe3c66dcf0217cc81d20d185ab0.zip | |
fix #5281 for exchange: do preflight check that an old transaction is no longer running by accident
Diffstat (limited to 'src/exchange/taler-exchange-aggregator.c')
| -rw-r--r-- | src/exchange/taler-exchange-aggregator.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index d5d43052d..49cbb2b93 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -618,7 +618,7 @@ refund_by_coin_cb (void *cls, } return GNUNET_OK; } - + /** * Function called with details about deposits that have been made, @@ -675,7 +675,7 @@ deposit_cb (void *cls, GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs); return qs; } - + GNUNET_assert (NULL == au->wire); au->wire = json_incref ((json_t *) wire); if (GNUNET_OK != @@ -810,7 +810,7 @@ aggregate_cb (void *cls, GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs); return qs; } - + if (au->rows_offset >= aggregation_limit) { /* Bug: we asked for at most #aggregation_limit results! */ @@ -1203,9 +1203,12 @@ run_reserve_closures (void *cls) GNUNET_SCHEDULER_shutdown (); return; } + db_plugin->preflight (db_plugin->cls, + session); if (GNUNET_OK != db_plugin->start (db_plugin->cls, - session)) + session, + "aggregator reserve closures")) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start database transaction!\n"); @@ -1413,7 +1416,8 @@ run_aggregation (void *cls) transaction to mark all* of the selected deposits as minor! */ if (GNUNET_OK != db_plugin->start (db_plugin->cls, - session)) + session, + "aggregator mark tiny transactions")) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start database transaction!\n"); @@ -1767,9 +1771,12 @@ run_transfers (void *cls) GNUNET_SCHEDULER_shutdown (); return; } + db_plugin->preflight (db_plugin->cls, + session); if (GNUNET_OK != db_plugin->start (db_plugin->cls, - session)) + session, + "aggregator run transfer")) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start database transaction!\n"); |