Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rqd] Add frame recovery logic for docker mode #1614

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion VERSION.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4
1.5
1 change: 1 addition & 0 deletions proto/rqd.proto
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ message RunFrame {
string os = 25;
int64 soft_memory_limit = 26;
int64 hard_memory_limit = 27;
int32 pid = 28;
}

message RunFrameSeq {
Expand Down
11 changes: 11 additions & 0 deletions rqd/rqd/rqconstants.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@
DOCKER_MOUNTS = []
DOCKER_SHELL_PATH = "/bin/sh"

# Backup running frames cache. Backup cache is turned off if this path is set to
# None or ""
BACKUP_CACHE_PATH = ""
BACKUP_CACHE_TIME_TO_LIVE_SECONDS = 60

try:
if os.path.isfile(CONFIG_FILE):
# Hostname can come from here: rqutil.getHostname()
Expand Down Expand Up @@ -243,6 +248,12 @@
if config.has_section(__host_env_var_section):
RQD_HOST_ENV_VARS = config.options(__host_env_var_section)

if config.has_option(__override_section, "BACKUP_CACHE_PATH"):
BACKUP_CACHE_PATH = config.get(__override_section, "BACKUP_CACHE_PATH")
if config.has_option(__override_section, "BACKUP_CACHE_TIME_TO_LIVE_SECONDS"):
BACKUP_CACHE_TIME_TO_LIVE_SECONDS = config.getint(
__override_section, "BACKUP_CACHE_TIME_TO_LIVE_SECONDS")

__docker_mounts = "docker.mounts"
__docker_config = "docker.config"
__docker_images = "docker.images"
Expand Down
Loading