Fix err (#2608)

* refactor: refactor workflows contents. * add tool workflows. * update field. * fix: remove chat error. * Fix err. * fix error. * remove cn comment. * update workflows files. * update infra config. * move workflows. * feat: update bot. * fix: solve uncorrect outdated msg get. * update get docIDs logic. * update * update skip logic. * fix * update. * fix: delay deleteObject func. * remove unused content. * update log type. * feat: implement request batch count limit. * update * update * feat: add rocksTimeout * feat: wrap logs * feat: add logs * feat: listen config * feat: enable listen TIME_WAIT port * feat: add logs * feat: cache batch * chore: enable fullUserCache * feat: push rpc num * feat: push err * feat: with operationID * feat: sleep * feat: change 1s * feat: change log * feat: implement Getbatch in rpcCache. * feat: print getOnline cost * feat: change log * feat: change kafka and push config * feat: del interface * feat: fix err * feat: change config * feat: go mod * feat: change config * feat: change config * feat: add sleep in push * feat: warn logs * feat: logs * feat: logs * feat: change port * feat: start config * feat: remove port reuse * feat: prometheus config * feat: prometheus config * feat: prometheus config * feat: add long time send msg to grafana * feat: init * feat: init * feat: implement offline push. * feat: batch get user online * feat: implement batch Push spilt * update go mod * Revert "feat: change port" This reverts commit 06d5e944 * feat: change port * feat: change config * feat: implement kafka producer and consumer. * update format, * add PushMQ log. * feat: get all online users and init push * feat: lock in online cache * feat: config * fix: init online status * fix: add logs * fix: userIDs * fix: add logs * feat: update Handler logic. * update MQ logic. * update * update * fix: method name * fix: update OfflinePushConsumerHandler. * fix: prommetrics * fix: add logs * fix: ctx * fix: log * fix: config * feat: change port * fix: atomic online cache status --------- Co-authored-by: Monet Lee <monet_lee@163.com>
2026-05-05 01:25:58 +08:00 · 2024-09-12 10:38:17 +08:00
parent b703449615
commit 0276c7df60
43 changed files with 2639 additions and 2105 deletions
@@ -1,6 +1,9 @@
 package cachekey

-import "time"
+import (
+	"strings"
+	"time"
+)

 const (
 	OnlineKey     = "ONLINE:"
@@ -11,3 +14,7 @@ const (
 func GetOnlineKey(userID string) string {
 	return OnlineKey + userID
 }
+
+func GetOnlineKeyUserID(key string) string {
+	return strings.TrimPrefix(key, OnlineKey)
+}
@@ -5,4 +5,5 @@ import "context"
 type OnlineCache interface {
 	GetOnline(ctx context.Context, userID string) ([]int32, error)
 	SetUserOnline(ctx context.Context, userID string, online, offline []int32) error
+	GetAllOnlineUsers(ctx context.Context, cursor uint64) (map[string][]int32, uint64, error)
 }
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/dtm-labs/rockscache"
+	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/redis/go-redis/v9"
 	"golang.org/x/sync/singleflight"
@@ -65,6 +66,7 @@ func batchGetCache2[K comparable, V any](ctx context.Context, rcClient *rockscac
 				}
 				bs, err := json.Marshal(value)
 				if err != nil {
+					log.ZError(ctx, "marshal failed", err)
 					return nil, err
 				}
 				cacheIndex[index] = string(bs)
@@ -72,7 +74,7 @@ func batchGetCache2[K comparable, V any](ctx context.Context, rcClient *rockscac
 			return cacheIndex, nil
 		})
 		if err != nil {
-			return nil, err
+			return nil, errs.WrapMsg(err, "FetchBatch2 failed")
 		}
 		for index, data := range indexCache {
 			if data == "" {
@@ -80,7 +82,7 @@ func batchGetCache2[K comparable, V any](ctx context.Context, rcClient *rockscac
 			}
 			var value V
 			if err := json.Unmarshal([]byte(data), &value); err != nil {
-				return nil, err
+				return nil, errs.WrapMsg(err, "Unmarshal failed")
 			}
 			if cb, ok := any(&value).(BatchCacheCallback[K]); ok {
 				cb.BatchCache(keyId[keys[index]])
@@ -28,6 +28,10 @@ import (
 	"time"
 )

+const (
+	rocksCacheTimeout = 11 * time.Second
+)
+
 // BatchDeleterRedis is a concrete implementation of the BatchDeleter interface based on Redis and RocksCache.
 type BatchDeleterRedis struct {
 	redisClient    redis.UniversalClient
@@ -106,6 +110,8 @@ func (c *BatchDeleterRedis) AddKeys(keys ...string) {
 // GetRocksCacheOptions returns the default configuration options for RocksCache.
 func GetRocksCacheOptions() *rockscache.Options {
 	opts := rockscache.NewDefaultOptions()
+	opts.LockExpire = rocksCacheTimeout
+	opts.WaitReplicasTimeout = rocksCacheTimeout
 	opts.StrongConsistency = true
 	opts.RandomExpireAdjustment = 0.2

@@ -2,8 +2,10 @@ package redis

 import (
 	"context"
+	"fmt"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/cachekey"
+	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/redis/go-redis/v9"
@@ -49,6 +51,36 @@ func (s *userOnline) GetOnline(ctx context.Context, userID string) ([]int32, err
 	return platformIDs, nil
 }

+func (s *userOnline) GetAllOnlineUsers(ctx context.Context, cursor uint64) (map[string][]int32, uint64, error) {
+	result := make(map[string][]int32)
+
+	keys, nextCursor, err := s.rdb.Scan(ctx, cursor, fmt.Sprintf("%s*", cachekey.OnlineKey), constant.ParamMaxLength).Result()
+	if err != nil {
+		return nil, 0, err
+	}
+
+	for _, key := range keys {
+		userID := cachekey.GetOnlineKeyUserID(key)
+		strValues, err := s.rdb.ZRange(ctx, key, 0, -1).Result()
+		if err != nil {
+			return nil, 0, err
+		}
+
+		values := make([]int32, 0, len(strValues))
+		for _, value := range strValues {
+			intValue, err := strconv.Atoi(value)
+			if err != nil {
+				return nil, 0, errs.Wrap(err)
+			}
+			values = append(values, int32(intValue))
+		}
+
+		result[userID] = values
+	}
+
+	return result, nextCursor, nil
+}
+
 func (s *userOnline) SetUserOnline(ctx context.Context, userID string, online, offline []int32) error {
 	script := `
 	local key = KEYS[1]