Skip to content

Commit 0323be2

Browse files
authored
Merge pull request #9158 from liranmauda/liran-backport-into-5.19
[Backport into 5.19] Revert objects reclaimer batch and error delays + fix
2 parents bd4117d + 8af3bda commit 0323be2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ config.BUCKET_RECLAIMER_ERROR_DELAY = 3000;
388388
config.OBJECT_RECLAIMER_ENABLED = true;
389389
config.OBJECT_RECLAIMER_EMPTY_DELAY = 60 * 60 * 1000; // 1 hour delay
390390
config.OBJECT_RECLAIMER_BATCH_SIZE = 100;
391-
config.OBJECT_RECLAIMER_BATCH_DELAY = 10 * 60 * 1000; // 10 minutes delay between batches
392-
config.OBJECT_RECLAIMER_ERROR_DELAY = 10 * 60 * 1000; // 10 minutes delay between batches;
391+
config.OBJECT_RECLAIMER_BATCH_DELAY = 100;
392+
config.OBJECT_RECLAIMER_ERROR_DELAY = 3000;
393393

394394

395395
//////////////////

src/util/http_utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ function check_headers(req, options) {
629629

630630
const content_encoding = req.headers['content-encoding'] || '';
631631
req.chunked_content =
632-
content_encoding.split(',').includes('aws-chunked') ||
632+
content_encoding.split(',').map(encoding => encoding.trim()).includes('aws-chunked') ||
633633
content_sha256_hdr === STREAMING_PAYLOAD;
634634

635635
const req_time =

0 commit comments

Comments
 (0)