minor code cleanup
This commit is contained in:
parent
286134674b
commit
9695d146c5
@ -14,7 +14,7 @@ linters-settings:
|
||||
disabled-checks:
|
||||
- whyNoLint
|
||||
- filepathJoin
|
||||
gomnd:
|
||||
mnd:
|
||||
checks:
|
||||
- argument
|
||||
- case
|
||||
@ -91,3 +91,4 @@ linters:
|
||||
- errname
|
||||
- goerr113
|
||||
- depguard
|
||||
- noctx
|
||||
|
@ -74,9 +74,9 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
|
||||
}
|
||||
|
||||
// check if package can be built with current memory limit
|
||||
if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit {
|
||||
if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit { //nolint:gosec
|
||||
log.Warningf("[Q] %s->%s exeeds memory limit: %s->%s", pkg.FullRepo, pkg.Pkgbase,
|
||||
datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit)
|
||||
datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit) //nolint:gosec
|
||||
doneQLock.Lock()
|
||||
doneQ = append(doneQ, pkg)
|
||||
doneQLock.Unlock()
|
||||
@ -88,9 +88,9 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
|
||||
b.buildingLock.RUnlock()
|
||||
|
||||
// check if package can be build right now
|
||||
if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit {
|
||||
if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit { //nolint:gosec
|
||||
log.Debugf("[Q] skipped package with max_rss %s while load %s: %s->%s",
|
||||
datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March)
|
||||
datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March) //nolint:gosec
|
||||
continue
|
||||
}
|
||||
} else {
|
||||
@ -438,7 +438,7 @@ func (b *BuildManager) genQueue() ([]*ProtoPackage, error) {
|
||||
continue
|
||||
}
|
||||
|
||||
// try download srcinfo from repo
|
||||
// try download .SRCINFO from repo
|
||||
srcInfo, err := downloadSRCINFO(pkg.DBPackage.Pkgbase, state.TagRev)
|
||||
if err == nil {
|
||||
pkg.Srcinfo = srcInfo
|
||||
|
@ -60,8 +60,8 @@ func (p *ProtoPackage) isEligible(ctx context.Context) bool {
|
||||
p.DBPackage.SkipReason = "blacklisted"
|
||||
p.DBPackage.Status = dbpackage.StatusSkipped
|
||||
skipping = true
|
||||
case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit:
|
||||
log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB)
|
||||
case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit: //nolint:gosec
|
||||
log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB) //nolint:gosec
|
||||
p.DBPackage.SkipReason = "memory limit exceeded"
|
||||
p.DBPackage.Status = dbpackage.StatusSkipped
|
||||
skipping = true
|
||||
|
8
utils.go
8
utils.go
@ -140,7 +140,7 @@ func pkgList2MaxMem(pkgList []*ProtoPackage) datasize.ByteSize {
|
||||
var sum uint64
|
||||
for _, pkg := range pkgList {
|
||||
if pkg.DBPackage.MaxRss != nil {
|
||||
sum += uint64(*pkg.DBPackage.MaxRss)
|
||||
sum += uint64(*pkg.DBPackage.MaxRss) //nolint:gosec
|
||||
}
|
||||
}
|
||||
|
||||
@ -701,8 +701,10 @@ func Copy(srcPath, dstPath string) (err error) {
|
||||
return err
|
||||
}
|
||||
|
||||
func downloadSRCINFO(pkg string, tag string) (*srcinfo.Srcinfo, error) {
|
||||
resp, err := http.Get(fmt.Sprintf("https://gitlab.archlinux.org/archlinux/packaging/packages/%s/-/raw/%s/.SRCINFO", pkg, tag))
|
||||
func downloadSRCINFO(pkg, tag string) (*srcinfo.Srcinfo, error) {
|
||||
resp, err := http.Get(fmt.Sprintf(
|
||||
"https://gitlab.archlinux.org/archlinux/packaging/packages/%s/-/raw/%s/.SRCINFO", pkg, tag),
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user