kvdb/postgres: remove global application level lock

channeldb/payment_control.go

@@ -159,7 +159,7 @@ func (p *PaymentControl) InitPayment(paymentHash lntypes.Hash,
 		prefetchPayment(tx, paymentHash)
 		bucket, err := createPaymentBucket(tx, paymentHash)
 		if err != nil {
-			return err
+			return fmt.Errorf("couldn't create bucket: %w", err)
 		}
 
 		// Get the existing status of this payment, if any.
@@ -171,14 +171,15 @@ func (p *PaymentControl) InitPayment(paymentHash lntypes.Hash,
 		// retrying the payment or return a specific error.
 		case err == nil:
 			if err := paymentStatus.initializable(); err != nil {
-				updateErr = err
+				updateErr = fmt.Errorf("initialize: %w", err)
 				return nil
 			}
 
 		// Otherwise, if the error is not `ErrPaymentNotInitiated`,
 		// we'll return the error.
 		case !errors.Is(err, ErrPaymentNotInitiated):
-			return err
+			return fmt.Errorf("couldn't fetch payment status: %w",
+				err)
 		}
 
 		// Before we set our new sequence number, we check whether this
@@ -190,7 +191,8 @@ func (p *PaymentControl) InitPayment(paymentHash lntypes.Hash,
 		if seqBytes != nil {
 			indexBucket := tx.ReadWriteBucket(paymentsIndexBucket)
 			if err := indexBucket.Delete(seqBytes); err != nil {
-				return err
+				return fmt.Errorf("couldn't delete index "+
+					"bucket: %w", err)
 			}
 		}
 
@@ -201,38 +203,45 @@ func (p *PaymentControl) InitPayment(paymentHash lntypes.Hash,
 			tx, sequenceNum, info.PaymentIdentifier,
 		)
 		if err != nil {
-			return err
+			return fmt.Errorf("couldn't create payment index "+
+				"entry: %w", err)
 		}
 
 		err = bucket.Put(paymentSequenceKey, sequenceNum)
 		if err != nil {
-			return err
+			return fmt.Errorf("couldn't put sequence key: %w", err)
 		}
 
 		// Add the payment info to the bucket, which contains the
 		// static information for this payment
 		err = bucket.Put(paymentCreationInfoKey, infoBytes)
 		if err != nil {
-			return err
+			return fmt.Errorf("couldn't put creation key info: %w",
+				err)
 		}
 
 		// We'll delete any lingering HTLCs to start with, in case we
 		// are initializing a payment that was attempted earlier, but
 		// left in a state where we could retry.
 		err = bucket.DeleteNestedBucket(paymentHtlcsBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
+		if err != nil && !errors.Is(err, kvdb.ErrBucketNotFound) {
+			return fmt.Errorf("couldn't delete nested bucket: %w",
+				err)
 		}
 
 		// Also delete any lingering failure info now that we are
 		// re-attempting.
 		return bucket.Delete(paymentFailInfoKey)
 	})
 	if err != nil {
-		return err
+		return fmt.Errorf("error in batch: %w", err)
+	}
+
+	if updateErr != nil {
+		return fmt.Errorf("update err: %w", updateErr)
 	}
 
-	return updateErr
+	return nil
 }
 
 // DeleteFailedAttempts deletes all failed htlcs for a payment if configured
@@ -521,7 +530,7 @@ func (p *PaymentControl) Fail(paymentHash lntypes.Hash,
 
 		prefetchPayment(tx, paymentHash)
 		bucket, err := fetchPaymentBucketUpdate(tx, paymentHash)
-		if err == ErrPaymentNotInitiated {
+		if errors.Is(err, ErrPaymentNotInitiated) {
 			updateErr = ErrPaymentNotInitiated
 			return nil
 		} else if err != nil {

kvdb/sqlbase/db.go

@@ -35,7 +35,7 @@ const (
 	DefaultInitialRetryDelay = time.Millisecond * 50
 
 	// DefaultMaxRetryDelay is the default maximum delay between retries.
-	DefaultMaxRetryDelay = time.Second * 5
+	DefaultMaxRetryDelay = time.Second
 )
 
 // Config holds a set of configuration options of a sql database connection.
@@ -345,7 +345,7 @@ func (db *db) executeTransaction(f func(tx walletdb.ReadWriteTx) error,
 			}
 		}
 
-		return commitErr
+		return nil
 	}
 
 	// If we get to this point, then we weren't able to successfully commit

lnrpc/routerrpc/router_server.go

@@ -1265,7 +1265,7 @@ func (s *Server) subscribePayment(identifier lntypes.Hash) (
 	sub, err := router.Tower.SubscribePayment(identifier)
 
 	switch {
-	case err == channeldb.ErrPaymentNotInitiated:
+	case errors.Is(err, channeldb.ErrPaymentNotInitiated):
 		return nil, status.Error(codes.NotFound, err.Error())
 	case err != nil:
 		return nil, err

routing/router.go

@@ -2442,7 +2442,8 @@ func (r *ChannelRouter) PreparePayment(payment *LightningPayment) (
 	// control.
 	paySession, err := r.cfg.SessionSource.NewPaymentSession(payment)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("error creating payment session: "+
+			"%w", err)
 	}
 
 	// Record this payment hash with the ControlTower, ensuring it is not