lib-dict-extra: dict-client - Retry transactions on errors if possible

If transaction has "atomic inc" operation, it cannot be retried.

diff --git a/src/lib-dict-extra/dict-client.c b/src/lib-dict-extra/dict-client.c
index 459f07b959a6cac9a19b682a0c8efd69ce007452..c565070130dc3e16558bd8055d28ee91b29daa16 100644 (file)
--- a/src/lib-dict-extra/dict-client.c
+++ b/src/lib-dict-extra/dict-client.c
@@ -112,6 +112,7 @@ struct client_dict_transaction_context {
 
        unsigned int id;
        string_t *queries;
+       bool can_retry;
 };
 
 struct dict_proxy_settings {
@@ -1204,6 +1205,7 @@ client_dict_transaction_init(struct dict *_dict)
        ctx->ctx.dict = _dict;
        ctx->id = ++dict->transaction_id_counter;
        ctx->queries = str_new(default_pool, 256);
+       ctx->can_retry = TRUE;
 
        DLLIST_PREPEND(&dict->transactions, ctx);
        return &ctx->ctx;
@@ -1310,6 +1312,7 @@ client_dict_transaction_commit(struct dict_transaction_context *_ctx,
                            ctx->id);
                cmd = client_dict_cmd_init(dict, str_c(ctx->queries));
                cmd->trans = ctx;
+               cmd->retry_errors = ctx->can_retry;
 
                cmd->callback = client_dict_transaction_commit_callback;
                cmd->api_callback.commit = callback;
@@ -1385,6 +1388,9 @@ static void client_dict_atomic_inc(struct dict_transaction_context *_ctx,
                (struct client_dict_transaction_context *)_ctx;
        const char *query;
 
+       /* Retrying may cause it to increment too many times */
+       ctx->can_retry = FALSE;
+
        query = t_strdup_printf("%c%u\t%s\t%lld\n",
                                DICT_PROTOCOL_CMD_ATOMIC_INC,
                                ctx->id, str_tabescape(key), diff);