expand logging of HARD errors in DB reserve inserts

This commit is contained in:
Christian Grothoff 2018-04-04 17:01:59 +02:00
parent 1731f5dc77
commit 081ffe994a
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 10 additions and 3 deletions

View File

@ -292,8 +292,8 @@ history_cb (void *cls,
struct TALER_ReservePublicKeyP reserve_pub; struct TALER_ReservePublicKeyP reserve_pub;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got history callback, direction %u!\n", (unsigned int) dir); "Got history callback, direction %u!\n",
(unsigned int) dir);
if (TALER_BANK_DIRECTION_NONE == dir) if (TALER_BANK_DIRECTION_NONE == dir)
{ {
hh = NULL; hh = NULL;
@ -308,6 +308,7 @@ history_cb (void *cls,
"End of list. Committing progress!\n"); "End of list. Committing progress!\n");
qs = db_plugin->commit (db_plugin->cls, qs = db_plugin->commit (db_plugin->cls,
session); session);
GNUNET_break (0 <= qs);
if ( (GNUNET_YES == delay) && if ( (GNUNET_YES == delay) &&
(test_mode) ) (test_mode) )
{ {

View File

@ -1912,7 +1912,10 @@ postgres_reserves_in_insert (void *cls,
"reserve_create", "reserve_create",
params); params);
if (0 > qs) if (0 > qs)
{
GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
return qs; return qs;
}
if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
{ {
/* Maybe DB did not detect serializiability error already, /* Maybe DB did not detect serializiability error already,
@ -1938,7 +1941,10 @@ postgres_reserves_in_insert (void *cls,
"reserves_in_add_transaction", "reserves_in_add_transaction",
params); params);
if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs) if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
{
GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
return qs; return qs;
}
} }
if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == reserve_exists) if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == reserve_exists)
@ -1957,7 +1963,7 @@ postgres_reserves_in_insert (void *cls,
balance)) balance))
{ {
/* currency overflow or incompatible currency */ /* currency overflow or incompatible currency */
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Attempt to deposit incompatible amount into reserve\n"); "Attempt to deposit incompatible amount into reserve\n");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }