Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlo Strokov <pstrokov@gitlab.com>2020-05-28 10:38:53 +0300
committerPavlo Strokov <pstrokov@gitlab.com>2020-05-28 10:59:29 +0300
commita9b2b302e49b351a4f3a552351177d56942c8c25 (patch)
treeb7a4239f7108fb74ce4e33677b9acd90a5b1dd84 /internal/praefect/replicator.go
parent97dcd53c020d3d6d123530ac1a41140b950dd607 (diff)
Praefect: removal of unnecessary Datastore wrapper
Datastore is not needed anymore because of introduction of nodes.NewManager. Now it is responsible for managing nodes. Also Queue interface removed as unnecessary and replaced with ReplicationEventQueue. Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/2613
Diffstat (limited to 'internal/praefect/replicator.go')
-rw-r--r--internal/praefect/replicator.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go
index 721edab29..0668a59f8 100644
--- a/internal/praefect/replicator.go
+++ b/internal/praefect/replicator.go
@@ -412,7 +412,7 @@ func (r ReplMgr) processBacklog(ctx context.Context, b BackoffFunc, virtualStora
eventIDsByState := map[datastore.JobState][]uint64{}
for _, event := range events {
- if err := r.processReplJob(ctx, event, shard, target.GetConnection()); err != nil {
+ if err := r.processReplicationEvent(ctx, event, shard, target.GetConnection()); err != nil {
logger.WithFields(logrus.Fields{
logWithReplJobID: event.ID,
logWithReplVirtual: event.Job.VirtualStorage,
@@ -462,7 +462,7 @@ func (r ReplMgr) processBacklog(ctx context.Context, b BackoffFunc, virtualStora
}
}
-func (r ReplMgr) processReplJob(ctx context.Context, event datastore.ReplicationEvent, shard nodes.Shard, targetCC *grpc.ClientConn) error {
+func (r ReplMgr) processReplicationEvent(ctx context.Context, event datastore.ReplicationEvent, shard nodes.Shard, targetCC *grpc.ClientConn) error {
source, err := shard.GetNode(event.Job.SourceNodeStorage)
if err != nil {
return fmt.Errorf("get source node: %w", err)