oui ok

dbs/mongo/mongo.go

@@ -287,7 +287,7 @@ func (m *MongoDB) Search(filters *dbs.Filters, collection_name string) (*mongo.C
 		return nil, 503, err
 	}
 	opts := options.Find()
-	opts.SetLimit(1000)
+	opts.SetLimit(100)
 	targetDBCollection := CollectionMap[collection_name]
 	orList := bson.A{}
 	andList := bson.A{}

models/peer/peer_cache.go

@@ -29,7 +29,28 @@ type PeerCache struct {
 
 // urlFormat formats the URL of the peer with the data type API function
 func (p *PeerCache) urlFormat(hostUrl string, dt tools.DataType) string {
-	return hostUrl + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
+	// localhost is replaced by the local peer URL
+	// because localhost must collide on a web request security protocol
+	/*localhost := ""
+	if strings.Contains(hostUrl, "localhost") {
+		localhost = "localhost"
+	}
+	if strings.Contains(hostUrl, "127.0.0.1") {
+		localhost = "127.0.0.1"
+	}
+	if localhost != "" {
+		r := regexp.MustCompile("(" + localhost + ":[0-9]+)")
+		t := r.FindString(hostUrl)
+		if t != "" {
+			hostUrl = strings.Replace(hostUrl, t, dt.API()+":8080/oc", -1)
+		} else {
+			hostUrl = strings.ReplaceAll(hostUrl, localhost, dt.API()+":8080/oc")
+		}
+	} else {*/
+	hostUrl = hostUrl + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
+	//}
+	fmt.Println("Contacting", hostUrl)
+	return hostUrl
 }
 
 // checkPeerStatus checks the status of a peer
@@ -65,7 +86,7 @@ func (p *PeerCache) LaunchPeerExecution(peerID string, dataID string,
 		// If the peer is not reachable, add the execution to the failed executions list
 		pexec := &PeerExecution{
 			Method:   method.String(),
-			Url:      p.urlFormat((mypeer.Url), dt) + path, // the url is constitued of : host URL + resource path + action path (ex : mypeer.com/datacenter/resourcetype/path/to/action)
+			Url:      p.urlFormat((mypeer.Url), dt) + path,  // the url is constitued of : host URL + resource path + action path (ex : mypeer.com/datacenter/resourcetype/path/to/action)
 			Body:     body,
 			DataType: dt.EnumIndex(),
 			DataID:   dataID,
@@ -78,7 +99,7 @@ func (p *PeerCache) LaunchPeerExecution(peerID string, dataID string,
 			return nil, errors.New("peer " + peerID + " not found")
 		}
 		// If the peer is reachable, launch the execution
-		url = p.urlFormat((mypeer.Url), dt) + path     // Format the URL
+		url = p.urlFormat((mypeer.Url), dt) + path       // Format the URL
 		tmp := mypeer.FailedExecution                  // Get the failed executions list
 		mypeer.FailedExecution = []PeerExecution{}     // Reset the failed executions list
 		NewShallowAccessor().UpdateOne(mypeer, peerID) // Update the peer in the db

models/workflow/workflow.go

@@ -31,43 +31,6 @@ func (d *Workflow) GetAccessor(request *tools.APIRequest) utils.Accessor {
 	return NewAccessor(request) // Create a new instance of the accessor
 }
 
-type Deps struct {
-	Source string
-	Dest   string
-}
-
-func (w *Workflow) isDependancy(id string) []Deps {
-	dependancyOfIDs := []Deps{}
-	for _, link := range w.Graph.Links {
-		if _, ok := w.Graph.Items[link.Destination.ID]; !ok {
-			continue
-		}
-		source := w.Graph.Items[link.Destination.ID].Processing
-		if id == link.Source.ID && source != nil {
-			dependancyOfIDs = append(dependancyOfIDs, Deps{Source: source.GetName(), Dest: link.Destination.ID})
-		}
-		sourceWF := w.Graph.Items[link.Destination.ID].Workflow
-		if id == link.Source.ID && sourceWF != nil {
-			dependancyOfIDs = append(dependancyOfIDs, Deps{Source: sourceWF.GetName(), Dest: link.Destination.ID})
-		}
-	}
-	return dependancyOfIDs
-}
-
-func (w *Workflow) GetDependencies(id string) (dependencies []Deps) {
-	for _, link := range w.Graph.Links {
-		if _, ok := w.Graph.Items[link.Source.ID]; !ok {
-			continue
-		}
-		source := w.Graph.Items[link.Source.ID].Processing
-		if id == link.Destination.ID && source != nil {
-			dependencies = append(dependencies, Deps{Source: source.GetName(), Dest: link.Source.ID})
-			continue
-		}
-	}
-	return
-}
-
 func (w *Workflow) GetGraphItems(f func(item graph.GraphItem) bool) (list_datas []graph.GraphItem) {
 	for _, item := range w.Graph.Items {
 		if f(item) {

models/workflow_execution/workflow_scheduler.go

@@ -1,12 +1,13 @@
 package workflow_execution
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
-	"sync"
 	"time"
 
+	"cloud.o-forge.io/core/oc-lib/logs"
 	"cloud.o-forge.io/core/oc-lib/models/booking"
 	"cloud.o-forge.io/core/oc-lib/models/common/enum"
 	"cloud.o-forge.io/core/oc-lib/models/peer"
@@ -78,60 +79,22 @@ func (ws *WorkflowSchedule) CheckBooking(wfID string, request *tools.APIRequest)
 	bookings := []*booking.Booking{}
 	for _, exec := range execs {
 		bookings = append(bookings, exec.Book(ws.UUID, wfID, priceds)...)
-	}
-
-	errCh := make(chan error, len(bookings))
-	var m sync.Mutex
-
-	for _, b := range bookings {
-		go getBooking(b, request, wf, execs, bookings, errCh, &m)
-	}
-
-	for i := 0; i < len(bookings); i++ {
-		if err := <-errCh; err != nil {
-			return false, wf, execs, bookings, err
+		for _, b := range bookings {
+			meth := request.Caller.URLS[tools.BOOKING][tools.GET]
+			meth = strings.ReplaceAll(meth, ":id", b.ResourceID)
+			meth = strings.ReplaceAll(meth, ":start_date", b.ExpectedStartDate.Format("2006-01-02T15:04:05"))
+			meth = strings.ReplaceAll(meth, ":end_date", b.ExpectedEndDate.Format("2006-01-02T15:04:05"))
+			request.Caller.URLS[tools.BOOKING][tools.GET] = meth
+			_, err := (&peer.Peer{}).LaunchPeerExecution(b.DestPeerID, b.ResourceID, tools.BOOKING, tools.GET, nil, request.Caller)
+			if err != nil {
+				return false, wf, execs, bookings, err
+			}
 		}
-	}
 
+	}
 	return true, wf, execs, bookings, nil
 }
 
-func getBooking( b *booking.Booking, request *tools.APIRequest, wf *workflow.Workflow, execs []*WorkflowExecution, bookings []*booking.Booking, errCh chan error, m *sync.Mutex) {
-
-	m.Lock()
-	c, err := getCallerCopy(request, errCh)
-	if err != nil {
-		errCh <- err
-		return
-	}
-	m.Unlock()
-
-	meth := c.URLS[tools.BOOKING][tools.GET]
-	meth = strings.ReplaceAll(meth, ":id", b.ResourceID)
-	meth = strings.ReplaceAll(meth, ":start_date", b.ExpectedStartDate.Format("2006-01-02T15:04:05"))
-	meth = strings.ReplaceAll(meth, ":end_date", b.ExpectedEndDate.Format("2006-01-02T15:04:05"))
-	c.URLS[tools.BOOKING][tools.GET] = meth
-	_, err = (&peer.Peer{}).LaunchPeerExecution(b.DestPeerID, b.ResourceID, tools.BOOKING, tools.GET, nil, &c)
-
-	if err != nil {
-		errCh <- err
-		return
-	}
-
-	errCh <- nil
-}
-
-func getCallerCopy(request *tools.APIRequest, errCh chan error) (tools.HTTPCaller, error) {
-	var c tools.HTTPCaller
-	err := request.Caller.DeepCopy(c)
-	if err != nil {
-		errCh <- err
-		return tools.HTTPCaller{}, nil
-	}
-	c.URLS = request.Caller.URLS
-	return c, err
-}
-
 func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*WorkflowSchedule, *workflow.Workflow, []*WorkflowExecution, error) {
 	if request == nil {
 		return ws, nil, []*WorkflowExecution{}, errors.New("no request found")
@@ -150,20 +113,15 @@ func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*
 		return ws, nil, executions, errors.New("could not book the workflow : " + fmt.Sprintf("%v", err))
 	}
 	ws.Workflow = wf
-
-	var errCh = make(chan error, len(bookings))
-	var m sync.Mutex
-
 	for _, booking := range bookings {
-		go ws.BookExecs(booking, request, errCh, &m)
-	}
-	
-	for i := 0; i < len(bookings); i++ {
-		if err := <- errCh ; err != nil {
+		l := logs.GetLogger()
+		l.Info().Msg("Booking on " + booking.DestPeerID)
+		_, err := (&peer.Peer{}).LaunchPeerExecution(booking.DestPeerID, "",
+			tools.BOOKING, tools.POST, booking.Serialize(booking), request.Caller)
+		if err != nil {
 			return ws, wf, executions, errors.New("could not launch the peer execution : " + fmt.Sprintf("%v", err))
 		}
 	}
-
 	fmt.Println("Schedules")
 	for _, exec := range executions {
 		err := exec.PurgeDraft(request)
@@ -177,27 +135,6 @@ func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*
 	return ws, wf, executions, nil
 }
 
-func (ws *WorkflowSchedule) BookExecs(booking *booking.Booking, request *tools.APIRequest, errCh chan error, m *sync.Mutex) {
-
-	m.Lock()
-	c, err := getCallerCopy(request, errCh)
-	if err != nil {
-		errCh <- err
-		return
-	}
-	m.Unlock()
-
-	_, err = (&peer.Peer{}).LaunchPeerExecution(booking.DestPeerID, "",
-		tools.BOOKING, tools.POST, booking.Serialize(booking), &c)
-	
-	if err != nil {
-		errCh <- err
-		return
-	}
-
-	errCh <- nil
-}
-
 /*
 BOOKING IMPLIED TIME, not of subscription but of execution
 so is processing time execution time applied on computes
@@ -217,6 +154,9 @@ func (ws *WorkflowSchedule) getExecutions(workflow *workflow.Workflow) ([]*Workf
 		return workflows_executions, err
 	}
 	for _, date := range dates {
+		fmt.Println("============")
+		fmt.Println("Date : " + fmt.Sprint(date))
+		fmt.Println("============")
 		obj := &WorkflowExecution{
 			AbstractObject: utils.AbstractObject{
 				UUID: uuid.New().String(),                                 // set the uuid of the execution
@@ -253,8 +193,17 @@ func (ws *WorkflowSchedule) getDates() ([]Schedule, error) {
 		if err != nil {
 			return schedule, errors.New("Bad cron message: " + err.Error())
 		}
+
+		toto, _ := json.MarshalIndent(sched,"","")
+		fmt.Println(string(toto))
+		s := sched.Next(ws.Start)
+		fmt.Println("s.IsZero() : " + fmt.Sprint(s.IsZero()) + "s.Before(*ws.End) : " +  fmt.Sprint(s.Before(*ws.End)) )
+		tata, _ := json.MarshalIndent(s,"","")
+		fmt.Println("s = " + string(tata) + " et ws.End = " + fmt.Sprint(ws.End))
+
 		// loop through the cron schedule to set the executions
 		for s := sched.Next(ws.Start); !s.IsZero() && s.Before(*ws.End); s = sched.Next(s) {
+			fmt.Println("next execution :" + fmt.Sprint(s))
 			e := s.Add(time.Duration(ws.DurationS) * time.Second)
 			schedule = append(schedule, Schedule{
 				Start: s,

tools/api.go

@@ -7,7 +7,6 @@ import (
 
 	"cloud.o-forge.io/core/oc-lib/config"
 	"cloud.o-forge.io/core/oc-lib/dbs/mongo"
-	"cloud.o-forge.io/core/oc-lib/logs"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -136,7 +135,6 @@ func (a *API) CheckRemotePeer(url string) (State, map[string]int) {
 // CheckRemoteAPIs checks the state of remote APIs from your proper OC
 func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error) {
 	// Check if the database is up
-	l := logs.GetLogger()
 	new := map[string]string{}
 	caller := NewHTTPCaller(map[DataType]map[METHOD]string{}) // Create a new http caller
 	code := 0
@@ -147,7 +145,6 @@ func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error)
 		var resp APIStatusResponse
 		b, err := caller.CallGet("http://"+api.API()+":8080", "/oc/version/status") // Call the status endpoint of the remote API (standard OC status endpoint)
 		if err != nil {
-			l.Error().Msg(api.String() + " not reachable")
 			state = REDUCED_SERVICE // If a remote API is not reachable, return reduced service
 			continue
 		}
@@ -164,7 +161,6 @@ func (a *API) CheckRemoteAPIs(apis []DataType) (State, map[string]string, error)
 		reachable = true // If the remote API is reachable, set reachable to true cause we are not dead
 	}
 	if !reachable {
-		l.Error().Msg("Peer check returned no answers")
 		state = DEAD // If no remote API is reachable, return dead, nobody is alive
 	}
 	if code > 0 {

tools/remote_caller.go

@@ -63,16 +63,6 @@ func NewHTTPCaller(urls map[DataType]map[METHOD]string) *HTTPCaller {
 	}
 }
 
-// Creates a copy of the current caller, in order to have parallelized executions without race condition 
-func (c* HTTPCaller) DeepCopy(dst HTTPCaller) error {
-	bytes, err := json.Marshal(c)
-	if err != nil {
-		return err
-	}
-
-	return json.Unmarshal(bytes, &dst)
-}
-
 // CallGet calls the GET method on the HTTP server
 func (caller *HTTPCaller) CallGet(url string, subpath string, types ...string) ([]byte, error) {
 	req, err := http.NewRequest(http.MethodGet, url+subpath, bytes.NewBuffer([]byte("")))