1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
|
package repository
import (
"bytes"
"fmt"
"os"
"path/filepath"
"testing"
"time"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/internal/git/stats"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/internal/testhelper/testserver"
"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
func TestWriteCommitGraph_withExistingCommitGraphCreatedWithDefaults(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg, repo, repoPath, client := setupRepositoryService(ctx, t)
commitGraphPath := filepath.Join(repoPath, stats.CommitGraphRelPath)
require.NoError(t, os.RemoveAll(commitGraphPath))
chainPath := filepath.Join(repoPath, stats.CommitGraphChainRelPath)
require.NoFileExists(t, chainPath, "sanity check no commit graph chain exists")
// write commit graph using an old approach
gittest.Exec(t, cfg, "-C", repoPath, "commit-graph", "write", "--reachable")
require.FileExists(t, commitGraphPath)
treeEntry := gittest.TreeEntry{Mode: "100644", Path: "file.txt", Content: "something"}
gittest.WriteCommit(
t,
cfg,
repoPath,
gittest.WithBranch(t.Name()),
gittest.WithTreeEntries(treeEntry),
)
//nolint:staticcheck
res, err := client.WriteCommitGraph(ctx, &gitalypb.WriteCommitGraphRequest{
Repository: repo,
SplitStrategy: gitalypb.WriteCommitGraphRequest_SizeMultiple,
})
require.NoError(t, err)
require.NotNil(t, res)
require.FileExists(t, chainPath, "commit graph chain should be created")
requireBloomFilterUsed(t, repoPath)
require.NoFileExists(t, commitGraphPath, "commit-graph file should be replaced with commit graph chain")
}
func TestWriteCommitGraph_withExistingCommitGraphCreatedWithSplit(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg, repo, repoPath, client := setupRepositoryService(ctx, t)
commitGraphPath := filepath.Join(repoPath, stats.CommitGraphRelPath)
require.NoError(t, os.RemoveAll(commitGraphPath))
chainPath := filepath.Join(repoPath, stats.CommitGraphChainRelPath)
require.NoFileExists(t, chainPath, "sanity check no commit graph chain exists")
// write commit graph chain
gittest.Exec(t, cfg, "-C", repoPath, "commit-graph", "write", "--reachable", "--split")
require.FileExists(t, chainPath)
treeEntry := gittest.TreeEntry{Mode: "100644", Path: "file.txt", Content: "something"}
gittest.WriteCommit(
t,
cfg,
repoPath,
gittest.WithBranch(t.Name()),
gittest.WithTreeEntries(treeEntry),
)
//nolint:staticcheck
res, err := client.WriteCommitGraph(ctx, &gitalypb.WriteCommitGraphRequest{
Repository: repo,
SplitStrategy: gitalypb.WriteCommitGraphRequest_SizeMultiple,
})
require.NoError(t, err)
require.NotNil(t, res)
require.FileExists(t, chainPath, "commit graph chain should be created")
requireBloomFilterUsed(t, repoPath)
require.NoFileExists(t, commitGraphPath, "commit-graph file should not be created")
}
func TestWriteCommitGraph(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
_, repo, repoPath, client := setupRepositoryService(ctx, t)
chainPath := filepath.Join(repoPath, stats.CommitGraphChainRelPath)
require.NoFileExists(t, chainPath)
//nolint:staticcheck
res, err := client.WriteCommitGraph(ctx, &gitalypb.WriteCommitGraphRequest{
Repository: repo,
SplitStrategy: gitalypb.WriteCommitGraphRequest_SizeMultiple,
})
require.NoError(t, err)
require.NotNil(t, res)
require.FileExists(t, chainPath)
}
func TestWriteCommitGraph_validationChecks(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg, repo, _, client := setupRepositoryService(ctx, t, testserver.WithDisablePraefect())
for _, tc := range []struct {
desc string
req *gitalypb.WriteCommitGraphRequest
expErr error
}{
{
desc: "invalid split strategy",
req: &gitalypb.WriteCommitGraphRequest{
Repository: repo,
SplitStrategy: gitalypb.WriteCommitGraphRequest_SplitStrategy(42),
},
expErr: status.Error(codes.InvalidArgument, "unsupported split strategy: 42"),
},
{
desc: "no repository",
req: &gitalypb.WriteCommitGraphRequest{},
expErr: status.Error(codes.InvalidArgument, "empty Repository"),
},
{
desc: "invalid storage",
req: &gitalypb.WriteCommitGraphRequest{Repository: &gitalypb.Repository{StorageName: "invalid"}},
expErr: status.Error(codes.InvalidArgument, `GetStorageByName: no such storage: "invalid"`),
},
{
desc: "not existing repository",
req: &gitalypb.WriteCommitGraphRequest{Repository: &gitalypb.Repository{StorageName: repo.StorageName, RelativePath: "invalid"}},
expErr: status.Error(codes.NotFound, fmt.Sprintf(`GetRepoPath: not a git repository: "%s/invalid"`, cfg.Storages[0].Path)),
},
} {
t.Run(tc.desc, func(t *testing.T) {
//nolint:staticcheck
_, err := client.WriteCommitGraph(ctx, tc.req)
testhelper.RequireGrpcError(t, tc.expErr, err)
})
}
}
func TestUpdateCommitGraph(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg, repo, repoPath, client := setupRepositoryService(ctx, t)
chainPath := filepath.Join(repoPath, stats.CommitGraphChainRelPath)
require.NoFileExists(t, chainPath)
//nolint:staticcheck
res, err := client.WriteCommitGraph(ctx, &gitalypb.WriteCommitGraphRequest{
Repository: repo,
SplitStrategy: gitalypb.WriteCommitGraphRequest_SizeMultiple,
})
require.NoError(t, err)
require.NotNil(t, res)
require.FileExists(t, chainPath)
// Reset the mtime of commit-graph-chain file to use
// as basis to detect changes
require.NoError(t, os.Chtimes(chainPath, time.Time{}, time.Time{}))
info, err := os.Stat(chainPath)
require.NoError(t, err)
mt := info.ModTime()
treeEntry := gittest.TreeEntry{Mode: "100644", Path: "file.txt", Content: "something"}
gittest.WriteCommit(
t,
cfg,
repoPath,
gittest.WithBranch(t.Name()),
gittest.WithTreeEntries(treeEntry),
)
//nolint:staticcheck
res, err = client.WriteCommitGraph(ctx, &gitalypb.WriteCommitGraphRequest{
Repository: repo,
SplitStrategy: gitalypb.WriteCommitGraphRequest_SizeMultiple,
})
require.NoError(t, err)
require.NotNil(t, res)
require.FileExists(t, chainPath)
assertModTimeAfter(t, mt, chainPath)
}
func requireBloomFilterUsed(t testing.TB, repoPath string) {
t.Helper()
commitGraphsPath := filepath.Join(repoPath, stats.CommitGraphChainRelPath)
ids := bytes.Split(testhelper.MustReadFile(t, commitGraphsPath), []byte{'\n'})
for _, id := range ids {
if len(id) == 0 {
continue
}
graphFilePath := filepath.Join(repoPath, filepath.Dir(stats.CommitGraphChainRelPath), fmt.Sprintf("graph-%s.graph", id))
graphFileData := testhelper.MustReadFile(t, graphFilePath)
require.True(t, bytes.HasPrefix(graphFileData, []byte("CGPH")), "4-byte signature of the commit graph file")
require.True(t, bytes.Contains(graphFileData, []byte("BIDX")), "Bloom Filter Index")
require.True(t, bytes.Contains(graphFileData, []byte("BDAT")), "Bloom Filter Data")
}
}
|
