Skip to content
Snippets Groups Projects
Verified Commit e1ae9d60 authored by Malte Bauch's avatar Malte Bauch
Browse files

Use the same client for updates withing stores

parent 0f23c128
No related branches found
No related tags found
1 merge request!1074Resolve "Too many open files"
...@@ -6,7 +6,6 @@ import ( ...@@ -6,7 +6,6 @@ import (
"code.fbi.h-da.de/danet/gosdn/controller/customerrs" "code.fbi.h-da.de/danet/gosdn/controller/customerrs"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkelement" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkelement"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
"code.fbi.h-da.de/danet/gosdn/controller/store" "code.fbi.h-da.de/danet/gosdn/controller/store"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
...@@ -122,15 +121,10 @@ func (s *DatabaseNetworkElementStore) Add(ctx context.Context, networkElementToA ...@@ -122,15 +121,10 @@ func (s *DatabaseNetworkElementStore) Add(ctx context.Context, networkElementToA
func (s *DatabaseNetworkElementStore) Update(ctx context.Context, networkElementToUpdate networkelement.NetworkElement) (err error) { func (s *DatabaseNetworkElementStore) Update(ctx context.Context, networkElementToUpdate networkelement.NetworkElement) (err error) {
var updatedLoadedNetworkElement networkelement.LoadedNetworkElement var updatedLoadedNetworkElement networkelement.LoadedNetworkElement
db, err := database.GetDatabaseConnection()
if err != nil {
return err
}
wc := writeconcern.Majority() wc := writeconcern.Majority()
txnOptions := options.Transaction().SetWriteConcern(wc) txnOptions := options.Transaction().SetWriteConcern(wc)
// Starts a session on the client // Starts a session on the client
session, err := db.Client().StartSession() session, err := s.collection.Database().Client().StartSession()
if err != nil { if err != nil {
return err return err
} }
......
...@@ -6,7 +6,6 @@ import ( ...@@ -6,7 +6,6 @@ import (
"code.fbi.h-da.de/danet/gosdn/controller/customerrs" "code.fbi.h-da.de/danet/gosdn/controller/customerrs"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac" "code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
"code.fbi.h-da.de/danet/gosdn/controller/store" "code.fbi.h-da.de/danet/gosdn/controller/store"
"github.com/google/uuid" "github.com/google/uuid"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
...@@ -134,15 +133,10 @@ func (s *DatabaseUserStore) GetAll(ctx context.Context) (loadedUsers []rbac.Load ...@@ -134,15 +133,10 @@ func (s *DatabaseUserStore) GetAll(ctx context.Context) (loadedUsers []rbac.Load
func (s *DatabaseUserStore) Update(ctx context.Context, userToUpdate rbac.User) (err error) { func (s *DatabaseUserStore) Update(ctx context.Context, userToUpdate rbac.User) (err error) {
var updatedLoadedUser rbac.LoadedUser var updatedLoadedUser rbac.LoadedUser
db, err := database.GetDatabaseConnection()
if err != nil {
return err
}
wc := writeconcern.Majority() wc := writeconcern.Majority()
txnOptions := options.Transaction().SetWriteConcern(wc) txnOptions := options.Transaction().SetWriteConcern(wc)
// Starts a session on the client // Starts a session on the client
session, err := db.Client().StartSession() session, err := s.collection.Database().Client().StartSession()
if err != nil { if err != nil {
return err return err
} }
......
...@@ -6,7 +6,6 @@ import ( ...@@ -6,7 +6,6 @@ import (
"time" "time"
"code.fbi.h-da.de/danet/gosdn/controller/customerrs" "code.fbi.h-da.de/danet/gosdn/controller/customerrs"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
query "code.fbi.h-da.de/danet/gosdn/controller/store" query "code.fbi.h-da.de/danet/gosdn/controller/store"
"github.com/google/uuid" "github.com/google/uuid"
...@@ -133,15 +132,10 @@ func (s *DatabaseNodeStore) Add(ctx context.Context, node Node) (err error) { ...@@ -133,15 +132,10 @@ func (s *DatabaseNodeStore) Add(ctx context.Context, node Node) (err error) {
func (s *DatabaseNodeStore) Update(ctx context.Context, node Node) (err error) { func (s *DatabaseNodeStore) Update(ctx context.Context, node Node) (err error) {
var updatedLoadedNodes Node var updatedLoadedNodes Node
db, err := database.GetDatabaseConnection()
if err != nil {
return err
}
wc := writeconcern.Majority() wc := writeconcern.Majority()
txnOptions := options.Transaction().SetWriteConcern(wc) txnOptions := options.Transaction().SetWriteConcern(wc)
// Starts a session on the client // Starts a session on the client
session, err := db.Client().StartSession() session, err := s.collection.Database().Client().StartSession()
if err != nil { if err != nil {
return err return err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment