From 06c5564dd274c4d0f33103b1f67d9561d395604d Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Thu, 24 Apr 2025 21:24:51 +0200 Subject: [PATCH] disable initial sync --- management/server/account.go | 12 +++++++++--- management/server/grpcserver.go | 12 ++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/management/server/account.go b/management/server/account.go index e5e8a4b11..b9bdf6ae3 100644 --- a/management/server/account.go +++ b/management/server/account.go @@ -1444,9 +1444,15 @@ func (am *DefaultAccountManager) SyncAndMarkPeer(ctx context.Context, accountID peerUnlock := am.Store.AcquireWriteLockByUID(ctx, peerPubKey) defer peerUnlock() - peer, netMap, postureChecks, err := am.SyncPeer(ctx, types.PeerSync{WireGuardPubKey: peerPubKey, Meta: meta}, accountID) + // peer, netMap, postureChecks, err := am.SyncPeer(ctx, types.PeerSync{WireGuardPubKey: peerPubKey, Meta: meta}, accountID) + // if err != nil { + // return nil, nil, nil, fmt.Errorf("error syncing peer: %w", err) + // } + + peer, err := am.Store.GetPeerByPeerPubKey(ctx, store.LockingStrengthUpdate, peerPubKey) if err != nil { - return nil, nil, nil, fmt.Errorf("error syncing peer: %w", err) + log.WithContext(ctx).Errorf("error getting peer by pubkey %s: %v", peerPubKey, err) + return nil, nil, nil, err } err = am.MarkPeerConnected(ctx, peerPubKey, true, realIP, accountID) @@ -1454,7 +1460,7 @@ func (am *DefaultAccountManager) SyncAndMarkPeer(ctx context.Context, accountID log.WithContext(ctx).Warnf("failed marking peer as connected %s %v", peerPubKey, err) } - return peer, netMap, postureChecks, nil + return peer, &types.NetworkMap{}, []*posture.Checks{}, nil } func (am *DefaultAccountManager) OnPeerDisconnected(ctx context.Context, accountID string, peerPubKey string) error { diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go index 62db3ce43..d46ec3d38 100644 --- a/management/server/grpcserver.go +++ b/management/server/grpcserver.go @@ -172,17 +172,17 @@ func (s *GRPCServer) Sync(req *proto.EncryptedMessage, srv proto.ManagementServi log.WithContext(ctx).Tracef("peer system meta has to be provided on sync. Peer %s, remote addr %s", peerKey.String(), realIP) } - peer, netMap, postureChecks, err := s.accountManager.SyncAndMarkPeer(ctx, accountID, peerKey.String(), extractPeerMeta(ctx, syncReq.GetMeta()), realIP) + peer, _, _, err := s.accountManager.SyncAndMarkPeer(ctx, accountID, peerKey.String(), extractPeerMeta(ctx, syncReq.GetMeta()), realIP) if err != nil { log.WithContext(ctx).Debugf("error while syncing peer %s: %v", peerKey.String(), err) return mapError(ctx, err) } - err = s.sendInitialSync(ctx, peerKey, peer, netMap, postureChecks, srv) - if err != nil { - log.WithContext(ctx).Debugf("error while sending initial sync for %s: %v", peerKey.String(), err) - return err - } + // err = s.sendInitialSync(ctx, peerKey, peer, netMap, postureChecks, srv) + // if err != nil { + // log.WithContext(ctx).Debugf("error while sending initial sync for %s: %v", peerKey.String(), err) + // return err + // } updates := s.peersUpdateManager.CreateChannel(ctx, peer.ID)