debug

daemons/execute_monitor_local.go

@@ -11,7 +11,7 @@ import (
 type LocalMonitor struct {
 	LokiURL      string
 	KubeURL      string
-	ExecutionID string
+	ExecutionID 	 string
 	Duration     int
 	Logger       zerolog.Logger
 }
@@ -30,7 +30,7 @@ func (lm *LocalMonitor) LaunchLocalMonitor() {
 }
 
 func (lm *LocalMonitor) execLocalKube() {
-	args := []string{"-w", lm.ExecutionID, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl, "-d", conf.GetConfig().DBName}
+	args := []string{"-e", lm.ExecutionID, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl, "-d", conf.GetConfig().DBName}
 	if lm.Duration > 0 {
 		args = append(args, "-t", fmt.Sprintf("%d", lm.Duration))
 	}

daemons/execution_manager.go

@@ -9,7 +9,7 @@ import (
 	workflow_execution "cloud.o-forge.io/core/oc-lib/models/workflow_execution"
 )
 
-var Bookings = ScheduledBooking{Bookings: map[string]*workflow_execution.WorkflowExecution{}}
+var Bookings = ScheduledBooking{Bookings: []*workflow_execution.WorkflowExecution{}}
 
 type ExecutionManager struct{}
 
@@ -21,11 +21,12 @@ func (em *ExecutionManager) RetrieveNextExecutions() {
 		logger.Debug().Msg("New loop")
 		Bookings.Mu.Lock()
 		if len(Bookings.Bookings) > 0 {
-			for k, v := range Bookings.Bookings {
-				if v.ExecDate.Before(time.Now().UTC()) {
-					logger.Info().Msg("Will execute " + k + " soon")
-					go em.executeBooking(v)
-					delete(Bookings.Bookings, k)
+			bookings := Bookings.Bookings
+			for i := len(bookings) - 1; i >= 0; i-- {
+				if bookings[i].ExecDate.Before(time.Now().UTC()) {
+					logger.Info().Msg("Will execute " + bookings[i].UUID + " soon")
+					go em.executeBooking(bookings[i])
+					Bookings.Bookings = append(bookings[:i], bookings[i+1:]...)
 				}
 			}
 		}

daemons/schedule_manager.go

@@ -6,39 +6,38 @@ import (
 	"oc-schedulerd/conf"
 	"sync"
 	"time"
-	"cloud.o-forge.io/core/oc-lib/tools"
+
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/dbs"
 	"cloud.o-forge.io/core/oc-lib/models/workflow_execution"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	"github.com/nats-io/nats.go"
 	"github.com/rs/zerolog"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 type ScheduledBooking struct {
-	Bookings map[string]*workflow_execution.WorkflowExecution
+	Bookings []*workflow_execution.WorkflowExecution
 	Mu       sync.Mutex
 }
 
 func (sb *ScheduledBooking) DeleteSchedules(workflow_id string) {
-	toDelete := []string{}
-	for k, b := range sb.Bookings {
-		if b.WorkflowID == workflow_id {
-			toDelete = append(toDelete, k)
+	toNotDelete := []*workflow_execution.WorkflowExecution{}
+	for _, b := range sb.Bookings {
+		if b.WorkflowID != workflow_id {
+			toNotDelete = append(toNotDelete, b)
 		}
 	}
 	Bookings.Mu.Lock()
 	defer Bookings.Mu.Unlock()
-	for _, k := range toDelete {
-		delete(sb.Bookings, k)
-	}
+	sb.Bookings = toNotDelete
 }
 
 func (sb *ScheduledBooking) AddSchedules(new_bookings []*workflow_execution.WorkflowExecution, logger zerolog.Logger) {
 	Bookings.Mu.Lock()
 	defer Bookings.Mu.Unlock()
 	for _, exec := range new_bookings {
-		sb.Bookings[exec.GetID()] = exec
+		sb.Bookings = append(sb.Bookings , exec)
 	}
 }
 // NATS daemon listens to subject " workflowsUpdate "