From 5791f0c979bc16545d02ebc5e55e0f01a54bbdad Mon Sep 17 00:00:00 2001 From: Chlins Zhang Date: Fri, 7 Apr 2023 10:59:30 +0800 Subject: [PATCH] fix: fix error bitsize of jobservice reaper scan locks (#18487) Change the bitSize from 16 to 64 in the jobservice reaper, the 16 is too small when the redis cursor over the max value of int16. Fixes: #18486 Signed-off-by: chlins --- src/jobservice/worker/cworker/reaper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jobservice/worker/cworker/reaper.go b/src/jobservice/worker/cworker/reaper.go index 688df83cb..8bf2b165d 100644 --- a/src/jobservice/worker/cworker/reaper.go +++ b/src/jobservice/worker/cworker/reaper.go @@ -245,7 +245,7 @@ func (r *reaper) scanLocks(key string, handler func(k string, v int64) error) er } // Get next cursor - cursor, err = strconv.ParseInt(string(reply[0].([]uint8)), 10, 16) + cursor, err = strconv.ParseInt(string(reply[0].([]uint8)), 10, 64) if err != nil { return errors.Wrap(err, "scan locks") } @@ -253,7 +253,7 @@ func (r *reaper) scanLocks(key string, handler func(k string, v int64) error) er if values, ok := reply[1].([]interface{}); ok { for i := 0; i < len(values); i += 2 { k := string(values[i].([]uint8)) - lc, err := strconv.ParseInt(string(values[i+1].([]uint8)), 10, 16) + lc, err := strconv.ParseInt(string(values[i+1].([]uint8)), 10, 64) if err != nil { // Ignore and continue logger.Errorf("Malformed lock object for %s: %v", k, err)