Resolve SYSINFRA-2039 "/run reflow without taskdb" (grailbio/grail!7409)

Approved-by: Pedro Fialho <pfialho@grailbio.com> GitLab URL: https://gitlab.com/grailbio/grail/-/merge_requests/7409 fbshipit-source-id: 625523f
grailbio · Dec 6, 2022 · 04b01f7 · 04b01f7
1 parent f5f28ec
commit 04b01f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/runtime/util.go b/runtime/util.go
@@ -85,12 +85,13 @@ func PredictorConfig(cfg infra.Config, validate bool) (*infra2.PredictorConfig,
 		sess       *session.Session
 		tdb        taskdb.TaskDB
 	)
+	// Predictor config is optional.
+	if err := cfg.Instance(&predConfig); err != nil {
+		return nil, nil
+	}
 	if err := cfg.Instance(&tdb); err != nil {
 		return nil, errors.E("predictor config: no taskdb", err)
 	}
-	if err := cfg.Instance(&predConfig); err != nil {
-		return nil, errors.E("predictor config: no predconfig", err)
-	}
 	if err := cfg.Instance(&sess); err != nil {
 		return nil, errors.E("predictor config: session", err)
 	}

diff --git a/tool/pred.go b/tool/pred.go
@@ -59,6 +59,10 @@ Valid values for -name are "mem" and "duration".
 	if err != nil {
 		c.Fatal(err)
 	}
+	if cfg == nil {
+		c.Fatalf("missing predictor config")
+	}
+
 	var tdb taskdb.TaskDB
 	if err := c.Config.Instance(&tdb); err != nil {
 		c.Fatalf("pred needs taskdb: %v", err)