NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-20 20:07:03 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Use 8 as default value for git lfs concurrency (#32421)

Browse source
This commit is contained in:
wxiaoguang 2024-11-05 21:10:57 +08:00 committed by Otto Richter
parent f6273e2250
commit b84a59b3cd
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
custom/conf/app.example.ini
View file

@ -2676,7 +2676,7 @@ LEVEL = Info
;; Limit the number of pointers in each batch request to this number ;; Limit the number of pointers in each batch request to this number
;BATCH_SIZE = 20 ;BATCH_SIZE = 20
;; Limit the number of concurrent upload/download operations within a batch ;; Limit the number of concurrent upload/download operations within a batch
;BATCH_OPERATION_CONCURRENCY = 3 ;BATCH_OPERATION_CONCURRENCY = 8
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

3
modules/lfs/http_client.go
View file

@ -136,6 +136,9 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
return fmt.Errorf("TransferAdapter not found: %s", result.Transfer) return fmt.Errorf("TransferAdapter not found: %s", result.Transfer)
} }
if setting.LFSClient.BatchOperationConcurrency <= 0 {
panic("BatchOperationConcurrency must be greater than 0, forgot to init?")
}
errGroup, groupCtx := errgroup.WithContext(ctx) errGroup, groupCtx := errgroup.WithContext(ctx)
errGroup.SetLimit(setting.LFSClient.BatchOperationConcurrency) errGroup.SetLimit(setting.LFSClient.BatchOperationConcurrency)
for _, object := range result.Objects { for _, object := range result.Objects {

4
modules/lfs/http_client_test.go
View file

@ -238,7 +238,7 @@ func TestHTTPClientDownload(t *testing.T) {
}, },
} }
defer test.MockVariableValue(&setting.LFSClient.BatchOperationConcurrency, 3)() defer test.MockVariableValue(&setting.LFSClient.BatchOperationConcurrency, 8)()
for _, c := range cases { for _, c := range cases {
t.Run(c.endpoint, func(t *testing.T) { t.Run(c.endpoint, func(t *testing.T) {
client := &HTTPClient{ client := &HTTPClient{
@ -338,7 +338,7 @@ func TestHTTPClientUpload(t *testing.T) {
}, },
} }
defer test.MockVariableValue(&setting.LFSClient.BatchOperationConcurrency, 3)() defer test.MockVariableValue(&setting.LFSClient.BatchOperationConcurrency, 8)()
for _, c := range cases { for _, c := range cases {
t.Run(c.endpoint, func(t *testing.T) { t.Run(c.endpoint, func(t *testing.T) {
client := &HTTPClient{ client := &HTTPClient{

4
modules/setting/lfs.go
View file

@ -67,8 +67,8 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
} }
if LFSClient.BatchOperationConcurrency < 1 { if LFSClient.BatchOperationConcurrency < 1 {
// match the default git-lfs's `lfs.concurrenttransfers` // match the default git-lfs's `lfs.concurrenttransfers` https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-config.adoc#upload-and-download-transfer-settings
LFSClient.BatchOperationConcurrency = 3 LFSClient.BatchOperationConcurrency = 8
} }
LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(24 * time.Hour) LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(24 * time.Hour)

2
modules/setting/lfs_test.go
View file

@ -115,7 +115,7 @@ BATCH_SIZE = 0
assert.NoError(t, loadLFSFrom(cfg)) assert.NoError(t, loadLFSFrom(cfg))
assert.EqualValues(t, 100, LFS.MaxBatchSize) assert.EqualValues(t, 100, LFS.MaxBatchSize)
assert.EqualValues(t, 20, LFSClient.BatchSize) assert.EqualValues(t, 20, LFSClient.BatchSize)
assert.EqualValues(t, 3, LFSClient.BatchOperationConcurrency) assert.EqualValues(t, 8, LFSClient.BatchOperationConcurrency)
iniStr = ` iniStr = `
[lfs_client] [lfs_client]