Improvements to ERS SQL filters

This commit is contained in:
arberkatellari
2024-11-15 13:56:02 +02:00
committed by Dan Christian Bogos
parent 321910d181
commit 041b14fa03
9 changed files with 704 additions and 123 deletions

View File

@@ -145,7 +145,7 @@ func (db *DataDBService) mandatoryDB() bool {
return db.cfg.RalsCfg().Enabled || db.cfg.SchedulerCfg().Enabled || db.cfg.ChargerSCfg().Enabled ||
db.cfg.AttributeSCfg().Enabled || db.cfg.ResourceSCfg().Enabled || db.cfg.StatSCfg().Enabled ||
db.cfg.ThresholdSCfg().Enabled || db.cfg.RouteSCfg().Enabled || db.cfg.DispatcherSCfg().Enabled ||
db.cfg.LoaderCfg().Enabled() || db.cfg.ApierCfg().Enabled || db.cfg.AnalyzerSCfg().Enabled
db.cfg.LoaderCfg().Enabled() || db.cfg.ApierCfg().Enabled || db.cfg.AnalyzerSCfg().Enabled || db.cfg.ERsCfg().Enabled
}
// GetDM returns the DataManager

View File

@@ -68,7 +68,7 @@ func TestEventReaderSReload(t *testing.T) {
db := NewDataDBService(cfg, nil, false, srvDep)
sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1), shdChan, nil, anz, srvDep)
intERsConn := make(chan birpc.ClientConnector, 1)
erS := NewEventReaderService(cfg, nil, filterSChan, shdChan, nil, server, intERsConn, anz, srvDep)
erS := NewEventReaderService(cfg, db, filterSChan, shdChan, nil, server, intERsConn, anz, srvDep)
engine.NewConnManager(cfg, nil)
srvMngr.AddServices(erS, sS,
NewLoaderService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep), db)
@@ -94,7 +94,6 @@ func TestEventReaderSReload(t *testing.T) {
if !erS.IsRunning() {
t.Fatalf("Expected service to be running")
}
runtime.Gosched()
err := erS.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
@@ -112,7 +111,6 @@ func TestEventReaderSReload(t *testing.T) {
if erS.IsRunning() {
t.Fatal("Expected service to be down")
}
}
func TestEventReaderSReload2(t *testing.T) {