Skip to content

Change how docker run args are built #267

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Change how docker run args are built #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce87fcf
build docker args with list.append
cg2v Dec 13, 2024
bff657d
Build docker run args the same in distDocker
cg2v Dec 12, 2024
bf8ea3a
Make sure args.append only has one string appended
cg2v Dec 18, 2024
e7d7ee0
Build autodriverCmd with fstrings
cg2v Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 21 additions & 25 deletions vmms/distDocker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,33 +271,28 @@ def runJob(self, vm, runTimeout, maxOutputFileSize, disableNetwork):
self.log.debug("Lost persistent SSH connection")
return ret

args = ["docker", "run", "--name", instanceName, "-v"]
args.append("%s:%s" % (volumePath, "/home/mount"))
if vm.cores:
args.append(f"--cpus={vm.cores}")
if vm.memory:
args.append(f"--memory={vm.memory}m")
if disableNetwork:
args.append("--network=none")

args.append(vm.image)
args.extend(("sh", "-c"))

autodriverCmd = (
"autodriver -u %d -f %d -t %d -o %d autolab > output/feedback 2>&1"
% (
config.Config.VM_ULIMIT_USER_PROC,
config.Config.VM_ULIMIT_FILE_SIZE,
runTimeout,
config.Config.MAX_OUTPUT_FILE_SIZE,
)
f"autodriver -u {config.Config.VM_ULIMIT_USER_PROC} "
f"-f {config.Config.VM_ULIMIT_FILE_SIZE} "
f"-t {runTimeout} -o {config.Config.MAX_OUTPUT_FILE_SIZE} "
"autolab > output/feedback 2>&1"
)

# IMPORTANT: The single and double quotes are important, since we
# are switching to the autolab user and then running
# bash commands.
setupCmd = (
'cp -r mount/* autolab/; su autolab -c "%s"; \
cp output/feedback mount/feedback'
% autodriverCmd
)

disableNetworkArg = "--network none" if disableNetwork else ""

args = "(docker run --name %s -v %s:/home/mount %s %s sh -c '%s')" % (
instanceName,
volumePath,
disableNetworkArg,
vm.image,
setupCmd,
args.append(
f"\"cp -r mount/* autolab/; su autolab -c '{autodriverCmd}'; \
cp output/feedback mount/feedback\""
)

self.log.debug("Running job: %s" % args)
Expand All @@ -306,7 +301,8 @@ def runJob(self, vm, runTimeout, maxOutputFileSize, disableNetwork):
["ssh"]
+ DistDocker._SSH_FLAGS
+ vm.ssh_flags
+ ["%s@%s" % (self.hostUser, vm.domain_name), args],
+ ["%s@%s" % (self.hostUser, vm.domain_name)]
+ args,
runTimeout * 2,
)

Expand Down
27 changes: 12 additions & 15 deletions vmms/localDocker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,31 +156,28 @@ def runJob(self, vm, runTimeout, maxOutputFileSize, disableNetwork):
os.getenv("DOCKER_TANGO_HOST_VOLUME_PATH"), instanceName
)
args = ["docker", "run", "--name", instanceName, "-v"]
args = args + ["%s:%s" % (volumePath, "/home/mount")]
args.append("%s:%s" % (volumePath, "/home/mount"))
if vm.cores:
args = args + [f"--cpus={vm.cores}"]
args.append(f"--cpus={vm.cores}")
if vm.memory:
args = args + ["-m", f"{vm.memory}m"]
args.append(f"--memory{vm.memory}m")
if disableNetwork:
args = args + ["--network", "none"]
args = args + [vm.image]
args = args + ["sh", "-c"]
args.append("--network=none")
args.append(vm.image)
args.extend(("sh", "-c"))

autodriverCmd = (
"autodriver -u %d -f %d -t %d -o %d autolab > output/feedback 2>&1"
% (
config.Config.VM_ULIMIT_USER_PROC,
config.Config.VM_ULIMIT_FILE_SIZE,
runTimeout,
config.Config.MAX_OUTPUT_FILE_SIZE,
)
f"autodriver -u {config.Config.VM_ULIMIT_USER_PROC} "
f"-f {config.Config.VM_ULIMIT_FILE_SIZE} "
f"-t {runTimeout} -o {config.Config.MAX_OUTPUT_FILE_SIZE} "
"autolab > output/feedback 2>&1"
)

args = args + [
args.append(
'cp -r mount/* autolab/; su autolab -c "%s"; \
cp output/feedback mount/feedback'
% autodriverCmd
]
)

self.log.debug("Running job: %s" % str(args))
ret = timeout(args, runTimeout * 2)
Expand Down
Loading