From 7cf17338ec9a029a55054dbf969942b18ca8321a Mon Sep 17 00:00:00 2001 From: whalecold Date: Tue, 12 Mar 2024 10:15:31 +0800 Subject: [PATCH] tweak the order of judgement --- core/manager/client.go | 4 ++-- core/manager/manager.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/manager/client.go b/core/manager/client.go index 2515c28..6f68e13 100644 --- a/core/manager/client.go +++ b/core/manager/client.go @@ -306,7 +306,7 @@ func (c *xdsClient) ndsWarmup() { } func (c *xdsClient) listenerWarmup() { - // watch the NameTable when init the xds client + // watch the Listener when init the xds client, it is used for inbound side. c.Watch(xdsresource.ListenerType, reservedLdsResourceName, false) <-c.inboundInitRequestCh klog.Infof("KITEX: [XDS] lds, warmup done") @@ -476,7 +476,7 @@ func (c *xdsClient) handleLDS(resp *discoveryv3.DiscoveryResponse) error { c.resourceUpdater.UpdateResource(xdsresource.ListenerType, filteredRes, resp.GetVersionInfo()) if c.closedInboundInitCh.CompareAndSwap(false, true) { - klog.Info("[xds] receive inbound init request") + klog.Info("KITEX: [xds] receive inbound init request") close(c.inboundInitRequestCh) } return nil diff --git a/core/manager/manager.go b/core/manager/manager.go index 44ae682..1387c47 100644 --- a/core/manager/manager.go +++ b/core/manager/manager.go @@ -211,7 +211,7 @@ func (m *xdsResourceManager) cleaner() { continue } // should not delete the reserved resource - if time.Since(t) > defaultCacheExpireTime && !isReservedResource(rt, rName) { + if !isReservedResource(rt, rName) && time.Since(t) > defaultCacheExpireTime { delete(m.meta[rt], rName) if m.cache[rt] != nil { delete(m.cache[rt], rName)