github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9665 from fuweid/upgrade-recover-images

Browse Source 
integration: add test for recovering images
This commit is contained in:
Derek McGowan 2024-01-25 06:37:19 +00:00 committed by GitHub
commit d5f7e54571
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
integration/release_upgrade_linux_test.go
View File

@ -40,7 +40,7 @@ import (
) )
// upgradeVerifyCaseFunc is used to verify the behavior after upgrade. // upgradeVerifyCaseFunc is used to verify the behavior after upgrade.
type upgradeVerifyCaseFunc func(t *testing.T, criRuntimeService cri.RuntimeService) type upgradeVerifyCaseFunc func(t *testing.T, criRuntimeService cri.RuntimeService, criImageService cri.ImageManagerService)
// TODO: Support Windows // TODO: Support Windows
func TestUpgrade(t *testing.T) { func TestUpgrade(t *testing.T) {
@ -50,6 +50,7 @@ func TestUpgrade(t *testing.T) {
t.Run("recover", runUpgradeTestCase(previousReleaseBinDir, shouldRecoverAllThePodsAfterUpgrade)) t.Run("recover", runUpgradeTestCase(previousReleaseBinDir, shouldRecoverAllThePodsAfterUpgrade))
t.Run("exec", runUpgradeTestCase(previousReleaseBinDir, execToExistingContainer)) t.Run("exec", runUpgradeTestCase(previousReleaseBinDir, execToExistingContainer))
t.Run("manipulate", runUpgradeTestCase(previousReleaseBinDir, shouldManipulateContainersInPodAfterUpgrade)) t.Run("manipulate", runUpgradeTestCase(previousReleaseBinDir, shouldManipulateContainersInPodAfterUpgrade))
t.Run("recover-images", runUpgradeTestCase(previousReleaseBinDir, shouldRecoverExistingImages))
// TODO: // TODO:
// Add stats/stop-existing-running-pods/... // Add stats/stop-existing-running-pods/...
} }
@ -107,7 +108,7 @@ func runUpgradeTestCase(
}) })
t.Log("Verifing") t.Log("Verifing")
upgradeCaseFunc(t, currentProc.criRuntimeService(t)) upgradeCaseFunc(t, currentProc.criRuntimeService(t), currentProc.criImageService(t))
} }
} }
@ -148,7 +149,7 @@ func shouldRecoverAllThePodsAfterUpgrade(t *testing.T, criRuntimeService cri.Run
t.Log("Stop second sandbox") t.Log("Stop second sandbox")
require.NoError(t, criRuntimeService.StopPodSandbox(secondSB)) require.NoError(t, criRuntimeService.StopPodSandbox(secondSB))
return func(t *testing.T, criRuntimeService cri.RuntimeService) { return func(t *testing.T, criRuntimeService cri.RuntimeService, _ cri.ImageManagerService) {
t.Log("List Pods") t.Log("List Pods")
pods, err := criRuntimeService.ListPodSandbox(nil) pods, err := criRuntimeService.ListPodSandbox(nil)
@ -212,7 +213,7 @@ func execToExistingContainer(t *testing.T, criRuntimeService cri.RuntimeService,
// NOTE: Wait for containerd to flush data into log // NOTE: Wait for containerd to flush data into log
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
return func(t *testing.T, criRuntimeService cri.RuntimeService) { return func(t *testing.T, criRuntimeService cri.RuntimeService, _ cri.ImageManagerService) {
pods, err := criRuntimeService.ListPodSandbox(nil) pods, err := criRuntimeService.ListPodSandbox(nil)
require.NoError(t, err) require.NoError(t, err)
require.Len(t, pods, 1) require.Len(t, pods, 1)
@ -288,7 +289,7 @@ func shouldManipulateContainersInPodAfterUpgrade(t *testing.T, criRuntimeService
require.NoError(t, criRuntimeService.StartContainer(cn3)) require.NoError(t, criRuntimeService.StartContainer(cn3))
require.NoError(t, criRuntimeService.StopContainer(cn3, 0)) require.NoError(t, criRuntimeService.StopContainer(cn3, 0))
return func(t *testing.T, criRuntimeService cri.RuntimeService) { return func(t *testing.T, criRuntimeService cri.RuntimeService, _ cri.ImageManagerService) {
t.Log("Manipulating containers in the previous pod") t.Log("Manipulating containers in the previous pod")
// For the running container, we get status and stats of it, // For the running container, we get status and stats of it,
// exec and execsync in it, stop and remove it // exec and execsync in it, stop and remove it
@ -346,6 +347,32 @@ func shouldManipulateContainersInPodAfterUpgrade(t *testing.T, criRuntimeService
} }
} }
func shouldRecoverExistingImages(t *testing.T, criRuntimeService cri.RuntimeService, criImageService cri.ImageManagerService) upgradeVerifyCaseFunc {
images := []string{images.Get(images.BusyBox), images.Get(images.Alpine)}
expectedRefs := []string{}
for _, img := range images {
t.Logf("Pulling image %q", img)
imgRef, err := criImageService.PullImage(&criruntime.ImageSpec{Image: img}, nil, nil)
require.NoError(t, err)
expectedRefs = append(expectedRefs, imgRef)
}
return func(t *testing.T, _ cri.RuntimeService, criImageService cri.ImageManagerService) {
t.Log("List all images")
res, err := criImageService.ListImages(nil)
require.NoError(t, err)
require.Len(t, res, 2)
for idx, img := range images {
t.Logf("Check image %s status", img)
gotImg, err := criImageService.ImageStatus(&criruntime.ImageSpec{Image: img})
require.NoError(t, err)
require.Equal(t, expectedRefs[idx], gotImg.Id)
}
}
}
// cleanupPods deletes all the pods based on the cri.RuntimeService connection. // cleanupPods deletes all the pods based on the cri.RuntimeService connection.
func cleanupPods(t *testing.T, criRuntimeService cri.RuntimeService) { func cleanupPods(t *testing.T, criRuntimeService cri.RuntimeService) {
pods, err := criRuntimeService.ListPodSandbox(nil) pods, err := criRuntimeService.ListPodSandbox(nil)