From efa73d8a45336895fe8eb0551205c5e3ce993bb1 Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 2 Aug 2024 15:06:40 +0200 Subject: [PATCH] mongo stability debug + zoom --- dbs/mongo/mongo.go | 4 ++++ models/resources/workflow/graph/graph.go | 1 + models/workflow/workflow_mongo_accessor.go | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dbs/mongo/mongo.go b/dbs/mongo/mongo.go index f564484..e0dfefe 100644 --- a/dbs/mongo/mongo.go +++ b/dbs/mongo/mongo.go @@ -92,6 +92,8 @@ func (m *MongoDB) createClient(MongoURL string) error { func (m *MongoDB) prepareDB(list_collection []string, config MongoConf) { var err error mngoDB = mngoClient.Database(config.GetDatabase()) + MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() existingCollections, err = mngoDB.ListCollectionNames(MngoCtx, bson.D{}) if err != nil { m.Logger.Fatal().Msg("Error contacting MongoDB\n" + err.Error()) @@ -116,6 +118,8 @@ func (m *MongoDB) prepareDB(list_collection []string, config MongoConf) { // Creates the collection with index specified in mongo/mongo_collections // or use the basic collection creation function func (m *MongoDB) createCollection(collection_name string, new_collection *mongo.Collection) { + MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() var err error CollectionMap[collection_name] = new_collection _, exists := IndexesMap[collection_name] diff --git a/models/resources/workflow/graph/graph.go b/models/resources/workflow/graph/graph.go index 4b25478..316c36d 100644 --- a/models/resources/workflow/graph/graph.go +++ b/models/resources/workflow/graph/graph.go @@ -3,6 +3,7 @@ package graph import "cloud.o-forge.io/core/oc-lib/models/resources" type Graph struct { + Zoom float64 `bson:"zoom" json:"zoom" validate:"required"` Items map[string]GraphItem `bson:"items" json:"items" default:"{}" validate:"required"` Links []GraphLink `bson:"links" json:"links" default:"{}" validate:"required"` } diff --git a/models/workflow/workflow_mongo_accessor.go b/models/workflow/workflow_mongo_accessor.go index e068625..c3c6d78 100644 --- a/models/workflow/workflow_mongo_accessor.go +++ b/models/workflow/workflow_mongo_accessor.go @@ -107,7 +107,7 @@ func (wfa *workflowMongoAccessor) execute(workflow *Workflow) { } resource, _, err := accessor.Search(filters, "") if err == nil && len(resource) > 0 { - fmt.Println(workflow.Processings, resource[0].GetID()) + fmt.Println(workflow.Serialize(), resource[0].GetID()) accessor.UpdateOne(&workspace.Workspace{ Active: true, ResourceSet: resources.ResourceSet{