fine tune

Author: wxiaoguang

custom/conf/app.example.ini

@@ -2642,11 +2642,15 @@ LEVEL = Info
 ;; override the azure blob base path if storage type is azureblob
 ;AZURE_BLOB_BASE_PATH = lfs/
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; settings for Gitea's LFS client (eg: mirroring an upstream lfs endpoint)
+;;
 ;[lfs_client]
-;; When mirroring an upstream lfs endpoint, 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
-;; When mirroring an upstream lfs endpoint, limit the number of concurrent upload/download operations within a batch
-;BATCH_OPERATION_CONCURRENCY = 20
+;; Limit the number of concurrent upload/download operations within a batch
+;BATCH_OPERATION_CONCURRENCY = 3
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

modules/lfs/http_client.go

@@ -137,11 +137,10 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
 	}
 
 	errGroup, groupCtx := errgroup.WithContext(ctx)
-	errGroup.SetLimit(setting.LFSClient.BatchConcurrency)
+	errGroup.SetLimit(setting.LFSClient.BatchOperationConcurrency)
 	for _, object := range result.Objects {
 		errGroup.Go(func() error {
-			err := performSingleOperation(groupCtx, object, dc, uc, transferAdapter)
-			return err
+			return performSingleOperation(groupCtx, object, dc, uc, transferAdapter)
 		})
 	}
 

modules/lfs/http_client_test.go

@@ -251,7 +251,7 @@ func TestHTTPClientDownload(t *testing.T) {
 				"dummy": dummy,
 			},
 		}
-		setting.LFSClient.BatchConcurrency = 1
+		setting.LFSClient.BatchOperationConcurrency = 1
 
 		err := client.Download(context.Background(), []Pointer{p}, func(p Pointer, content io.ReadCloser, objectError error) error {
 			if objectError != nil {

modules/setting/lfs.go

@@ -28,8 +28,8 @@ var LFS = struct {
 
 // LFSClient represents configuration for Gitea's LFS clients, for example: mirroring upstream Git LFS
 var LFSClient = struct {
-	BatchSize        int `ini:"BATCH_SIZE"`
-	BatchConcurrency int `ini:"BATCH_OPERATION_CONCURRENCY"`
+	BatchSize                 int `ini:"BATCH_SIZE"`
+	BatchOperationConcurrency int `ini:"BATCH_OPERATION_CONCURRENCY"`
 }{}
 
 func loadLFSFrom(rootCfg ConfigProvider) error {
@@ -67,8 +67,9 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
 		LFSClient.BatchSize = 20
 	}
 
-	if LFSClient.BatchConcurrency < 1 {
-		LFSClient.BatchConcurrency = LFSClient.BatchSize
+	if LFSClient.BatchOperationConcurrency < 1 {
+		// match the default git-lfs's `lfs.concurrenttransfers`
+		LFSClient.BatchOperationConcurrency = 3
 	}
 
 	LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(24 * time.Hour)

modules/setting/lfs_test.go

@@ -114,7 +114,7 @@ BATCH_SIZE = 0
 	assert.NoError(t, loadLFSFrom(cfg))
 	assert.EqualValues(t, 100, LFS.MaxBatchSize)
 	assert.EqualValues(t, 20, LFSClient.BatchSize)
-	assert.EqualValues(t, 20, LFSClient.BatchConcurrency)
+	assert.EqualValues(t, 20, LFSClient.BatchOperationConcurrency)
 
 	iniStr = `
 [lfs_client]
@@ -126,5 +126,5 @@ BATCH_OPERATION_CONCURRENCY = 10
 
 	assert.NoError(t, loadLFSFrom(cfg))
 	assert.EqualValues(t, 50, LFSClient.BatchSize)
-	assert.EqualValues(t, 10, LFSClient.BatchConcurrency)
+	assert.EqualValues(t, 10, LFSClient.BatchOperationConcurrency)
 }