style(yugabyte): simplify error conditions

golang-migrate · Aug 25, 2022 · 5582a20 · 5582a20
1 parent bf926fa
commit 5582a20
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/database/yugabytedb/yugabytedb.go b/database/yugabytedb/yugabytedb.go
@@ -421,16 +421,20 @@ func (c *YugabyteDB) doTxWithRetry(
 		//nolint:errcheck
 		defer tx.Rollback()
 
-		if err := fn(tx); err != nil && !errIsRetryable(err) {
+		if err := fn(tx); err != nil {
+			if errIsRetryable(err) {
+				return err
+			}
+
 			return backoff.Permanent(err)
-		} else if err != nil {
-			return err
 		}
 
-		if err := tx.Commit(); err != nil && !errIsRetryable(err) {
+		if err := tx.Commit(); err != nil {
+			if errIsRetryable(err) {
+				return err
+			}
+
 			return backoff.Permanent(err)
-		} else if err != nil {
-			return err
 		}
 
 		return nil