Commit 7f65ce1d authored by DJ Mountney's avatar DJ Mountney

Merge branch '1048-make-sidekiq-memory-killer-max-rss-settable' into 'master'

Enable Sidekiq Memory Killer Configuration

Closes #1048

See merge request charts/gitlab!776
parents fc8aeb85 f4ce8ddf
Pipeline #60056916 canceled with stages
in 2 minutes and 38 seconds
---
title: Enable Sidekiq Memory Killer Configuration
merge_request: 776
author:
type: added
......@@ -161,6 +161,12 @@ spec:
value: {{ default $concurrency .concurrency | quote }}
- name: SIDEKIQ_TIMEOUT
value: {{ default $timeout .timeout | quote }}
- name: SIDEKIQ_MEMORY_KILLER_MAX_RSS
value: {{ int $.Values.memoryKiller.maxRss | quote }}
- name: SIDEKIQ_MEMORY_KILLER_GRACE_TIME
value: {{ int $.Values.memoryKiller.graceTime | quote }}
- name: SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT
value: {{ int $.Values.memoryKiller.shutdownWait | quote }}
{{- if $metricsEnabled }}
ports:
- containerPort: {{ $metricsPort }}
......
......@@ -28,6 +28,12 @@ metrics:
redis:
password: {}
# https://docs.gitlab.com/ee/administration/operations/sidekiq_memory_killer.html#sidekiq-memorykiller
memoryKiller:
maxRss: 2000000
graceTime: 900
shutdownWait: 30
global:
# imagePullPolicy: IfNotPresent
hosts:
......
......@@ -56,6 +56,9 @@ to the `helm install` command using the `--set` flags:
| `resources.requests.cpu` | `100m` | Sidekiq minimum needed cpu |
| `resources.requests.memory` | `600M` | Sidekiq minimum needed memory |
| `timeout` | `5` | Sidekiq job timeout |
| `memoryKiller.maxRss` | `2000000` | Maximum RSS before delayed shutdown triggered expressed in kilobytes |
| `memoryKiller.graceTime` | `900` | Time to wait before a triggered shutdown expressed in seconds|
| `memoryKiller.shutdownWait` | `30` | Amount of time after triggered shutdown for existing jobs to finish expressed in seconds |
## Chart configuration examples
......@@ -187,6 +190,13 @@ on a per-pod basis.
| `concurrency` | Integer | `25` | The number of tasks to process simultaneously. |
| `replicas` | Integer | `1` | The number of `replicas` to use by default per pod definition. |
| `timeout` | Integer | `4` | The sidekiq shutdown timeout. The number of seconds after sidekiq gets the TERM signal before it forcefully shuts down its processes. |
| `memoryKiller.maxRss` | Integer | `2000000` | Maximum RSS before delayed shutdown triggered expressed in kilobytes |
| `memoryKiller.graceTime` | Integer | `900` | Time to wait before a triggered shutdown expressed in seconds|
| `memoryKiller.shutdownWait` | Integer | `30` | Amount of time after triggered shutdown for existing jobs to finish expressed in seconds |
NOTE: **Note**: [Detailed documentation of the sidekiq memory killer is
available](https://docs.gitlab.com/ee/administration/operations/sidekiq_memory_killer.html#sidekiq-memorykiller)
in the Omnibus documentation.
## Per-pod Settings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment