mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-12-26 05:19:05 +01:00
use direct db execution for autoupdaters
- transactions need to be reinvestigated
This commit is contained in:
parent
18af51b0a4
commit
05517fcbcd
@ -24,12 +24,12 @@ func RegisterFootprintWorker() {
|
|||||||
gocron.NewTask(
|
gocron.NewTask(
|
||||||
func() {
|
func() {
|
||||||
s := time.Now()
|
s := time.Now()
|
||||||
log.Printf("Update Footprints started at %s", s.Format(time.RFC3339))
|
log.Printf("Update Footprints started at %s using direct query execution", s.Format(time.RFC3339))
|
||||||
|
|
||||||
t, err := jobRepo.TransactionInit()
|
// t, err := jobRepo.TransactionInit()
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Errorf("Failed TransactionInit %v", err)
|
// log.Errorf("Failed TransactionInit %v", err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
for _, cluster := range archive.Clusters {
|
for _, cluster := range archive.Clusters {
|
||||||
jobs, err := jobRepo.FindRunningJobs(cluster.Name)
|
jobs, err := jobRepo.FindRunningJobs(cluster.Name)
|
||||||
@ -85,35 +85,39 @@ func RegisterFootprintWorker() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stmt := sq.Update("job").Where("job.id = ?", job.ID)
|
// Init UpdateBuilder
|
||||||
|
stmt := sq.Update("job")
|
||||||
|
// Add SET queries
|
||||||
stmt, err = jobRepo.UpdateFootprint(stmt, jobMeta)
|
stmt, err = jobRepo.UpdateFootprint(stmt, jobMeta)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Update job (dbid: %d) failed at update Footprint step: %s", job.ID, err.Error())
|
log.Errorf("Update job (dbid: %d) failed at update Footprint step: %s", job.ID, err.Error())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
stmt, err = jobRepo.UpdateEnergy(stmt, jobMeta)
|
stmt, err = jobRepo.UpdateEnergy(stmt, jobMeta)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Update job (dbid: %d) failed at update Energy step: %s", job.ID, err.Error())
|
log.Errorf("Update job (dbid: %d) failed at update Energy step: %s", job.ID, err.Error())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Add WHERE Filter
|
||||||
|
stmt = stmt.Where("job.id = ?", job.ID)
|
||||||
|
|
||||||
query, args, err := stmt.ToSql()
|
// query, args, err := stmt.ToSql()
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Errorf("Failed in ToSQL conversion %v", err)
|
// log.Errorf("Failed in ToSQL conversion: %v", err)
|
||||||
continue
|
|
||||||
}
|
|
||||||
jobRepo.TransactionAdd(t, query, args)
|
|
||||||
// if err := jobRepo.Execute(stmt); err != nil {
|
|
||||||
// log.Errorf("Update job (dbid: %d) failed at db execute: %s", job.ID, err.Error())
|
|
||||||
// continue
|
// continue
|
||||||
// }
|
// }
|
||||||
log.Debugf("Finish job %d", job.JobID)
|
|
||||||
}
|
|
||||||
|
|
||||||
jobRepo.TransactionCommit(t)
|
// jobRepo.TransactionAdd(t, query, args)
|
||||||
|
if err := jobRepo.Execute(stmt); err != nil {
|
||||||
|
log.Errorf("Update job footprint (dbid: %d) failed at db execute: %s", job.ID, err.Error())
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
log.Debugf("Finish Job %d", job.JobID)
|
||||||
|
}
|
||||||
|
log.Debugf("Finish Cluster %s", cluster.Name)
|
||||||
|
// jobRepo.TransactionCommit(t)
|
||||||
}
|
}
|
||||||
jobRepo.TransactionEnd(t)
|
// jobRepo.TransactionEnd(t)
|
||||||
log.Printf("Update Footprints is done and took %s", time.Since(s))
|
log.Printf("Update Footprints is done and took %s", time.Since(s))
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user