Merge pull request #294 from scylladb/make_mutate_simplier

fix(cqlStore): make mutate simplier
scylladb · May 2, 2023 · 6945ca7 · 6945ca7
2 parents 6eea6ba + 5404de3
commit 6945ca7
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/store/cqlstore.go b/store/cqlstore.go
@@ -50,23 +50,19 @@ func (cs *cqlStore) mutate(ctx context.Context, builder qb.Builder, ts time.Time
 	for i = 0; i < cs.maxRetriesMutate; i++ {
 		err = cs.doMutate(ctx, builder, ts, values...)
 		if err == nil {
-			break
+			cs.ops.WithLabelValues(cs.system, opType(builder)).Inc()
+			return nil
 		}
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
 		case <-time.After(cs.maxRetriesMutateSleep):
 		}
 	}
-	if err != nil {
-		if w := cs.logger.Check(zap.InfoLevel, "failed to apply mutation"); w != nil {
-			w.Write(zap.Int("attempts", i), zap.Error(err))
-		}
-		return
+	if w := cs.logger.Check(zap.InfoLevel, "failed to apply mutation"); w != nil {
+		w.Write(zap.Int("attempts", i), zap.Error(err))
 	}
-
-	cs.ops.WithLabelValues(cs.system, opType(builder)).Inc()
-	return
+	return err
 }
 
 func (cs *cqlStore) doMutate(ctx context.Context, builder qb.Builder, ts time.Time, values ...interface{}) error {