[core] Improved output for "no resource demands for descriptor" issue

teo · teo · commit ebe6e9cbd924 · 2022-08-09T11:32:51.000+02:00
diff --git a/core/task/match.go b/core/task/match.go
@@ -25,6 +25,9 @@
 package task
 
 import (
+	"fmt"
+
+	"github.com/AliceO2Group/Control/common/utils/uid"
 	"github.com/AliceO2Group/Control/core/task/channel"
 	"github.com/AliceO2Group/Control/core/task/constraint"
 	"github.com/AliceO2Group/Control/core/task/taskclass/port"
@@ -40,26 +43,36 @@ type Wants struct {
 }
 
 // GetWantsForDescriptor matches between taskclass and taskmanager's classes
-func (m *Manager) GetWantsForDescriptor(descriptor *Descriptor) (r *Wants) {
+func (m *Manager) GetWantsForDescriptor(descriptor *Descriptor, envId uid.ID) (r *Wants, err error) {
 	taskClass, ok := m.classes.GetClass(descriptor.TaskClassName)
 	if ok && taskClass != nil {
 		r = &Wants{}
 		wants := taskClass.Wants
 		if wants.Cpu != nil {
 			r.Cpu = *wants.Cpu
+		} else {
+			log.WithPrefix("scheduler").
+				WithField("partition", envId.String()).
+				Warnf("missing CPU resource requirement for requested task class %s", descriptor.TaskClassName)
 		}
 		if wants.Memory != nil {
 			r.Memory = *wants.Memory
+		} else {
+			log.WithPrefix("scheduler").
+				WithField("partition", envId.String()).
+				Warnf("missing memory resource requirement for requested task class %s", descriptor.TaskClassName)
 		}
 		if wants.Ports != nil {
 			r.StaticPorts = make(port.Ranges, len(wants.Ports))
 			copy(r.StaticPorts, wants.Ports)
+		} else {
+			log.WithPrefix("scheduler").
+				WithField("partition", envId.String()).
+				Warnf("missing ports resource requirement for requested task class %s", descriptor.TaskClassName)
 		}
 		r.InboundChannels = channel.MergeInbound(descriptor.RoleBind, taskClass.Bind)
 	} else {
-		log.WithField("taskClass", descriptor.TaskClassName).
-			WithField("constraints", descriptor.RoleConstraints.String()).
-			Warnf("task class not found for descriptor")
+		err = fmt.Errorf("attempted to get wants for descriptor but task class %s not found in manager", descriptor.TaskClassName)
 	}
 	return
 }
diff --git a/core/task/scheduler.go b/core/task/scheduler.go
@@ -575,14 +575,17 @@ func (state *schedulerState) resourceOffers(fidStore store.Singleton) events.Han
 						WithField("partition", envId.String()).
 						Debug("offer attributes satisfy constraints")
 
-					wants := state.taskman.GetWantsForDescriptor(descriptor)
-					if wants == nil {
+					var wants *Wants
+					wants, err = state.taskman.GetWantsForDescriptor(descriptor, envId)
+					if err != nil {
 						log.WithPrefix("scheduler").
+							WithError(err).
 							WithField("partition", envId.String()).
 							WithFields(logrus.Fields{
-								"class":     descriptor.TaskClassName,
-								"level":     infologger.IL_Devel,
-								"offerHost": offer.Hostname,
+								"class":       descriptor.TaskClassName,
+								"constraints": descriptor.RoleConstraints.String(),
+								"level":       infologger.IL_Devel,
+								"offerHost":   offer.Hostname,
 							}).
 							Error("invalid task class: no task class or no resource demands for descriptor, WILL NOT BE DEPLOYED")
 						continue
