[taler-exchange] branch master updated: quick hack to see about improving melt serialization failures

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 21951eac quick hack to see about improving melt serialization failures
21951eac is described below

commit 21951eacc23611464ada18c99dfb4633b9fcc1b0
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Dec 8 18:22:07 2021 +0100

    quick hack to see about improving melt serialization failures
---
 src/exchange/taler-exchange-httpd_melt.c    | 82 +++++++++++++++++------------
 src/exchangedb/plugin_exchangedb_postgres.c |  3 +-
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_melt.c 
b/src/exchange/taler-exchange-httpd_melt.c
index 3347790b..c00eb8af 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -183,8 +183,11 @@ refresh_check_melt (struct MHD_Connection *connection,
   struct TALER_Amount spent;
   enum GNUNET_DB_QueryStatus qs;
 
-  /* Start with cost of this melt transaction */
-  spent = rmc->refresh_session.amount_with_fee;
+  /* Start with zero cost, as we already added this melt transaction
+     to the DB, so we will see it again during the queries below. */
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TEH_currency,
+                                        &spent));
 
   /* get historic transaction costs of this coin, including recoups as
      we might be a zombie coin */
@@ -311,43 +314,11 @@ melt_transaction (void *cls,
   enum GNUNET_DB_QueryStatus qs;
   uint32_t noreveal_index;
 
-  /* Check if we already created a matching refresh_session */
-  qs = TEH_plugin->get_melt_index (TEH_plugin->cls,
-                                   &rmc->refresh_session.rc,
-                                   &noreveal_index);
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-  {
-    TALER_LOG_DEBUG ("Coin was previously melted, returning old reply\n");
-    *mhd_ret = reply_melt_success (connection,
-                                   &rmc->refresh_session.rc,
-                                   noreveal_index);
-    /* Note: we return "hard error" to ensure the wrapper
-       does not retry the transaction, and to also not generate
-       a "fresh" response (as we would on "success") */
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (0 > qs)
-  {
-    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-      *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                             TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                             "melt index");
-    return qs;
-  }
-
-  /* check coin has enough funds remaining on it to cover melt cost */
-  qs = refresh_check_melt (connection,
-                           rmc,
-                           mhd_ret);
-  if (0 > qs)
-    return qs; /* if we failed, tell caller */
-
   /* pick challenge and persist it */
   rmc->refresh_session.noreveal_index
     = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG,
                                 TALER_CNC_KAPPA);
-  if (0 >=
+  if (0 >
       (qs = TEH_plugin->insert_melt (TEH_plugin->cls,
                                      &rmc->refresh_session)))
   {
@@ -361,6 +332,47 @@ melt_transaction (void *cls,
     }
     return qs;
   }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    /* Check if we already created a matching refresh_session */
+    qs = TEH_plugin->get_melt_index (TEH_plugin->cls,
+                                     &rmc->refresh_session.rc,
+                                     &noreveal_index);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+    {
+      TALER_LOG_DEBUG ("Coin was previously melted, returning old reply\n");
+      *mhd_ret = reply_melt_success (connection,
+                                     &rmc->refresh_session.rc,
+                                     noreveal_index);
+      /* Note: we return "hard error" to ensure the wrapper
+         does not retry the transaction, and to also not generate
+         a "fresh" response (as we would on "success") */
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (0 > qs)
+    {
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               
TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               "melt index");
+      return qs;
+    }
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+    {
+      /* Conflict on insert, but record does not exist?
+         That makes no sense. */
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+  }
+
+  /* check coin has enough funds remaining on it to cover melt cost */
+  qs = refresh_check_melt (connection,
+                           rmc,
+                           mhd_ret);
+  if (0 > qs)
+    return qs; /* if we failed, tell caller */
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
 }
 
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c 
b/src/exchangedb/plugin_exchangedb_postgres.c
index 4f0bc243..33383df5 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -798,7 +798,8 @@ prepare_statements (struct PostgresClosure *pg)
       ",noreveal_index "
       ") SELECT $1, known_coin_id, $3, $4, $5, $6"
       "    FROM known_coins"
-      "   WHERE coin_pub=$2",
+      "   WHERE coin_pub=$2"
+      " ON CONFLICT DO NOTHING",
       6),
     /* Used in #postgres_get_melt() to fetch
        high-level information about a melt operation */

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.