Merge pull request #83 from mcarmonaa/fix/siva-repositories-release-location-lock

jfontan · web-flow · commit 63019a4105df · 2019-08-07T12:24:29.000+02:00
siva: release location lock rolling back if repository saveVersion fails
diff --git a/siva/repository.go b/siva/repository.go
@@ -13,7 +13,7 @@ import (
 )
 
 // ErrRepoAlreadyClosed is returned when a repository opened in RW mode was already closed.
-var ErrRepoAlreadyClosed = errors.NewKind("repository % already closed")
+var ErrRepoAlreadyClosed = errors.NewKind("repository %s already closed")
 
 // Repository is an implementation for siva files of borges.Repository
 // interface.
@@ -108,6 +108,8 @@ func (r *Repository) Commit() error {
 
 	err := r.saveVersion()
 	if err != nil {
+		// TODO: log the rollback error
+		_ = r.location.Rollback(r.mode)
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// ErrRepoAlreadyClosed is returned when a repository opened in RW mode was already closed.`
`16`		`-var ErrRepoAlreadyClosed = errors.NewKind("repository % already closed")`
	`16`	`+var ErrRepoAlreadyClosed = errors.NewKind("repository %s already closed")`
`17`	`17`
`18`	`18`	`// Repository is an implementation for siva files of borges.Repository`
`19`	`19`	`// interface.`
`@@ -108,6 +108,8 @@ func (r *Repository) Commit() error {`
`108`	`108`
`109`	`109`	`err := r.saveVersion()`
`110`	`110`	`if err != nil {`
	`111`	`+ // TODO: log the rollback error`
	`112`	`+ _ = r.location.Rollback(r.mode)`
`111`	`113`	`return err`
`112`	`114`	`}`
`113`	`115`