mirror of
https://github.com/project-zot/zot.git
synced 2025-02-03 23:09:41 -05:00
7642e5af98
* fix(scheduler): data race when pushing new tasks the problem here is that scheduler can be closed in two ways: - canceling the context given as argument to scheduler.RunScheduler() - running scheduler.Shutdown() because of this shutdown can trigger a data race between calling scheduler.inShutdown() and actually pushing tasks into the pool workers solved that by keeping a quit channel and listening on both quit channel and ctx.Done() and closing the worker chan and scheduler afterwards. Signed-off-by: Petu Eusebiu <peusebiu@cisco.com> * refactor(scheduler): refactor into a single shutdown before this we could stop scheduler either by closing the context provided to RunScheduler(ctx) or by running Shutdown(). simplify things by getting rid of the external context in RunScheduler(). keep an internal context in the scheduler itself and pass it down to all tasks. Signed-off-by: Petu Eusebiu <peusebiu@cisco.com> --------- Signed-off-by: Petu Eusebiu <peusebiu@cisco.com>
117 lines
2.2 KiB
Go
117 lines
2.2 KiB
Go
package v1_0_0_test
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"gopkg.in/resty.v1"
|
|
|
|
"zotregistry.io/zot/pkg/api"
|
|
"zotregistry.io/zot/pkg/api/config"
|
|
"zotregistry.io/zot/pkg/compliance"
|
|
"zotregistry.io/zot/pkg/compliance/v1_0_0"
|
|
. "zotregistry.io/zot/pkg/test/common"
|
|
)
|
|
|
|
//nolint:gochecknoglobals
|
|
var (
|
|
listenAddress = "127.0.0.1"
|
|
defaultDir = ""
|
|
firstDir = ""
|
|
secondDir = ""
|
|
)
|
|
|
|
func TestWorkflows(t *testing.T) {
|
|
ctrl, randomPort := startServer(t)
|
|
defer stopServer(ctrl)
|
|
|
|
storageInfo := []string{defaultDir, firstDir, secondDir}
|
|
|
|
v1_0_0.CheckWorkflows(t, &compliance.Config{
|
|
Address: listenAddress,
|
|
Port: randomPort,
|
|
StorageInfo: storageInfo,
|
|
})
|
|
}
|
|
|
|
func TestWorkflowsOutputJSON(t *testing.T) {
|
|
ctrl, randomPort := startServer(t)
|
|
defer stopServer(ctrl)
|
|
|
|
storageInfo := []string{defaultDir, firstDir, secondDir}
|
|
|
|
v1_0_0.CheckWorkflows(t, &compliance.Config{
|
|
Address: listenAddress,
|
|
Port: randomPort,
|
|
OutputJSON: true,
|
|
StorageInfo: storageInfo,
|
|
})
|
|
}
|
|
|
|
// start local server on random open port.
|
|
func startServer(t *testing.T) (*api.Controller, string) {
|
|
t.Helper()
|
|
|
|
port := GetFreePort()
|
|
baseURL := GetBaseURL(port)
|
|
conf := config.New()
|
|
conf.HTTP.Address = listenAddress
|
|
conf.HTTP.Port = port
|
|
ctrl := api.NewController(conf)
|
|
|
|
dir := t.TempDir()
|
|
defaultDir = dir
|
|
|
|
firstSubDir := t.TempDir()
|
|
firstDir = firstSubDir
|
|
|
|
secondSubDir := t.TempDir()
|
|
secondDir = secondSubDir
|
|
|
|
subPaths := make(map[string]config.StorageConfig)
|
|
|
|
subPaths["/firsttest"] = config.StorageConfig{RootDirectory: firstSubDir}
|
|
subPaths["/secondtest"] = config.StorageConfig{RootDirectory: secondSubDir}
|
|
|
|
ctrl.Config.Storage.RootDirectory = dir
|
|
|
|
ctrl.Config.Storage.SubPaths = subPaths
|
|
|
|
go func() {
|
|
if err := ctrl.Init(); err != nil {
|
|
return
|
|
}
|
|
|
|
// this blocks
|
|
if err := ctrl.Run(); err != nil {
|
|
return
|
|
}
|
|
}()
|
|
|
|
for {
|
|
// poll until ready
|
|
resp, _ := resty.R().Get(baseURL)
|
|
if resp.StatusCode() == http.StatusNotFound {
|
|
break
|
|
}
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
}
|
|
|
|
return ctrl, port
|
|
}
|
|
|
|
func stopServer(ctrl *api.Controller) {
|
|
err := ctrl.Server.Shutdown(context.Background())
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
err = os.RemoveAll(ctrl.Config.Storage.RootDirectory)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
}
|