From f5ae24f9552ed28f4d8ae71db5ef2530dee4c7a9 Mon Sep 17 00:00:00 2001 From: congqixia Date: Thu, 19 Dec 2024 14:01:46 +0800 Subject: [PATCH] fix: [10kcp] SyncSegments rpc always failed (#38032) (#38579) Cherry-pick from 2.4 pr: #38032 issue: #38031 cause call `cli.SyncSegments` use ctx which already be override and canceled, so SyncSegments rpc will always failed. Signed-off-by: Wei Liu Signed-off-by: Congqi Xia Co-authored-by: wei liu --- internal/datacoord/session_manager.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/datacoord/session_manager.go b/internal/datacoord/session_manager.go index fe2b542146..c962bf9797 100644 --- a/internal/datacoord/session_manager.go +++ b/internal/datacoord/session_manager.go @@ -230,8 +230,8 @@ func (c *SessionManagerImpl) SyncSegments(ctx context.Context, nodeID int64, req zap.Int64("planID", req.GetPlanID()), ) - ctx, cancel := context.WithTimeout(context.Background(), Params.DataCoordCfg.CompactionRPCTimeout.GetAsDuration(time.Second)) - cli, err := c.getClient(ctx, nodeID) + childCtx, cancel := context.WithTimeout(context.Background(), Params.DataCoordCfg.CompactionRPCTimeout.GetAsDuration(time.Second)) + cli, err := c.getClient(childCtx, nodeID) cancel() if err != nil { log.Warn("failed to get client", zap.Error(err))