Inspect changes in Gitaly 2775ca5b4162034d0596a8a7f1cd419e6e6c55db
Upstream merge commit a5f816f85cde changes Gitaly server version from 5e3c8b379dcb1b415daef4e463b76df2c04ac10d to 2775ca5b4162034d0596a8a7f1cd419e6e6c55db, with changes in protocol or one of the source subtrees currently under watch.
To further inspect, go to an up to date Gitaly source clone and run:
git diff 5e3c8b379dcb1b415daef4e463b76df2c04ac10d..2775ca5b4162034d0596a8a7f1cd419e6e6c55db -- proto/*.proto internal/backup
Here is a preview, truncated at 500 lines:
diff --git a/internal/backup/backup.go b/internal/backup/backup.go
index dc2a4ff15..d730c2c93 100644
--- a/internal/backup/backup.go
+++ b/internal/backup/backup.go
@@ -15,6 +15,7 @@ import (
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/log"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -163,6 +164,7 @@ func NewManager(sink Sink, locator Locator, pool *client.Pool) *Manager {
// NewManagerLocal creates and returns a *Manager instance for operating on local repositories.
func NewManagerLocal(
sink Sink,
+ logger log.Logger,
locator Locator,
storageLocator storage.Locator,
gitCmdFactory git.CommandFactory,
@@ -177,7 +179,7 @@ func NewManagerLocal(
repositoryFactory: func(ctx context.Context, repo *gitalypb.Repository, server storage.ServerInfo) (Repository, error) {
localRepo := localrepo.New(storageLocator, gitCmdFactory, catfileCache, repo)
- return newLocalRepository(storageLocator, gitCmdFactory, txManager, repoCounter, localRepo), nil
+ return newLocalRepository(logger, storageLocator, gitCmdFactory, txManager, repoCounter, localRepo), nil
},
}
}
diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go
index d6c614e91..13d1cb918 100644
--- a/internal/backup/backup_test.go
+++ b/internal/backup/backup_test.go
@@ -105,7 +105,7 @@ func TestManager_Create(t *testing.T) {
tb.Cleanup(catfileCache.Stop)
txManager := transaction.NewTrackingManager()
- return backup.NewManagerLocal(sink, locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
+ return backup.NewManagerLocal(sink, testhelper.SharedLogger(t), locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
},
},
} {
@@ -280,7 +280,7 @@ func TestManager_Create_incremental(t *testing.T) {
tb.Cleanup(catfileCache.Stop)
txManager := transaction.NewTrackingManager()
- return backup.NewManagerLocal(sink, locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
+ return backup.NewManagerLocal(sink, testhelper.SharedLogger(t), locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
},
},
} {
@@ -426,7 +426,7 @@ func TestManager_Restore_latest(t *testing.T) {
tb.Cleanup(catfileCache.Stop)
txManager := transaction.NewTrackingManager()
- return backup.NewManagerLocal(sink, locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
+ return backup.NewManagerLocal(sink, testhelper.SharedLogger(t), locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
},
},
} {
@@ -769,7 +769,7 @@ func TestManager_Restore_specific(t *testing.T) {
tb.Cleanup(catfileCache.Stop)
txManager := transaction.NewTrackingManager()
- return backup.NewManagerLocal(sink, locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
+ return backup.NewManagerLocal(sink, testhelper.SharedLogger(t), locator, storageLocator, gitCmdFactory, catfileCache, txManager, repoCounter)
},
},
} {
@@ -1039,7 +1039,7 @@ func mustCreateCustomHooksArchive(t *testing.T, ctx context.Context) string {
require.NoError(t, err)
defer testhelper.MustClose(t, file)
- require.NoError(t, archive.WriteTarball(ctx, file, tmpDir, "custom_hooks"))
+ require.NoError(t, archive.WriteTarball(ctx, testhelper.SharedLogger(t), file, tmpDir, "custom_hooks"))
return archivePath
}
diff --git a/internal/backup/repository.go b/internal/backup/repository.go
index 9e67e124d..2ef51046a 100644
--- a/internal/backup/repository.go
+++ b/internal/backup/repository.go
@@ -15,6 +15,7 @@ import (
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
"gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/log"
"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
"gitlab.com/gitlab-org/gitaly/v16/streamio"
@@ -286,6 +287,7 @@ func (rr *remoteRepository) newRefClient() gitalypb.RefServiceClient {
}
type localRepository struct {
+ logger log.Logger
locator storage.Locator
gitCmdFactory git.CommandFactory
txManager transaction.Manager
@@ -294,6 +296,7 @@ type localRepository struct {
}
func newLocalRepository(
+ logger log.Logger,
locator storage.Locator,
gitCmdFactory git.CommandFactory,
txManager transaction.Manager,
@@ -301,6 +304,7 @@ func newLocalRepository(
repo *localrepo.Repo,
) *localRepository {
return &localRepository{
+ logger: logger,
locator: locator,
gitCmdFactory: gitCmdFactory,
txManager: txManager,
@@ -337,7 +341,7 @@ func (r *localRepository) GetCustomHooks(ctx context.Context, out io.Writer) err
return fmt.Errorf("get repo path: %w", err)
}
- if err := repoutil.GetCustomHooks(ctx, repoPath, out); err != nil {
+ if err := repoutil.GetCustomHooks(ctx, r.logger, repoPath, out); err != nil {
return fmt.Errorf("local repository: get custom hooks: %w", err)
}
return nil
@@ -402,6 +406,7 @@ func (r *localRepository) FetchBundle(ctx context.Context, reader io.Reader) err
func (r *localRepository) SetCustomHooks(ctx context.Context, reader io.Reader) error {
if err := repoutil.SetCustomHooks(
ctx,
+ r.logger,
r.locator,
r.txManager,
reader,
A merge request may have already been submitted, check that on the merge commit, as usually changes in Gitaly are not breaking, compliance becoming mandatory in the following development cycles.