feat: Add Mode() Method to rueidis.Client for Detecting Client Mode
#794
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Cheyu Wu <[email protected]>
Signed-off-by: Cheyu Wu <[email protected]>
FZambia
reviewed
Mar 6, 2025
rueidis.go
Outdated
| // https://github.com/valkey-io/valkey/blob/1a34a4ff7f101bb6b17a0b5e9aa3bf7d6bd29f68/src/networking.c#L4118-L4124 | ||
| ModeCluster ClientMode = "cluster" | ||
| ModeSentinel ClientMode = "sentinel" | ||
| ModeStandalone ClientMode = "standalone" |
There was a problem hiding this comment.
Should be with Client prefix:
ClientModeCluster ClientMode = "cluster"
ClientModeSentinel ClientMode = "sentinel"
ClientModeStandalone ClientMode = "standalone"
There was a problem hiding this comment.
Oops, I will fix this
|
also cc @rueian |
rueian
reviewed
Mar 6, 2025
client.go
Outdated
| @@ -189,6 +190,10 @@ func (c *singleClient) Nodes() map[string]Client { | |||
| return map[string]Client{c.conn.Addr(): c} | |||
| } | |||
|
|
|||
| func (c *singleClient) Mode() ClientMode { | |||
| return c.mode | |||
There was a problem hiding this comment.
Suggested change
| return c.mode | |
| return ClientModeStandalone |
client.go
Outdated
| @@ -16,6 +16,7 @@ type singleClient struct { | |||
| cmd Builder | |||
| retry bool | |||
| DisableCache bool | |||
| mode ClientMode | |||
There was a problem hiding this comment.
Suggested change
| mode ClientMode |
cluster.go
Outdated
| @@ -57,6 +58,7 @@ func newClusterClient(opt *ClientOption, connFn connFn, retryer retryHandler) (* | |||
| retry: !opt.DisableRetry, | |||
| retryHandler: retryer, | |||
| stopCh: make(chan struct{}), | |||
| mode: ClientModeCluster, | |||
There was a problem hiding this comment.
Suggested change
| mode: ClientModeCluster, |
cluster.go
Outdated
| @@ -1203,6 +1205,10 @@ func (c *clusterClient) Nodes() map[string]Client { | |||
| return _nodes | |||
| } | |||
|
|
|||
| func (c *clusterClient) Mode() ClientMode { | |||
| return c.mode | |||
There was a problem hiding this comment.
Suggested change
| return c.mode | |
| return ClientModeCluster |
sentinel.go
Outdated
| @@ -26,6 +26,7 @@ func newSentinelClient(opt *ClientOption, connFn connFn, retryer retryHandler) ( | |||
| retry: !opt.DisableRetry, | |||
| retryHandler: retryer, | |||
| replica: opt.ReplicaOnly, | |||
| mode: ClientModeSentinel, | |||
There was a problem hiding this comment.
Suggested change
| mode: ClientModeSentinel, |
sentinel.go
Outdated
| @@ -56,6 +57,7 @@ type sentinelClient struct { | |||
| cmd Builder | |||
| retry bool | |||
| replica bool | |||
| mode ClientMode | |||
There was a problem hiding this comment.
Suggested change
| mode ClientMode |
sentinel.go
Outdated
| @@ -218,6 +220,10 @@ func (c *sentinelClient) Nodes() map[string]Client { | |||
| return map[string]Client{conn.Addr(): newSingleClientWithConn(conn, c.cmd, c.retry, disableCache, c.retryHandler)} | |||
| } | |||
|
|
|||
| func (c *sentinelClient) Mode() ClientMode { | |||
| return c.mode | |||
There was a problem hiding this comment.
Suggested change
| return c.mode | |
| return ClientModeSentinel |
Signed-off-by: Cheyu Wu <[email protected]>
CheyuWu
force-pushed
the
feat/client/mode
branch
from
1ad61f9 to
6d9ed43
Compare
|
Hi @rueian, I have solved those issues, PTAL |
Signed-off-by: Cheyu Wu <[email protected]>
|
Merged. Thanks @CheyuWu! |
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why do we need this?
Previously, Centrifugo required explicit Redis Cluster configuration because the Centrifuge library generates keys differently in cluster mode (using hash tags). However, this approach is inconvenient because cloud providers typically provide a Redis URL (e.g.,
redis://...) without explicitly indicating whether it is a standalone Redis or a Redis Cluster. This prevents users from simply reusing the endpoint when starting Centrifugo.New Interface Definition
Closes #790