uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated StatQueue handling in datamanager

Browse Source
This commit is contained in:
Trial97
2021-05-21 13:15:19 +03:00
committed by Dan Christian Bogos
parent 492946d363
commit f0d3c435de
17 changed files with 258 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
migrator/stats.go
View File

@@ -58,7 +58,7 @@ type v1Stat struct {
Triggers engine.ActionTriggers
}
func (m *Migrator) moveStatQueueProfile() (err error) {
func (m *Migrator) migrateCurrentStats() (err error) {
//StatQueueProfile
var ids []string
if ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.StatQueueProfilePrefix); err != nil {
@@ -69,52 +69,32 @@ func (m *Migrator) moveStatQueueProfile() (err error) {
if len(tntID) < 2 {
return fmt.Errorf("Invalid key <%s> when migrating stat queue profiles", id)
}
sgs, err := m.dmIN.DataManager().GetStatQueueProfile(tntID[0], tntID[1], false, false, utils.NonTransactional)
sqp, err := m.dmIN.DataManager().GetStatQueueProfile(tntID[0], tntID[1], false, false, utils.NonTransactional)
if err != nil {
return err
}
if sgs == nil || m.dryRun {
continue
}
if err := m.dmOut.DataManager().SetStatQueueProfile(sgs, true); err != nil {
return err
}
if err := m.dmIN.DataManager().RemoveStatQueueProfile(tntID[0], tntID[1], utils.NonTransactional, false); err != nil {
return err
}
}
return
}
func (m *Migrator) migrateCurrentStats() (err error) {
var ids []string
//StatQueue
if ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.StatQueuePrefix); err != nil {
return err
}
for _, id := range ids {
tntID := strings.SplitN(strings.TrimPrefix(id, utils.StatQueuePrefix), utils.InInFieldSep, 2)
if len(tntID) < 2 {
return fmt.Errorf("Invalid key <%s> when migrating stat queues", id)
}
sgs, err := m.dmIN.DataManager().GetStatQueue(tntID[0], tntID[1], false, false, utils.NonTransactional)
if err != nil {
return err
}
if sgs == nil || m.dryRun {
if sqp == nil || m.dryRun {
continue
}
if err := m.dmOut.DataManager().SetStatQueue(sgs, nil, 0, nil, 0, true); err != nil {
if err := m.dmOut.DataManager().SetStatQueueProfile(sqp, true); err != nil {
return err
}
if err := m.dmIN.DataManager().RemoveStatQueue(tntID[0], tntID[1], utils.NonTransactional); err != nil {
if sgs != nil {
if err := m.dmOut.DataManager().SetStatQueue(sgs); err != nil {
return err
}
}
if err := m.dmIN.DataManager().RemoveStatQueueProfile(tntID[0], tntID[1], utils.NonTransactional, false); err != nil {
return err
}
m.stats[utils.StatS]++
}
return m.moveStatQueueProfile()
return
}
func (m *Migrator) migrateV1Stats() (filter *engine.Filter, v2Stats *engine.StatQueue, sts *engine.StatQueueProfile, err error) {
@@ -232,8 +212,10 @@ func (m *Migrator) migrateStats() (err error) {
if err = m.dmOut.DataManager().SetStatQueueProfile(v4sts, true); err != nil {
return
}
if err = m.dmOut.DataManager().SetStatQueue(v3Stats, nil, 0, nil, 0, true); err != nil {
return
if v3Stats != nil {
if err = m.dmOut.DataManager().SetStatQueue(v3Stats); err != nil {
return
}
}
}
m.stats[utils.StatS]++

2
migrator/stats_it_test.go
View File

@@ -294,7 +294,7 @@ func testStsITMigrateAndMove(t *testing.T) {
if err := stsMigrator.dmIN.DataManager().SetStatQueueProfile(sqp, false); err != nil {
t.Error("Error when setting Stats ", err.Error())
}
if err := stsMigrator.dmIN.DataManager().SetStatQueue(sq, nil, 0, nil, 0, true); err != nil {
if err := stsMigrator.dmIN.DataManager().SetStatQueue(sq); err != nil {
t.Error("Error when setting Stats ", err.Error())
}
if err := stsMigrator.dmOut.DataManager().SetFilter(filter, true); err != nil {

9
migrator/thresholds.go
View File

@@ -80,11 +80,10 @@ func (m *Migrator) migrateCurrentThresholds() (err error) {
return err
}
// update the threshold in the new DB
if ths == nil {
continue
}
if err := m.dmOut.DataManager().SetThreshold(ths); err != nil {
return err
if ths != nil {
if err := m.dmOut.DataManager().SetThreshold(ths); err != nil {
return err
}
}
if err := m.dmIN.DataManager().RemoveThresholdProfile(tntID[0], tntID[1], utils.NonTransactional, false); err != nil {
return err