Making sure that sandbox from worker config is used when no sandbox name is selected in the job config.

Author: krulis-martin

README.md

@@ -45,11 +45,8 @@ use. The package names are for CentOS if not specified otherwise.
   (`libzmq3-dev` on Debian)
 - YAML-CPP library, `yaml-cpp` and `yaml-cpp-devel` (`libyaml-cpp0.5v5` and
   `libyaml-cpp-dev` on Debian)
-- libcurl library `libcurl-devel` (`libcurl4-gnutls-dev` on Debian)
-- libarchive library as optional dependency. Installing will speed up build
-  process, otherwise libarchive is built from source during installation.
-  Package name is `libarchive` and `libarchive-devel` (`libarchive-dev` on
-  Debian)
+- libcurl library `libcurl-devel` (`libcurl4-dev` on Debian)
+- libarchive library as optional dependency. Installing will speed up build process, otherwise libarchive is built from source during installation. Package name is `libarchive` and `libarchive-devel` (`libarchive-dev` on Debian)
 
 **Isolate** (only for Linux installations)
 

examples/config.yml

@@ -64,7 +64,7 @@ limits:
           mode: "tmp"  # if mode is omitted, dir is mounted as read-only (which is typical for lib dirs)
         #- src: "/usr/share/something"  # actually existing directory
         #  dst: "/something"            # where the directory will be mounted in sandbox fs
-        #  mode: "rw"  # multiple modes can be separated by comma, see http://www.ucw.cz/moe/isolate.1.html (directory rules - options)
+        #  mode: "rw"  # multiple modes can be separated by comma
 max-output-length: 4096  # in bytes
 max-carboncopy-length: 1048576  # in bytes
 cleanup-submission: false  # if true, then folders with data concerning submissions will be cleared after evaluation, should be used carefully, can produce huge amount of used disk space

src/helpers/config.cpp

@@ -159,9 +159,7 @@ std::shared_ptr<job_metadata> helpers::build_job_metadata(const YAML::Node &conf
 
 				if (ctask["sandbox"]["name"] && ctask["sandbox"]["name"].IsScalar()) {
 					sandbox->name = ctask["sandbox"]["name"].as<std::string>();
-				} else {
-					throw config_exception("Name of sandbox not given");
-				}
+				} // can be omitted, will be filled from worker config... no throw
 
 				if (ctask["sandbox"]["stdin"] && ctask["sandbox"]["stdin"].IsScalar()) {
 					sandbox->std_input = ctask["sandbox"]["stdin"].as<std::string>();

src/job/job.cpp

@@ -116,6 +116,12 @@ void job::build_job()
 
 			auto sandbox = task_meta->sandbox;
 
+			if (sandbox->name.empty()) {
+				// if the sandbox is not specified in the job, use worker config instead
+				sandbox->name = worker_config_->get_sandbox_name();
+			}
+
+			// and let's make sure that one of the sandboxes is specified
 			if (sandbox->name.empty()) { throw job_exception("Sandbox name cannot be empty"); }
 
 			// first we have to get appropriate hwgroup limits

tests/job.cpp

@@ -277,7 +277,9 @@ TEST(job_test, empty_tasks_details)
 	task->binary = "hello";
 	auto sandbox = std::make_shared<sandbox_config>();
 	task->sandbox = sandbox;
-	EXPECT_THROW(job(job_meta, worker_conf, dir_root, dir, temp_directory_path(), factory, nullptr), job_exception);
+	job j(job_meta, worker_conf, dir_root, dir, temp_directory_path(), factory, nullptr);
+	// job_meta has one task, which is updated by the job (sandbox name is filled from worker config)
+	ASSERT_EQ(task->sandbox->name, worker_conf->get_sandbox_name()); // sandbox name is filled from worker config
 
 	// cleanup after yourself
 	remove_all(dir_root);

tests/mocks.h

@@ -23,7 +23,7 @@ using namespace testing;
 
 
 /**
- * A mock configuration object. Inverval of pinging is 1 second.
+ * A mock configuration object. Interval of pinging is 1 second.
  */
 class mock_worker_config : public worker_config
 {