diff options
| author | Will Chandler <wchandler@gitlab.com> | 2022-11-07 22:55:05 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2022-11-07 22:55:05 +0300 |
| commit | 038b442dc21c71a69ad170a61ce79a12a74fb725 (patch) | |
| tree | c7e56da26dbe269a6208a8a9251231ce268eb68a | |
| parent | b32121facdc4cdd4939400dafeeb919bb2360004 (diff) | |
| parent | ecb10851b051b9e0453b51f99c18a7ced160fb44 (diff) | |
Merge branch 'jt-praefect-transaction-errors' into 'master'
Praefect: Cancel node voter error message
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5019
Merged-by: Will Chandler <wchandler@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Co-authored-by: Justin Tobler <jtobler@gitlab.com>
| -rw-r--r-- | internal/praefect/transactions/manager.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/praefect/transactions/manager.go b/internal/praefect/transactions/manager.go index 9231dbd19..3405ffbf9 100644 --- a/internal/praefect/transactions/manager.go +++ b/internal/praefect/transactions/manager.go @@ -244,7 +244,7 @@ func (mgr *Manager) CancelTransactionNodeVoter(transactionID uint64, node string } if err := transaction.cancelNodeVoter(node); err != nil { - return err + return fmt.Errorf("canceling transaction node voter: %w", err) } return nil |