cmd/run,job: Flag to override files in working directory

Signed-off-by: Alexander Jung <a.jung@lancs.ac.uk>
lancs-net · Dec 23, 2020 · 835998c · 835998c
1 parent 989327b
commit 835998c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -50,6 +50,7 @@ type RunConfig struct {
   DryRun        bool
   ScheduleGrace int
   WorkDir       string
+  AllowOverride bool
 }
 
 var (
@@ -91,6 +92,13 @@ func init() {
     "",
     "Specify working directory for outputting results, data, file systems, etc.",
   )
+  runCmd.PersistentFlags().BoolVarP(
+    &runConfig.AllowOverride,
+    "allow-override",
+    "O",
+    false,
+    "Override contents in directories (otherwise tasks allowed to fail).",
+  )
 }
 
 // doRunCmd 
@@ -118,6 +126,7 @@ func doRunCmd(cmd *cobra.Command, args []string) {
 	j, err := job.NewJob(args[0], &job.RuntimeConfig{
     Cpus:          cpus,
     ScheduleGrace: runConfig.ScheduleGrace,
+    AllowOverride: runConfig.AllowOverride,
     WorkDir:       runConfig.WorkDir,
   })
 	if err != nil {

diff --git a/job/job.go b/job/job.go
@@ -160,7 +160,7 @@ func NewJob(filePath string, cfg *RuntimeConfig) (*Job, error) {
       }
     }
 
-    task.Init(cfg.WorkDir, &job.Runs)
+    task.Init(cfg.WorkDir, cfg.AllowOverride, &job.Runs)
     job.waitList.Add(task)
   }
 

diff --git a/job/task.go b/job/task.go
@@ -57,7 +57,7 @@ type Task struct {
 }
 
 // Init prepare the task 
-func (t *Task) Init(workDir string, runs *[]Run) error {
+func (t *Task) Init(workDir string, allowOverride bool, runs *[]Run) error {
   // Create a queue of runs for this particular task
   t.runs = NewQueue(len(*runs))
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         }
-        task.Init(cfg.WorkDir, &job.Runs)
+        task.Init(cfg.WorkDir, cfg.AllowOverride, &job.Runs)
         job.waitList.Add(task)
       }
@@ Expand Down @@