From 3a7cb1a83b4ecd89421b5656b8caeb30c2b13c7c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 15:21:20 -0400 Subject: [PATCH] Use Get/Set instead of Rename when Regenerate session id (#23975) (#23983) Backport #23975 by @wxiaoguang Do not use Rename here, because the old sid and new sid may be in different redis cluster slot. Fix #23869 Co-authored-by: wxiaoguang --- modules/session/redis.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/session/redis.go b/modules/session/redis.go index 5fb59e480457..b7cdbef6f8bf 100644 --- a/modules/session/redis.go +++ b/modules/session/redis.go @@ -183,16 +183,21 @@ func (p *RedisProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err } } - if err = p.c.Rename(graceful.GetManager().HammerContext(), poldsid, psid).Err(); err != nil { - return nil, err - } - - var kv map[interface{}]interface{} - kvs, err := p.c.Get(graceful.GetManager().HammerContext(), psid).Result() + // do not use Rename here, because the old sid and new sid may be in different redis cluster slot. + kvs, err := p.c.Get(graceful.GetManager().HammerContext(), poldsid).Result() if err != nil { return nil, err } + if err = p.c.Del(graceful.GetManager().HammerContext(), poldsid).Err(); err != nil { + return nil, err + } + + if err = p.c.Set(graceful.GetManager().HammerContext(), psid, kvs, p.duration).Err(); err != nil { + return nil, err + } + + var kv map[interface{}]interface{} if len(kvs) == 0 { kv = make(map[interface{}]interface{}) } else {