mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

fix: introduce info_replication_valkey_compatible flag (#2936)

Browse source 
This fixes compatibility issues with frameworks like Lettuce Java that expect exact words when parsing INFO response.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-04-21 12:08:53 +03:00 committed by GitHub
parent 2ff7ff9841
commit 734ba80983
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/server/server_family.cc
View file

@ -123,6 +123,9 @@ ABSL_FLAG(bool, s3_ec2_metadata, false,
ABSL_FLAG(bool, s3_sign_payload, true,
"whether to sign the s3 request payload when uploading snapshots");
ABSL_FLAG(bool, info_replication_valkey_compatible, false,
"when true - output valkey compatible values for info-replication");
ABSL_DECLARE_FLAG(int32_t, port);
ABSL_DECLARE_FLAG(bool, cache_mode);
ABSL_DECLARE_FLAG(uint32_t, hz);
@ -2156,7 +2159,7 @@ void ServerFamily::Info(CmdArgList args, ConnectionContext* cntx) {
}
append("master_replid", master_replid_);
} else {
append("role", "replica");
append("role", GetFlag(FLAGS_info_replication_valkey_compatible) ? "slave" : "replica");
// The replica pointer can still be mutated even while master=true,
// we don't want to drop the replica object in this fiber
@ -2634,13 +2637,14 @@ void ServerFamily::Role(CmdArgList args, ConnectionContext* cntx) {
} else {
unique_lock lk{replicaof_mu_};
rb->StartArray(4 + cluster_replicas_.size() * 3);
rb->SendBulkString("replica");
rb->SendBulkString(GetFlag(FLAGS_info_replication_valkey_compatible) ? "slave" : "replica");
auto send_replica_info = [rb](Replica::Info rinfo) {
rb->SendBulkString(rinfo.host);
rb->SendBulkString(absl::StrCat(rinfo.port));
if (rinfo.full_sync_done) {
rb->SendBulkString("stable_sync");
rb->SendBulkString(GetFlag(FLAGS_info_replication_valkey_compatible) ? "online"
: "stable_sync");
} else if (rinfo.full_sync_in_progress) {
rb->SendBulkString("full_sync");
} else if (rinfo.master_link_established) {