Merge pull request #920 from dolthub/aaron/use-forked-fslock

go/go.mod: Adopt dolthub/fslock fork. Forked version uses Open(RDRW) for lock file on *nix, which works on NFS.
dolthub · Oct 9, 2020 · 19f9e57 · 19f9e57
2 parents 5f8afa0 + 36abc47
commit 19f9e57
Show file tree

Hide file tree

Showing 8 changed files with 207 additions and 204 deletions.
diff --git a/go/Godeps/LICENSES b/go/Godeps/LICENSES
diff --git a/go/go.mod b/go/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/hashicorp/memberlist v0.1.6 // indirect
 	github.com/jedib0t/go-pretty v4.3.1-0.20191104025401-85fe5d6a7c4d+incompatible
 	github.com/jpillora/backoff v1.0.0
-	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
+	github.com/dolthub/fslock v0.0.2
 	github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d
 	github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6
 	github.com/lestrrat-go/strftime v1.0.3 // indirect

diff --git a/go/go.sum b/go/go.sum
@@ -145,6 +145,8 @@ github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMS
 github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/dolthub/fslock v0.0.2 h1:8vUh47iKovgrtXNrXVIzsIoWLlspoXg+3nslhUzgKSw=
+github.com/dolthub/fslock v0.0.2/go.mod h1:0i7bsNkK+XHwFL3dIsSWeXSV7sykVzzVr6+jq8oeEo0=
 github.com/dolthub/go-mysql-server v0.6.1-0.20201001225250-48db640bd4d5 h1:UmF+VCY4QQRLaKVcynbCIoaGA50gjn6+g21LO7+cqMM=
 github.com/dolthub/go-mysql-server v0.6.1-0.20201001225250-48db640bd4d5/go.mod h1:8oqMGi0sADtMwgvPeZigVvO/8dmxR4v4H/07Ad4K9hM=
 github.com/dolthub/vitess v0.0.0-20200925174744-823c7e177c3f h1:37HLaUKuZMDOxKT8Lxq7Z1IZLiwTp6UKaDR7xC5aihM=
@@ -991,6 +993,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

diff --git a/go/libraries/events/event_flush.go b/go/libraries/events/event_flush.go
@@ -19,9 +19,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/dolthub/fslock"
 	"github.com/fatih/color"
 	"github.com/golang/protobuf/proto"
-	"github.com/juju/fslock"
 
 	eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1"
 	"github.com/dolthub/dolt/go/libraries/utils/filesys"

diff --git a/go/libraries/utils/filesys/lock.go b/go/libraries/utils/filesys/lock.go
@@ -18,7 +18,7 @@ import (
 	"errors"
 	"sync/atomic"
 
-	"github.com/juju/fslock"
+	"github.com/dolthub/fslock"
 )
 
 const unlockedStateValue int32 = 0

diff --git a/go/store/blobstore/local.go b/go/store/blobstore/local.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/dolthub/dolt/go/store/util/tempfiles"
 
+	"github.com/dolthub/fslock"
 	"github.com/google/uuid"
-	"github.com/juju/fslock"
 )
 
 const (

diff --git a/go/store/nbs/file_manifest.go b/go/store/nbs/file_manifest.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/juju/fslock"
+	"github.com/dolthub/fslock"
 
 	"github.com/dolthub/dolt/go/store/hash"
 	"github.com/dolthub/dolt/go/store/util/tempfiles"

diff --git a/go/store/nbs/test/manifest_clobber.go b/go/store/nbs/test/manifest_clobber.go
@@ -26,7 +26,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/juju/fslock"
+	"github.com/dolthub/fslock"
 )
 
 func main() {