Merge pull request #780 from SiaFoundation/chris/download-memory

Add memory manager for downloads
SiaFoundation · Dec 4, 2023 · f37012b · f37012b
2 parents 9a50459 + db7c42a
commit f37012b
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 109 deletions.
diff --git a/api/worker.go b/api/worker.go
@@ -52,7 +52,8 @@ type (
 	}
 
 	MemoryResponse struct {
-		Upload MemoryStatus `json:"upload"`
+		Download MemoryStatus `json:"download"`
+		Upload   MemoryStatus `json:"upload"`
 	}
 
 	MemoryStatus struct {

diff --git a/cmd/renterd/main.go b/cmd/renterd/main.go
@@ -94,6 +94,7 @@ var (
 			DownloadMaxOverdrive:     5,
 			DownloadOverdriveTimeout: 3 * time.Second,
 
+			DownloadMaxMemory:      1 << 30, // 1 GiB
 			UploadMaxMemory:        1 << 30, // 1 GiB
 			UploadMaxOverdrive:     5,
 			UploadOverdriveTimeout: 3 * time.Second,

diff --git a/config/config.go b/config/config.go
@@ -98,6 +98,7 @@ type (
 		DownloadOverdriveTimeout      time.Duration  `yaml:"downloadOverdriveTimeout"`
 		UploadOverdriveTimeout        time.Duration  `yaml:"uploadOverdriveTimeout"`
 		DownloadMaxOverdrive          uint64         `yaml:"downloadMaxOverdrive"`
+		DownloadMaxMemory             uint64         `yaml:"downloadMaxMemory"`
 		UploadMaxMemory               uint64         `yaml:"uploadMaxMemory"`
 		UploadMaxOverdrive            uint64         `yaml:"uploadMaxOverdrive"`
 		AllowUnauthenticatedDownloads bool           `yaml:"allowUnauthenticatedDownloads"`

diff --git a/internal/node/node.go b/internal/node/node.go
@@ -179,7 +179,7 @@ func NewBus(cfg BusConfig, dir string, seed types.PrivateKey, l *zap.Logger) (ht
 
 func NewWorker(cfg config.Worker, b worker.Bus, seed types.PrivateKey, l *zap.Logger) (http.Handler, ShutdownFn, error) {
 	workerKey := blake2b.Sum256(append([]byte("worker"), seed...))
-	w, err := worker.New(workerKey, cfg.ID, b, cfg.ContractLockTimeout, cfg.BusFlushInterval, cfg.DownloadOverdriveTimeout, cfg.UploadOverdriveTimeout, cfg.DownloadMaxOverdrive, cfg.UploadMaxMemory, cfg.UploadMaxOverdrive, cfg.AllowPrivateIPs, l)
+	w, err := worker.New(workerKey, cfg.ID, b, cfg.ContractLockTimeout, cfg.BusFlushInterval, cfg.DownloadOverdriveTimeout, cfg.UploadOverdriveTimeout, cfg.DownloadMaxOverdrive, cfg.DownloadMaxMemory, cfg.UploadMaxMemory, cfg.UploadMaxOverdrive, cfg.AllowPrivateIPs, l)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/internal/testing/cluster.go b/internal/testing/cluster.go
@@ -952,6 +952,7 @@ func testWorkerCfg() config.Worker {
 		BusFlushInterval:         testBusFlushInterval,
 		DownloadOverdriveTimeout: 500 * time.Millisecond,
 		UploadOverdriveTimeout:   500 * time.Millisecond,
+		DownloadMaxMemory:        1 << 28, // 256 MiB
 		UploadMaxMemory:          1 << 28, // 256 MiB
 		UploadMaxOverdrive:       5,
 	}