Skip to content

Commit f1f5948

Browse files
committed
Fix
1 parent eb5e29c commit f1f5948

File tree

2 files changed

+103
-123
lines changed

2 files changed

+103
-123
lines changed

origin/blobserver/config.go

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,19 +23,18 @@ import (
2323
type Config struct {
2424
Listener listener.Config `yaml:"listener"`
2525
DuplicateWriteBackStagger time.Duration `yaml:"duplicate_write_back_stagger"`
26-
26+
2727
// Timeout configurations
28-
DownloadTimeout time.Duration `yaml:"download_timeout"`
29-
UploadTimeout time.Duration `yaml:"upload_timeout"`
30-
ReplicationTimeout time.Duration `yaml:"replication_timeout"`
31-
BackendTimeout time.Duration `yaml:"backend_timeout"`
32-
ReadinessTimeout time.Duration `yaml:"readiness_timeout"`
33-
28+
DownloadTimeout time.Duration `yaml:"download_timeout"`
29+
UploadTimeout time.Duration `yaml:"upload_timeout"`
30+
ReplicationTimeout time.Duration `yaml:"replication_timeout"`
31+
BackendTimeout time.Duration `yaml:"backend_timeout"`
32+
ReadinessTimeout time.Duration `yaml:"readiness_timeout"`
33+
3434
// Limit configurations
3535
MaxConcurrentDownloads int `yaml:"max_concurrent_downloads"`
3636
MaxConcurrentUploads int `yaml:"max_concurrent_uploads"`
37-
MaxRequestSize int64 `yaml:"max_request_size"`
38-
37+
3938
// Retry configurations
4039
MaxRetries int `yaml:"max_retries"`
4140
RetryDelay time.Duration `yaml:"retry_delay"`
@@ -53,7 +52,7 @@ func (c Config) applyDefaults() Config {
5352
c.UploadTimeout = 10 * time.Minute
5453
}
5554
if c.ReplicationTimeout == 0 {
56-
c.ReplicationTimeout = 3 * time.Minute
55+
c.ReplicationTimeout = 5 * time.Minute
5756
}
5857
if c.BackendTimeout == 0 {
5958
c.BackendTimeout = 2 * time.Minute
@@ -62,13 +61,10 @@ func (c Config) applyDefaults() Config {
6261
c.ReadinessTimeout = 30 * time.Second
6362
}
6463
if c.MaxConcurrentDownloads == 0 {
65-
c.MaxConcurrentDownloads = 10
64+
c.MaxConcurrentDownloads = 20
6665
}
6766
if c.MaxConcurrentUploads == 0 {
68-
c.MaxConcurrentUploads = 5
69-
}
70-
if c.MaxRequestSize == 0 {
71-
c.MaxRequestSize = 1024 * 1024 * 1024 // 1GB
67+
c.MaxConcurrentUploads = 10
7268
}
7369
if c.MaxRetries == 0 {
7470
c.MaxRetries = 3

0 commit comments

Comments
 (0)