diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-01-18 13:39:38 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-01-18 13:39:38 +0300 |
| commit | c275ce42bff89cf6930e603aa2cc9f75e1b0d309 (patch) | |
| tree | 086dbca7a474ef2fd3086aa4dd05276c1a1010fa | |
| parent | 62920dd355e2b81e4e2412a4744c8482df112711 (diff) | |
| parent | ee6f7f1ed92525b5386d0d8d0ccbe31c89dacfd4 (diff) | |
Merge branch 'enable_libgit2_fsync' into 'master'
Enable fsync for git objects written by git2go
Closes #3998
See merge request gitlab-org/gitaly!4261
| -rw-r--r-- | cmd/gitaly-git2go/main.go | 5 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cmd/gitaly-git2go/main.go b/cmd/gitaly-git2go/main.go index c3a7ad906..66dd67d45 100644 --- a/cmd/gitaly-git2go/main.go +++ b/cmd/gitaly-git2go/main.go @@ -10,6 +10,7 @@ import ( "io" "os" + git "github.com/libgit2/git2go/v32" "gitlab.com/gitlab-org/gitaly/v14/internal/git2go" ) @@ -60,6 +61,10 @@ func main() { fatalf("%s: trailing arguments", subcmdFlags.Name()) } + if err := git.EnableFsyncGitDir(true); err != nil { + fatalf("enable fsync: %s", err) + } + if err := subcmd.Run(context.Background(), os.Stdin, os.Stdout); err != nil { fatalf("%s: %s", subcmdFlags.Name(), err) } @@ -26,7 +26,7 @@ require ( github.com/jackc/pgtype v1.9.1 github.com/jackc/pgx/v4 v4.14.1 github.com/kelseyhightower/envconfig v1.3.0 - github.com/libgit2/git2go/v32 v32.0.5 + github.com/libgit2/git2go/v32 v32.1.6 github.com/olekukonko/tablewriter v0.0.2 github.com/opencontainers/runtime-spec v1.0.2 github.com/opentracing/opentracing-go v1.2.0 @@ -630,8 +630,8 @@ github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libgit2/git2go v0.0.0-20190104134018-ecaeb7a21d47 h1:HDt7WT3kpXSHq4mlOuLzgXH9LeOK1qlhyFdKIAzxxeM= github.com/libgit2/git2go v0.0.0-20190104134018-ecaeb7a21d47/go.mod h1:4bKN42efkbNYMZlvDfxGDxzl066GhpvIircZDsm8Y+Y= github.com/libgit2/git2go/v31 v31.4.12/go.mod h1:c/rkJcBcUFx6wHaT++UwNpKvIsmPNqCeQ/vzO4DrEec= -github.com/libgit2/git2go/v32 v32.0.5 h1:6hrR4+6q0HGd2rRDShxqYkVG8RW2RccuoZgaeQZk6xQ= -github.com/libgit2/git2go/v32 v32.0.5/go.mod h1:FAA2ePV5PlLjw1ccncFIvu2v8hJSZVN5IzEn4lo/vwo= +github.com/libgit2/git2go/v32 v32.1.6 h1:ItbrC6wLE4HdYntjhTfcn9PGSvmS8wwDCIbuR+KlAmo= +github.com/libgit2/git2go/v32 v32.1.6/go.mod h1:FAA2ePV5PlLjw1ccncFIvu2v8hJSZVN5IzEn4lo/vwo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20200305213919-a88bf8de3718/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20210210170715-a8dfcb80d3a7 h1:YjW+hUb8Fh2S58z4av4t/0cBMK/Q0aP48RocCFsC8yI= |