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

satellitedb/overlaycache: avoid tx leak in case of error (#2095)

Browse Source
This commit is contained in:
Egon Elbre 2019-06-03 17:37:43 +03:00 committed by GitHub
parent 6809129e6f
commit b8e0ac6377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
satellite/satellitedb/overlaycache.go
View File

@ -564,7 +564,7 @@ func (cache *overlaycache) CreateStats(ctx context.Context, nodeID storj.NodeID,
// however we've seen from some crashes that it does. We need to track down the cause of these crashes // however we've seen from some crashes that it does. We need to track down the cause of these crashes
// but for now we're adding a nil check to prevent a panic. // but for now we're adding a nil check to prevent a panic.
if dbNode == nil { if dbNode == nil {
return nil, Error.Wrap(errs.New("unable to get node by ID: %s", nodeID.String())) return nil, Error.Wrap(errs.Combine(errs.New("unable to get node by ID: %v", nodeID), tx.Rollback()))
} }
return getNodeStats(dbNode), Error.Wrap(tx.Commit()) return getNodeStats(dbNode), Error.Wrap(tx.Commit())
} }
@ -627,7 +627,7 @@ func (cache *overlaycache) UpdateStats(ctx context.Context, updateReq *overlay.U
// however we've seen from some crashes that it does. We need to track down the cause of these crashes // however we've seen from some crashes that it does. We need to track down the cause of these crashes
// but for now we're adding a nil check to prevent a panic. // but for now we're adding a nil check to prevent a panic.
if dbNode == nil { if dbNode == nil {
return nil, Error.Wrap(errs.New("unable to get node by ID: %s", nodeID.String())) return nil, Error.Wrap(errs.Combine(errs.New("unable to get node by ID: %v", nodeID), tx.Rollback()))
} }
return getNodeStats(dbNode), Error.Wrap(tx.Commit()) return getNodeStats(dbNode), Error.Wrap(tx.Commit())
@ -719,7 +719,7 @@ func (cache *overlaycache) UpdateUptime(ctx context.Context, nodeID storj.NodeID
// however we've seen from some crashes that it does. We need to track down the cause of these crashes // however we've seen from some crashes that it does. We need to track down the cause of these crashes
// but for now we're adding a nil check to prevent a panic. // but for now we're adding a nil check to prevent a panic.
if dbNode == nil { if dbNode == nil {
return nil, Error.Wrap(errs.New("unable to get node by ID: %s", nodeID.String())) return nil, Error.Wrap(errs.Combine(errs.New("unable to get node by ID: %v", nodeID), tx.Rollback()))
} }
return getNodeStats(dbNode), Error.Wrap(tx.Commit()) return getNodeStats(dbNode), Error.Wrap(tx.Commit())