SunRed/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run housekeeping concurrent per repo

Browse Source 
update splitpackages on parse
This commit is contained in:
Giovanni Harting
2021-11-19 23:01:19 +01:00
parent f9c5292f90
commit 5d6a498503
2 changed files with 84 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main.go
View File

@@ -24,6 +24,7 @@ import (
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
"sync"
"syscall" "syscall"
"time" "time"
) )
@@ -228,12 +229,12 @@ func (b *BuildManager) parseWorker() {
} }
if skipping { if skipping {
dbPkg.Update().SetUpdated(time.Now()).SetVersion(pkg.Version).SetStatus(dbPkg.Status).SetSkipReason(dbPkg.SkipReason).SetHash(pkg.Hash).ExecX(context.Background()) dbPkg.Update().SetUpdated(time.Now()).SetVersion(pkg.Version).SetPackages(packages2slice(pkg.Srcinfo.Packages)).SetStatus(dbPkg.Status).SetSkipReason(dbPkg.SkipReason).SetHash(pkg.Hash).ExecX(context.Background())
b.repoPurge[pkg.FullRepo] <- pkg b.repoPurge[pkg.FullRepo] <- pkg
b.parseWG.Done() b.parseWG.Done()
continue continue
} else { } else {
dbPkg = dbPkg.Update().SetUpdated(time.Now()).SetVersion(pkg.Version).SaveX(context.Background()) dbPkg = dbPkg.Update().SetUpdated(time.Now()).SetPackages(packages2slice(pkg.Srcinfo.Packages)).SetVersion(pkg.Version).SaveX(context.Background())
} }
repoVer, err := pkg.repoVersion() repoVer, err := pkg.repoVersion()
@@ -510,15 +511,23 @@ func (b *BuildManager) syncWorker() {
} }
// housekeeping // housekeeping
err := housekeeping() wg := new(sync.WaitGroup)
for _, repo := range repos {
wg.Add(1)
repo := repo
go func() {
err := housekeeping(repo, wg)
if err != nil { if err != nil {
log.Warningf("Housekeeping failed: %v", err) log.Warningf("[%s] Housekeeping failed: %v", repo, err)
} }
}()
}
wg.Wait()
// fetch updates between sync runs // fetch updates between sync runs
b.alpmMutex.Lock() b.alpmMutex.Lock()
check(alpmHandle.Release()) check(alpmHandle.Release())
err = setupChroot() err := setupChroot()
for err != nil { for err != nil {
log.Warningf("Unable to upgrade chroot, trying again later.") log.Warningf("Unable to upgrade chroot, trying again later.")
time.Sleep(time.Minute) time.Sleep(time.Minute)

7
utils.go
View File

@@ -474,9 +474,9 @@ func (path PKGFile) isSignatureValid() (bool, error) {
return false, nil return false, nil
} }
func housekeeping() error { func housekeeping(repo string, wg *sync.WaitGroup) error {
log.Debugf("Start housekeeping") defer wg.Done()
for _, repo := range repos { log.Debugf("[%s] Start housekeeping", repo)
packages, err := Glob(filepath.Join(conf.Basedir.Repo, repo, "/**/*.pkg.tar.zst")) packages, err := Glob(filepath.Join(conf.Basedir.Repo, repo, "/**/*.pkg.tar.zst"))
if err != nil { if err != nil {
return err return err
@@ -557,7 +557,6 @@ func housekeeping() error {
continue continue
} }
} }
}
return nil return nil
} }