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
|
package objectpool
import (
"fmt"
"io/ioutil"
"path/filepath"
"strings"
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/internal/helper/text"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
)
func TestFetchFromOriginDangling(t *testing.T) {
source, _, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
pool, err := NewObjectPool(source.StorageName, testhelper.NewTestObjectPoolName(t))
require.NoError(t, err)
ctx, cancel := testhelper.Context()
defer cancel()
require.NoError(t, pool.FetchFromOrigin(ctx, source), "seed pool")
const (
existingTree = "07f8147e8e73aab6c935c296e8cdc5194dee729b"
existingCommit = "7975be0116940bf2ad4321f79d02a55c5f7779aa"
existingBlob = "c60514b6d3d6bf4bec1030f70026e34dfbd69ad5"
)
// We want to have some objects that are guaranteed to be dangling. Use
// random data to make each object unique.
nonce, err := text.RandomHex(4)
require.NoError(t, err)
baseArgs := []string{"-C", pool.FullPath()}
// A blob with random contents should be unique.
newBlobArgs := append(baseArgs, "hash-object", "-t", "blob", "-w", "--stdin")
newBlob := text.ChompBytes(testhelper.MustRunCommand(t, strings.NewReader(nonce), "git", newBlobArgs...))
// A tree with a randomly named blob entry should be unique.
newTreeArgs := append(baseArgs, "mktree")
newTreeStdin := strings.NewReader(fmt.Sprintf("100644 blob %s %s\n", existingBlob, nonce))
newTree := text.ChompBytes(testhelper.MustRunCommand(t, newTreeStdin, "git", newTreeArgs...))
// A commit with a random message should be unique.
newCommitArgs := append(baseArgs, "commit-tree", existingTree)
newCommit := text.ChompBytes(testhelper.MustRunCommand(t, strings.NewReader(nonce), "git", newCommitArgs...))
// A tag with random hex characters in its name should be unique.
newTagName := "tag-" + nonce
newTagArgs := append(baseArgs, "tag", "-m", "msg", "-a", newTagName, existingCommit)
testhelper.MustRunCommand(t, strings.NewReader(nonce), "git", newTagArgs...)
newTag := text.ChompBytes(testhelper.MustRunCommand(t, nil, "git", append(baseArgs, "rev-parse", newTagName)...))
// `git tag` automatically creates a ref, so our new tag is not dangling.
// Deleting the ref should fix that.
testhelper.MustRunCommand(t, nil, "git", append(baseArgs, "update-ref", "-d", "refs/tags/"+newTagName)...)
fsckBefore := testhelper.MustRunCommand(t, nil, "git", append(baseArgs, "fsck", "--connectivity-only", "--dangling")...)
fsckBeforeLines := strings.Split(string(fsckBefore), "\n")
for _, l := range []string{
fmt.Sprintf("dangling blob %s", newBlob),
fmt.Sprintf("dangling tree %s", newTree),
fmt.Sprintf("dangling commit %s", newCommit),
fmt.Sprintf("dangling tag %s", newTag),
} {
require.Contains(t, fsckBeforeLines, l, "test setup sanity check")
}
// We expect this second run to convert the dangling objects into
// non-dangling objects.
require.NoError(t, pool.FetchFromOrigin(ctx, source), "second fetch")
refsArgs := append(baseArgs, "for-each-ref", "--format=%(refname) %(objectname)")
refsAfter := testhelper.MustRunCommand(t, nil, "git", refsArgs...)
refsAfterLines := strings.Split(string(refsAfter), "\n")
for _, id := range []string{newBlob, newTree, newCommit, newTag} {
require.Contains(t, refsAfterLines, fmt.Sprintf("refs/dangling/%s %s", id, id))
}
}
func TestFetchFromOriginDeltaIslands(t *testing.T) {
source, sourcePath, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
pool, err := NewObjectPool(source.StorageName, testhelper.NewTestObjectPoolName(t))
require.NoError(t, err)
ctx, cancel := testhelper.Context()
defer cancel()
require.NoError(t, pool.FetchFromOrigin(ctx, source), "seed pool")
require.NoError(t, pool.Link(ctx, source))
gittest.TestDeltaIslands(t, sourcePath, func() error {
// This should create a new packfile with good delta chains in the pool
if err := pool.FetchFromOrigin(ctx, source); err != nil {
return err
}
// Make sure the old packfile, with bad delta chains, is deleted from the source repo
testhelper.MustRunCommand(t, nil, "git", "-C", sourcePath, "repack", "-ald")
return nil
})
}
func TestFetchFromOriginBitmapHashCache(t *testing.T) {
source, _, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
pool, err := NewObjectPool(source.StorageName, testhelper.NewTestObjectPoolName(t))
require.NoError(t, err)
ctx, cancel := testhelper.Context()
defer cancel()
require.NoError(t, pool.FetchFromOrigin(ctx, source), "seed pool")
packDir := filepath.Join(pool.FullPath(), "objects/pack")
packEntries, err := ioutil.ReadDir(packDir)
require.NoError(t, err)
var bitmap string
for _, ent := range packEntries {
if name := ent.Name(); strings.HasSuffix(name, ".bitmap") {
bitmap = filepath.Join(packDir, name)
break
}
}
require.NotEmpty(t, bitmap, "path to bitmap file")
gittest.TestBitmapHasHashcache(t, bitmap)
}
func TestFetchFromOriginRefUpdates(t *testing.T) {
source, sourcePath, cleanup := testhelper.NewTestRepo(t)
defer cleanup()
pool, err := NewObjectPool(source.StorageName, testhelper.NewTestObjectPoolName(t))
require.NoError(t, err)
poolPath := pool.FullPath()
ctx, cancel := testhelper.Context()
defer cancel()
require.NoError(t, pool.FetchFromOrigin(ctx, source), "seed pool")
oldRefs := map[string]string{
"heads/csv": "3dd08961455abf80ef9115f4afdc1c6f968b503c",
"tags/v1.1.0": "8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b",
}
for ref, oid := range oldRefs {
require.Equal(t, oid, resolveRef(t, sourcePath, "refs/"+ref), "look up %q in source", ref)
require.Equal(t, oid, resolveRef(t, poolPath, "refs/remotes/origin/"+ref), "look up %q in pool", ref)
}
newRefs := map[string]string{
"heads/csv": "46abbb087fcc0fd02c340f0f2f052bd2c7708da3",
"tags/v1.1.0": "646ece5cfed840eca0a4feb21bcd6a81bb19bda3",
}
for ref, newOid := range newRefs {
require.NotEqual(t, newOid, oldRefs[ref], "sanity check of new refs")
}
for ref, oid := range newRefs {
testhelper.MustRunCommand(t, nil, "git", "-C", sourcePath, "update-ref", "refs/"+ref, oid)
require.Equal(t, oid, resolveRef(t, sourcePath, "refs/"+ref), "look up %q in source after update", ref)
}
require.NoError(t, pool.FetchFromOrigin(ctx, source), "update pool")
for ref, oid := range newRefs {
require.Equal(t, oid, resolveRef(t, poolPath, "refs/remotes/origin/"+ref), "look up %q in pool after update", ref)
}
looseRefs := testhelper.MustRunCommand(t, nil, "find", filepath.Join(poolPath, "refs"), "-type", "f")
require.Equal(t, "", string(looseRefs), "there should be no loose refs after the fetch")
}
func resolveRef(t *testing.T, repo string, ref string) string {
out := testhelper.MustRunCommand(t, nil, "git", "-C", repo, "rev-parse", ref)
return text.ChompBytes(out)
}
|
