relayset: return ctx.Err() at line 918
Lee Yunjin committed
Apr 9, 2026 at 10:30 UTC
b909174a50b8bb749bc5da819eaa81a46d55bdfd
2 files changed
+1
-15
portal/discovery/relayset.go
+1
-1
@@ -916,7 +916,7 @@ func (s *RelaySet) refreshBootstrapDiscovery(ctx context.Context, rootCAPEM []by
916
resp, err := DiscoverRelayDiscovery(ctx, bootstrap.APIHTTPSAddr, rootCAPEM, nil)
917
if err != nil {
918
if ctx.Err() != nil {
919
- return nil
919
+ return ctx.Err()
920
}
921
s.RecordBootstrapDiscoveryFailure(bootstrap.APIHTTPSAddr, err, time.Now().UTC())
922
continue
portal/lease.go
-14
@@ -291,20 +291,6 @@ func (r *leaseRegistry) countTCPPortLeases() int {
291
return count
292
}
293
294
-func (r *leaseRegistry) activeAdminSnapshots() []types.AdminLease {
295
- r.mu.RLock()
296
- defer r.mu.RUnlock()
297
-
298
- now := time.Now()
299
- out := make([]types.AdminLease, 0, len(r.leasesByKey))
300
- for _, record := range r.leasesByKey {
301
- if !now.After(record.ExpiresAt) {
302
- out = append(out, r.AdminSnapshot(record))
303
- }
304
- }
305
- return out
306
-}
307
-
294
func (r *leaseRegistry) Snapshot(record *leaseRecord) types.Lease {
295
snapshot := types.Lease{
296
Name: record.Name,