Merge pull request #455 from rchowinfoblox/cherrypick0.25

Rearrange lock in Commit/Rollback to eliminate race condition (cherry-pick into v0.25 branch)

Author: rchowinfoblox

.github/workflows/pr.yaml

@@ -19,11 +19,12 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.x"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
+            ${{ runner.os }}-go-${{ env.GITHUB_JOB }}-
             ${{ runner.os }}-go-
       - run: make test
       - name: uncommitted changes?

gorm/transaction.go

@@ -268,15 +268,15 @@ func (t *Transaction) beginWithContextAndOptions(ctx context.Context, opts *sql.
 // Rollback terminates transaction by calling `*gorm.DB.Rollback()`
 // Reset current transaction and returns an error if any.
 func (t *Transaction) Rollback() error {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
 	if t.current == nil {
 		return nil
 	}
 	if reflect.ValueOf(t.current.CommonDB()).IsNil() {
 		return status.Error(codes.Unavailable, "Database connection not available")
 	}
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
 	t.current.Rollback()
 	err := t.current.Error
 	t.current = nil
@@ -286,11 +286,12 @@ func (t *Transaction) Rollback() error {
 // Commit finishes transaction by calling `*gorm.DB.Commit()`
 // Reset current transaction and returns an error if any.
 func (t *Transaction) Commit(ctx context.Context) error {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
 	if t.current == nil || reflect.ValueOf(t.current.CommonDB()).IsNil() {
 		return nil
 	}
-	t.mu.Lock()
-	defer t.mu.Unlock()
 	t.current.Commit()
 	err := t.current.Error
 	if err == nil {