This commit is contained in:
Pawel Winogrodzki 2021-10-29 01:09:33 -07:00 коммит произвёл GitHub
Родитель 21db9f88c4
Коммит 91b40b21e7
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 20 добавлений и 3 удалений

Просмотреть файл

@ -322,12 +322,16 @@ func buildAllNodes(stopOnFailure, isGraphOptimized, canUseCache bool, packagesTo
stopBuilding = true
}
activeSRPMs := buildState.ActiveSRPMs()
activeSRPMsCount := len(activeSRPMs)
if stopBuilding {
outstandingBuilds := len(buildState.ActiveBuilds())
if outstandingBuilds == 0 {
if activeSRPMsCount == 0 {
break
}
logger.Log.Infof("Waiting for %d outstanding builds to complete", outstandingBuilds)
}
if res.Node.Type == pkggraph.TypeBuild {
logger.Log.Infof("%d currently active build(s): %v.", activeSRPMsCount, activeSRPMs)
}
}

Просмотреть файл

@ -4,6 +4,8 @@
package schedulerutils
import (
"path/filepath"
"microsoft.com/pkggen/internal/logger"
"microsoft.com/pkggen/internal/pkggraph"
)
@ -57,6 +59,17 @@ func (g *GraphBuildState) ActiveBuilds() map[int64]*BuildRequest {
return g.activeBuilds
}
// ActiveSRPMs returns a list of all SRPMs, which are currently being built.
func (g *GraphBuildState) ActiveSRPMs() (builtSRPMs []string) {
for _, buildRequest := range g.activeBuilds {
if buildRequest.Node.Type == pkggraph.TypeBuild {
builtSRPMs = append(builtSRPMs, filepath.Base(buildRequest.Node.SrpmPath))
}
}
return
}
// BuildFailures returns a slice of all failed builds.
func (g *GraphBuildState) BuildFailures() []*BuildResult {
return g.failures