Add availability-zone field support to CLUSTER SHARDS / CLUSTER SLOTS by bandalgomsu · Pull Request #3156 · valkey-io/valkey

bandalgomsu · 2026-02-03T07:49:13Z

Implemented a way to propagate az through gossip and obtain az information
through the CLUSTER SHARDS and CLUSTER SLOTS commands. It will only be
displayed if the node is configured with it.

Examples:

CLUSTER SLOTS 
{0 8191 {127.0.0.1 21112 xxx {availability-zone zone-a}}} {8192 16383 {127.0.0.1 21111 xxx {availability-zone zone-b}}}

CLUSTER SHARDS 
{slots {8192 16383} nodes {{id xxx port 21111 ip 127.0.0.1 endpoint 127.0.0.1 role master replication-offset 0 health online availability-zone zone-b}} id xxx} {slots {0 8191} nodes {{id xxx port 21112 ip 127.0.0.1 endpoint 127.0.0.1 role master replication-offset 0 health online availability-zone zone-a}} id xxx}

Closes #3110

codecov · 2026-02-03T08:19:32Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 0.00%. Comparing base (79c8948) to head (a730f2d).
⚠️ Report is 96 commits behind head on unstable.

Additional details and impacted files

@@             Coverage Diff              @@
##           unstable   #3156       +/-   ##
============================================
- Coverage     74.91%       0   -74.92%     
============================================
  Files           129       0      -129     
  Lines         71209       0    -71209     
============================================
- Hits          53344       0    -53344     
+ Misses        17865       0    -17865

see 129 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: Su Ko <rhtn1128@gmail.com>

zuiderkwast

Thanks! I haven't looked closely at the tests and implementation of the gossip, but only the API changes so far.

I think we can't include it in NODES and I think we should to it slightly differently for SLOTS, to minimize the risk of breaking clusters or other tools. See comments below.

Signed-off-by: Su Ko <rhtn1128@gmail.com>

zuiderkwast · 2026-02-11T09:33:41Z

@valkey-io/core-team Vote (👍/👎) for adding AZ in CLUSTER SLOTS and SHARDS. With this, client's can find zone-local replicas directly in the topology map.

enjoy-binbin

LGTM. It's strange that we didn't add it at the first time, it is same ask from Snap, one said it is enough and one is ask for this.

It is good to know someone is building smart proxy (or clients) around it.

Signed-off-by: Su Ko <rhtn1128@gmail.com>

zuiderkwast · 2026-02-13T11:34:44Z

The test should check that the az of each node gets persisted in nodes.conf and is restored from the file after a restart.

We have some tests that for the other aux fields. Check for restart_server in tests/unit/cluster/announce-client-ip.tcl and hostnames.tcl.

Signed-off-by: Su Ko <rhtn1128@gmail.com>

enjoy-binbin

LGTM.

madolson · 2026-02-16T22:31:48Z

I guess I'm OK with this, but I do want to vent that we put this information in INFO and HELLO when this was probably the right place all along. We previously discussed that this would increase the output of CLUSTER SLOTS unnecessarily since clients would need to start using it.

zuiderkwast · 2026-03-10T18:59:50Z

Thank you @bandalgomsu!

Would you like to create a documentation PR for these new fields?

…t commands `availability_zone` was added to the HELLO command in valkey-io#1487, and it was missing the reply schema and the test was wrongly marked with `logreqres:skip`. `availability-zone` was added to CLUSTER SHARDS and CLUSTER SLOTS commands in valkey-io#3156, and it was missing the reply schema. Signed-off-by: Binbin <binloveplay1314@qq.com>

bandalgomsu · 2026-03-11T10:59:33Z

sure ! i'll open PR 😄

Add documentation for availability-zone field in CLUSTER SHARDS and CLUSTER SLOTS. Introduced in valkey-io/valkey#3156. --------- Signed-off-by: Su Ko <rhtn1128@gmail.com> Signed-off-by: Viktor Söderqvist <viktor.soderqvist@est.tech> Co-authored-by: Viktor Söderqvist <viktor.soderqvist@est.tech>

…3352) `availability_zone` was added to the HELLO command in #1487, and it was missing the reply schema and the test was wrongly marked with `logreqres:skip`. `availability-zone` was added to CLUSTER SHARDS and CLUSTER SLOTS commands in #3156, and it was missing the reply schema. --------- Signed-off-by: Binbin <binloveplay1314@qq.com>

- Fix release date to Mon Mar 18 2026 - Fix typos: duplicate 'load', 'keyes' -> 'keys', duplicate 'INFO' - Remove reverted contributor (arshidkv12, valkey-io#3137) - Add 7 new release-notes entries from upstream/unstable merge: CLUSTERSCAN (valkey-io#2934), MSETEX (valkey-io#3121), availability-zone (valkey-io#3156), stream range optimization (valkey-io#3002), RDB as AOF preamble (valkey-io#1901), unsigned 64-bit module config (valkey-io#1546), fast_float -> ffc (valkey-io#3329) Signed-off-by: Madelyn Olson <madelyneolson@gmail.com>

…#3156) Implemented a way to propagate az through gossip and obtain az information through the CLUSTER SHARDS and CLUSTER SLOTS commands. It will only be displayed if the node is configured with it. Closes #3110 --------- Signed-off-by: Su Ko <rhtn1128@gmail.com>

…3352) `availability_zone` was added to the HELLO command in #1487, and it was missing the reply schema and the test was wrongly marked with `logreqres:skip`. `availability-zone` was added to CLUSTER SHARDS and CLUSTER SLOTS commands in #3156, and it was missing the reply schema. --------- Signed-off-by: Binbin <binloveplay1314@qq.com>

github-actions Bot assigned bandalgomsu Feb 3, 2026

Add availability zone field support to cluster

2e1cb48

Signed-off-by: Su Ko <rhtn1128@gmail.com>

bandalgomsu force-pushed the gh-3110 branch from e83c40a to 2e1cb48 Compare February 3, 2026 10:35

sarthakaggarwal97 requested review from enjoy-binbin and sarthakaggarwal97 February 3, 2026 21:42

zuiderkwast reviewed Feb 10, 2026

View reviewed changes

Comment thread src/cluster_legacy.c

Comment thread src/cluster_legacy.c

Comment thread src/cluster_legacy.c Outdated

Comment thread src/cluster.c

rollback az field add to cluster node and update test

023c123

Signed-off-by: Su Ko <rhtn1128@gmail.com>

bandalgomsu force-pushed the gh-3110 branch from f2dfedd to 023c123 Compare February 11, 2026 00:45

zuiderkwast added the major-decision-pending Major decision pending by TSC team label Feb 11, 2026

ranshid added the client-changes-needed Client changes may be required for this feature label Feb 11, 2026

enjoy-binbin reviewed Feb 11, 2026

View reviewed changes

Comment thread tests/unit/cluster/availability-zone.tcl Outdated

enjoy-binbin reviewed Feb 11, 2026

View reviewed changes

enjoy-binbin changed the title ~~Add availability zone field support to cluster~~ Add availability-zone field support to CLUSTER SHARDS / CLUSTER SLOTS Feb 11, 2026

enjoy-binbin added this to Valkey 9.1 Feb 11, 2026

enjoy-binbin added the release-notes This issue should get a line item in the release notes label Feb 11, 2026

remove puts in az test

b436f24

Signed-off-by: Su Ko <rhtn1128@gmail.com>

zuiderkwast reviewed Feb 12, 2026

View reviewed changes

Comment thread tests/unit/cluster/availability-zone.tcl Outdated

Comment thread tests/unit/cluster/availability-zone.tcl Outdated

remove order verification test in az test

24b9a1b

Signed-off-by: Su Ko <rhtn1128@gmail.com>

enjoy-binbin reviewed Feb 13, 2026

View reviewed changes

Comment thread tests/unit/cluster/availability-zone.tcl

Comment thread tests/unit/cluster/availability-zone.tcl Outdated

Comment thread tests/unit/cluster/availability-zone.tcl Outdated

bandalgomsu added 2 commits February 13, 2026 22:30

refactor az test

cb1fe51

Signed-off-by: Su Ko <rhtn1128@gmail.com>

refactor persist availability zone in nodes.conf

a730f2d

Signed-off-by: Su Ko <rhtn1128@gmail.com>

enjoy-binbin approved these changes Feb 14, 2026

View reviewed changes

zuiderkwast added major-decision-pending-auto-approve and removed major-decision-pending Major decision pending by TSC team labels Feb 16, 2026

madolson added major-decision-pending Major decision pending by TSC team and removed major-decision-pending-auto-approve labels Feb 16, 2026

madolson added major-decision-pending-auto-approve and removed major-decision-pending Major decision pending by TSC team labels Feb 16, 2026

zuiderkwast added major-decision-approved Major decision approved by TSC team and removed major-decision-pending-auto-approve labels Mar 10, 2026

zuiderkwast approved these changes Mar 10, 2026

View reviewed changes

zuiderkwast merged commit 3741503 into valkey-io:unstable Mar 10, 2026
159 checks passed

github-project-automation Bot moved this to Done in Valkey 9.1 Mar 10, 2026

zuiderkwast added the needs-doc-pr This change needs to update a documentation page. Remove label once doc PR is open. label Mar 10, 2026

enjoy-binbin mentioned this pull request Mar 11, 2026

Add availability-zone to the reply schema for CLUSTER SHARDS/SLOTS #3352

Merged

sarthakaggarwal97 mentioned this pull request Mar 11, 2026

Fix reply schemas for availability-zone in CLUSTER SLOTS/SHARDS #3353

Closed

bandalgomsu mentioned this pull request Mar 11, 2026

Add docs for availability-zone field in CLUSTER SHARDS/SLOTS valkey-io/valkey-doc#420

Merged

murphyjacob4 mentioned this pull request Jun 3, 2026

[Compatibility] CLUSTER SHARDS on Valkey 9.1 broken for go-redis client #3909

Open

Uh oh!

Conversation

bandalgomsu commented Feb 3, 2026 • edited by enjoy-binbin Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

zuiderkwast left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zuiderkwast commented Feb 11, 2026

Uh oh!

Uh oh!

enjoy-binbin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zuiderkwast commented Feb 13, 2026

Uh oh!

enjoy-binbin left a comment

Choose a reason for hiding this comment

Uh oh!

madolson commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

zuiderkwast commented Mar 10, 2026

Uh oh!

bandalgomsu commented Mar 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bandalgomsu commented Feb 3, 2026 •

edited by enjoy-binbin

Loading

codecov Bot commented Feb 3, 2026 •

edited

Loading

madolson commented Feb 16, 2026 •

edited

Loading