[core] Report a channel mismatch error on bad channel configuration

Author: teo

core/task/channel/outbound.go

@@ -25,6 +25,7 @@
 package channel
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -97,8 +98,9 @@ chans.data1.0.type          = pull
 chans.data1.numSockets      = 1
 */
 
-func (outbound *Outbound) ToFMQMap(bindMap BindMap) (pm controlcommands.PropertyMap) {
+func (outbound *Outbound) ToFMQMap(bindMap BindMap) (pm controlcommands.PropertyMap, err error) {
 	if outbound == nil {
+		err = fmt.Errorf("outbound channel object is nil")
 		return
 	}
 
@@ -110,24 +112,30 @@ func (outbound *Outbound) ToFMQMap(bindMap BindMap) (pm controlcommands.Property
 		address = outbound.Target
 		transport = outbound.Transport
 	} else {
+		matched := false
+
 		// we don't need class.Bind data for this one, only task.bindPorts after resolving paths!
 		for chPath, endpoint := range bindMap {
+
 			// FIXME: implement more sophisticated channel matching here
 			if outbound.Target == chPath {
-
 				// We have a match, so we generate a resolved target address and break
 				address = endpoint.GetAddress()
 				transport = endpoint.GetTransport()
+				matched = true
 				break
 			}
 		}
+		if !matched {
+			err = fmt.Errorf("could not match target for outbound channel %s", outbound.Target)
+		}
 	}
 
 	if len(address) == 0 {
 		return
 	}
 
-	return outbound.buildFMQMap(address, transport)
+	return outbound.buildFMQMap(address, transport), err
 }
 
 func (outbound *Outbound) buildFMQMap(address string, transport TransportType) (pm controlcommands.PropertyMap) {

core/task/task.go

@@ -40,10 +40,10 @@ import (
 
 	"github.com/AliceO2Group/Control/common"
 	"github.com/AliceO2Group/Control/common/controlmode"
+	"github.com/AliceO2Group/Control/common/event"
 	"github.com/AliceO2Group/Control/common/gera"
 	"github.com/AliceO2Group/Control/common/logger"
 	"github.com/AliceO2Group/Control/common/utils"
-	"github.com/AliceO2Group/Control/common/event"
 	"github.com/AliceO2Group/Control/common/utils/uid"
 	"github.com/AliceO2Group/Control/configuration/template"
 	"github.com/AliceO2Group/Control/core/controlcommands"
@@ -247,6 +247,7 @@ func (t *Task) BuildTaskCommand(role parentRole) (err error) {
 		//        parametrizing these values for all control modes.
 		//        THIS BREAKS TASK CLASS REUSE! See OCTRL-227
 		if class.Control.Mode == controlmode.BASIC ||
+			class.Control.Mode == controlmode.HOOK ||
 			class.Control.Mode == controlmode.DIRECT ||
 			class.Control.Mode == controlmode.FAIRMQ {
 			var varStack map[string]string
@@ -431,11 +432,12 @@ func fillCommonProperties(t *Task, propMap controlcommands.PropertyMap) {
 	propMap["environment_id"] = envId.String()
 }
 
-func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommands.PropertyMap) {
+func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommands.PropertyMap, err error) {
 	propMap = make(controlcommands.PropertyMap)
 	if class := t.GetTaskClass(); class != nil {
 		if class.Control.Mode != controlmode.BASIC { // if it's NOT a basic task or hook, we template the props
 			if t.GetParent() == nil {
+				err = fmt.Errorf("cannot build property map for parentless task %s (id %s)", t.name, t.taskId)
 				return
 			}
 
@@ -444,17 +446,18 @@ func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommand
 
 			// First we get the full varStack from the parent role, and
 			// consolidate it.
-			varStack, err := t.GetParent().ConsolidatedVarStack()
+			var varStack map[string]string
+			varStack, err = t.GetParent().ConsolidatedVarStack()
 			if err != nil {
-				log.WithError(err).Error("cannot fetch variables stack for property map")
+				err = fmt.Errorf("cannot fetch variables stack for property map: %w", err)
 				return
 			}
 
 			// We wrap the parent varStack around the class Defaults, ensuring
 			// the class Defaults are overridden by anything else.
 			varStack, err = gera.MakeStringMapWithMap(varStack).WrappedAndFlattened(class.Defaults)
 			if err != nil {
-				log.WithError(err).Error("cannot fetch task class defaults for property map")
+				err = fmt.Errorf("cannot fetch task class defaults for property map: %w", err)
 				return
 			}
 
@@ -476,10 +479,10 @@ func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommand
 					endpoint, ok := t.localBindMap[inbCh.Name]
 					if !ok {
 						log.WithFields(logrus.Fields{
-							"channelName": inbCh.Name,
-							"taskName": t.name,
-						}).
-							Error("endpoint not allocated for inbound channel")
+								"channelName": inbCh.Name,
+								"taskName": t.name,
+							}).
+							Warn("endpoint not allocated for inbound channel")
 						continue
 					}
 
@@ -493,7 +496,11 @@ func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommand
 				}
 				for _, outboundCh := range channel.MergeOutbound(t.GetParent().CollectOutboundChannels(), class.Connect) {
 					// We get the FairMQ-formatted propertyMap from the outbound channel spec
-					chanProps := outboundCh.ToFMQMap(bindMap)
+					var chanProps controlcommands.PropertyMap
+					chanProps, err = outboundCh.ToFMQMap(bindMap)
+					if err != nil {
+						return nil, err
+					}
 
 					// And if valid, we copy it into the task's propertyMap
 					if len(chanProps) > 0 {
@@ -539,7 +546,7 @@ func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommand
 		}
 
 	}
-	return propMap
+	return propMap, err
 }
 
 func (t *Task) GetMesosCommandTarget() controlcommands.MesosCommandTarget {

core/task/tasks.go

@@ -109,7 +109,12 @@ func (m Tasks) BuildPropertyMaps(bindMap channel.BindMap) (propMapMap controlcom
 		}
 		receiver := task.GetMesosCommandTarget()
 
-		propMapMap[receiver] = task.BuildPropertyMap(bindMap)
+		var taskPropMap controlcommands.PropertyMap
+		taskPropMap, err = task.BuildPropertyMap(bindMap)
+		if err != nil {
+			return nil, err
+		}
+		propMapMap[receiver] = taskPropMap
 	}
 	return
 }