mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-03 10:14:30 +00:00
1df8f91691
Backport #38273 by @Vinod-OAI After upgrading from 1.25.x to 1.26.x, `repo-archive` workers can fail to unmarshal queued items: ``` Failed to unmarshal item from queue "repo-archive": json: unable to unmarshal into Go convert.Conversion within "/Repo/Units/0/Config": cannot derive concrete type for nil interface with finite type set ``` `ArchiveRequest` started embedding `*repo_model.Repository` in 1.26, which does not round-trip through the JSON queue. This change stores a minimal `archiveQueueItem` (`RepoID`, `Type`, `CommitID`, `Paths`) in `repo-archive` and loads the repository in the worker. `UnmarshalJSON` accepts legacy payloads that used `RepoID` or embedded `Repo.id`. Fixes #38272 <!-- Before submitting: - Target the `main` branch; release branches are for backports only. - Use a Conventional Commits title, e.g. `fix(repo): handle empty branch names`. - Read the contributing guidelines: https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md - Documentation changes go to https://gitea.com/gitea/docs Describe your change below and link any issue it fixes. --> Co-authored-by: Vinod-OAI <venkat.vinod@observe.ai> Co-authored-by: bircni <bircni@icloud.com>
157 lines
5.3 KiB
Go
157 lines
5.3 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package archiver
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
repo_model "gitea.dev/models/repo"
|
|
"gitea.dev/models/unittest"
|
|
"gitea.dev/modules/json"
|
|
"gitea.dev/modules/util"
|
|
"gitea.dev/services/contexttest"
|
|
|
|
_ "gitea.dev/models/actions"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
unittest.MainTest(m)
|
|
}
|
|
|
|
func TestArchiveQueueItemJSON(t *testing.T) {
|
|
orig := &archiveQueueItem{
|
|
RepoID: 7,
|
|
Type: repo_model.ArchiveZip,
|
|
CommitID: "abc123",
|
|
Paths: []string{"agents"},
|
|
ArchiveRefShortName: "main",
|
|
}
|
|
bs, err := json.Marshal(orig)
|
|
require.NoError(t, err)
|
|
|
|
var decoded archiveQueueItem
|
|
require.NoError(t, json.Unmarshal(bs, &decoded))
|
|
assert.Equal(t, *orig, decoded)
|
|
}
|
|
|
|
func TestArchive_Basic(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
ctx, _ := contexttest.MockContext(t, "user27/repo49")
|
|
firstCommit, secondCommit := "51f84af23134", "aacbdfe9e1c4"
|
|
|
|
contexttest.LoadRepo(t, ctx, 49)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
defer ctx.Repo.GitRepo.Close()
|
|
|
|
bogusReq, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".zip", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, bogusReq)
|
|
assert.Equal(t, firstCommit+".zip", bogusReq.GetArchiveName())
|
|
|
|
// Check a series of bogus requests.
|
|
// Step 1, valid commit with a bad extension.
|
|
bogusReq, err = NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".unknown", nil)
|
|
assert.Error(t, err)
|
|
assert.Nil(t, bogusReq)
|
|
|
|
// Step 2, missing commit.
|
|
bogusReq, err = NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, "dbffff.zip", nil)
|
|
assert.Error(t, err)
|
|
assert.Nil(t, bogusReq)
|
|
|
|
// Step 3, doesn't look like branch/tag/commit.
|
|
bogusReq, err = NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, "db.zip", nil)
|
|
assert.Error(t, err)
|
|
assert.Nil(t, bogusReq)
|
|
|
|
bogusReq, err = NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, "master.zip", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, bogusReq)
|
|
assert.Equal(t, "master.zip", bogusReq.GetArchiveName())
|
|
|
|
bogusReq, err = NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, "test/archive.zip", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, bogusReq)
|
|
assert.Equal(t, "test-archive.zip", bogusReq.GetArchiveName())
|
|
|
|
// Now two valid requests, firstCommit with valid extensions.
|
|
zipReq, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".zip", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, zipReq)
|
|
|
|
tgzReq, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".tar.gz", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, tgzReq)
|
|
|
|
secondReq, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, secondCommit+".bundle", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, secondReq)
|
|
|
|
inFlight := make([]*ArchiveRequest, 3)
|
|
inFlight[0] = zipReq
|
|
inFlight[1] = tgzReq
|
|
inFlight[2] = secondReq
|
|
|
|
doArchive(t.Context(), zipReq)
|
|
doArchive(t.Context(), tgzReq)
|
|
doArchive(t.Context(), secondReq)
|
|
|
|
// Make sure sending an unprocessed request through doesn't affect the queue
|
|
// count.
|
|
doArchive(t.Context(), zipReq)
|
|
|
|
// Sleep two seconds to make sure the queue doesn't change.
|
|
time.Sleep(2 * time.Second)
|
|
|
|
zipReq2, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".zip", nil)
|
|
assert.NoError(t, err)
|
|
// This zipReq should match what's sitting in the queue, as we haven't
|
|
// let it release yet. From the consumer's point of view, this looks like
|
|
// a long-running archive task.
|
|
assert.Equal(t, zipReq, zipReq2)
|
|
|
|
// We still have the other three stalled at completion, waiting to remove
|
|
// from archiveInProgress. Try to submit this new one before its
|
|
// predecessor has cleared out of the queue.
|
|
doArchive(t.Context(), zipReq2)
|
|
|
|
// Now we'll submit a request and TimedWaitForCompletion twice, before and
|
|
// after we release it. We should trigger both the timeout and non-timeout
|
|
// cases.
|
|
timedReq, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, secondCommit+".tar.gz", nil)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, timedReq)
|
|
doArchive(t.Context(), timedReq)
|
|
|
|
zipReq2, err = NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".zip", nil)
|
|
assert.NoError(t, err)
|
|
// Now, we're guaranteed to have released the original zipReq from the queue.
|
|
// Ensure that we don't get handed back the released entry somehow, but they
|
|
// should remain functionally equivalent in all fields. The exception here
|
|
// is zipReq.cchan, which will be non-nil because it's a completed request.
|
|
// It's fine to go ahead and set it to nil now.
|
|
|
|
assert.Equal(t, zipReq, zipReq2)
|
|
assert.NotSame(t, zipReq, zipReq2)
|
|
|
|
// Same commit, different compression formats should have different names.
|
|
// Ideally, the extension would match what we originally requested.
|
|
assert.NotEqual(t, zipReq.GetArchiveName(), tgzReq.GetArchiveName())
|
|
assert.NotEqual(t, zipReq.GetArchiveName(), secondReq.GetArchiveName())
|
|
|
|
t.Run("BadPath", func(t *testing.T) {
|
|
badRequest, err := NewRequest(ctx.Repo.Repository, ctx.Repo.GitRepo, firstCommit+".tar.gz", []string{"not-a-path"})
|
|
require.NoError(t, err)
|
|
err = ServeRepoArchive(ctx.Base, badRequest)
|
|
require.Error(t, err)
|
|
assert.ErrorIs(t, err, util.ErrInvalidArgument)
|
|
assert.ErrorContains(t, err, "path doesn't exist or is invalid")
|
|
})
|
|
}
|