JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellitedb: always release savepoint processing orders (#2936)

Browse Source 
* satellite/satellitedb: Always release savepoint
  Release the savepoint when processing orders in any case.
* satellite/satellitedb: Wrap errors exec savepoints
  Wrap the errors returned by the execution of savepoints operations when
  processing orders.
This commit is contained in:
Ivan Fraixedes 2019-09-04 15:02:20 +02:00 committed by GitHub
parent 52cdca01a6
commit 83815ee7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
satellite/satellitedb/orders.go
View File

@ -270,7 +270,7 @@ func (db *ordersDB) ProcessOrders(ctx context.Context, requests []*orders.Proces
// see https://www.postgresql.org/message-id/13131805-BCBB-42DF-953B-27EE36AAF213%40yahoo.com
_, err = tx.Exec("savepoint sp")
if err != nil {
return nil, err
return nil, Error.Wrap(err)
}
insert := "INSERT INTO used_serials (serial_number_id, storage_node_id) SELECT id, ? FROM serial_numbers WHERE serial_number = ?"
@ -285,12 +285,13 @@ func (db *ordersDB) ProcessOrders(ctx context.Context, requests []*orders.Proces
return nil, Error.Wrap(err)
}
} else {
return nil, Error.Wrap(err)
_, rerr := tx.Exec("rollback to savepoint sp")
return nil, errs.Combine(Error.Wrap(err), Error.Wrap(rerr))
}
}
_, err = tx.Exec("release savepoint sp")
if err != nil {
return nil, err
return nil, Error.Wrap(err)
}
}