[core] Role path globbing support

Author: teo

core/workflow/aggregatorrole.go

@@ -28,6 +28,7 @@ import (
 	"errors"
 
 	"github.com/AliceO2Group/Control/core/task"
+	"github.com/gobwas/glob"
 	"github.com/sirupsen/logrus"
 )
 
@@ -61,6 +62,20 @@ func (r *aggregatorRole) UnmarshalYAML(unmarshal func(interface{}) error) (err e
 	return
 }
 
+func (r *aggregatorRole) GlobFilter(g glob.Glob) (rs []Role) {
+	rs = make([]Role, 0)
+	if g.Match(r.GetPath()) {
+		rs = append(rs, r)
+	}
+	for _, chr := range r.Roles {
+		chrs := chr.GlobFilter(g)
+		if len(chrs) != 0 {
+			rs = append(rs, chrs...)
+		}
+	}
+	return
+}
+
 func (r *aggregatorRole) ProcessTemplates() (err error) {
 	if r == nil {
 		return errors.New("role tree error when processing templates")
@@ -110,6 +125,7 @@ func (r *aggregatorRole) updateState(s task.State) {
 	if r == nil {
 		return
 	}
+	log.WithField("role", r.Name).WithField("state", s.String()).Debug("updating state")
 	r.state.merge(s, r)
 	if r.parent != nil {
 		r.parent.updateState(r.state.get())

core/workflow/iteratorrole.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/AliceO2Group/Control/core/task"
 	"github.com/AliceO2Group/Control/core/task/constraint"
+	"github.com/gobwas/glob"
 )
 
 type iteratorRole struct {
@@ -117,6 +118,17 @@ func (f *iteratorInfo) UnmarshalYAML(unmarshal func(interface{}) error) (err err
 	return
 }
 
+func (i *iteratorRole) GlobFilter(g glob.Glob) (rs []Role) {
+	rs = make([]Role, 0)
+	for _, chr := range i.Roles {
+		chrs := chr.GlobFilter(g)
+		if len(chrs) != 0 {
+			rs = append(rs, chrs...)
+		}
+	}
+	return
+}
+
 func (i *iteratorRole) ProcessTemplates() (err error) {
 	if i == nil {
 		return errors.New("role tree error when processing templates")

core/workflow/role.go

@@ -32,6 +32,7 @@ import (
 	"github.com/AliceO2Group/Control/core/task"
 	"github.com/AliceO2Group/Control/core/task/channel"
 	"github.com/AliceO2Group/Control/core/task/constraint"
+	"github.com/gobwas/glob"
 	"github.com/pborman/uuid"
 )
 
@@ -49,6 +50,7 @@ type Role interface {
 	getConstraints() constraint.Constraints
 	setParent(role Updatable)
 	ProcessTemplates() error
+	GlobFilter(g glob.Glob) []Role
 }
 
 type Updatable interface {

core/workflow/rolebase.go

@@ -41,7 +41,11 @@ import (
 
 var log = logger.New(logrus.StandardLogger(), "workflow")
 
-const PATH_SEPARATOR = "."
+const(
+	PATH_SEPARATOR = "."
+	PATH_SEPARATOR_RUNE = '.'
+)
+
 
 type roleBase struct {
 	Name        string                  `yaml:"name"`
@@ -231,7 +235,7 @@ func (r *roleBase) GetStatus() task.Status {
 
 func (r *roleBase) GetState() task.State {
 	if r == nil {
-		return ""
+		return task.UNKNOWN
 	}
 	return r.state.get()
 }

core/workflow/taskrole.go

@@ -28,6 +28,7 @@ import (
 	"errors"
 
 	"github.com/AliceO2Group/Control/core/task"
+	"github.com/gobwas/glob"
 )
 
 type taskRole struct {
@@ -61,6 +62,13 @@ func (t *taskRole) UnmarshalYAML(unmarshal func(interface{}) error) (err error)
 	return
 }
 
+func (t *taskRole) GlobFilter(g glob.Glob) (rs []Role) {
+	if g.Match(t.GetPath()) {
+		rs = []Role{t}
+	}
+	return
+}
+
 func (t *taskRole) ProcessTemplates() (err error) {
 	if t == nil {
 		return errors.New("role tree error when processing templates")
@@ -91,6 +99,7 @@ func (t *taskRole) updateState(s task.State) {
 	if t.parent == nil {
 		log.WithField("state", s.String()).Error("cannot update state with nil parent")
 	}
+	log.WithField("role", t.Name).WithField("state", s.String()).Debug("updating state")
 	t.state.merge(s, t)
 	t.parent.updateState(s)
 }