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

chore: Hide managed service info in INFO (#4248)

Browse source 
Specifically:
* `INFO REPLICATION` does not list the replicas, but does still show
  `connected_slaves`
* `INFO SERVER` does not show `thread_count` and `os`

Fixes #4173
This commit is contained in:
Shahar Mike 2024-12-03 16:09:13 +02:00 committed by GitHub
parent b0d633fb61
commit 95f2320825
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/server/cluster/cluster_family.cc
View file

@ -33,10 +33,9 @@ ABSL_FLAG(std::string, cluster_node_id, "",
"ID within a cluster, used for slot assignment. MUST be unique. If empty, uses master "
"replication ID (random string)");
ABSL_FLAG(bool, managed_service_info, false,
"Hides some implementation details from users when true (i.e. in managed service env)");
ABSL_DECLARE_FLAG(int32_t, port);
ABSL_DECLARE_FLAG(uint16_t, announce_port);
ABSL_DECLARE_FLAG(bool, managed_service_info);
namespace dfly {
namespace acl {

21
src/server/server_family.cc
View file

@ -127,6 +127,9 @@ ABSL_FLAG(bool, s3_sign_payload, true,
ABSL_FLAG(bool, info_replication_valkey_compatible, true,
"when true - output valkey compatible values for info-replication");
ABSL_FLAG(bool, managed_service_info, false,
"Hides some implementation details from users when true (i.e. in managed service env)");
ABSL_DECLARE_FLAG(int32_t, port);
ABSL_DECLARE_FLAG(bool, cache_mode);
ABSL_DECLARE_FLAG(uint32_t, hz);
@ -2222,10 +2225,12 @@ void ServerFamily::Info(CmdArgList args, const CommandContext& cmd_cntx) {
append("dragonfly_version", GetVersion());
append("redis_mode", GetRedisMode());
append("arch_bits", 64);
append("os", GetOSString());
if (!absl::GetFlag(FLAGS_managed_service_info)) {
append("os", GetOSString());
append("thread_count", service_.proactor_pool().size());
}
append("multiplexing_api", multiplex_api);
append("tcp_port", GetFlag(FLAGS_port));
append("thread_count", service_.proactor_pool().size());
uint64_t uptime = time(NULL) - start_time_;
append("uptime_in_seconds", uptime);
@ -2487,11 +2492,13 @@ void ServerFamily::Info(CmdArgList args, const CommandContext& cmd_cntx) {
append("role", "master");
append("connected_slaves", replicas_info.size());
for (size_t i = 0; i < replicas_info.size(); i++) {
auto& r = replicas_info[i];
// e.g. slave0:ip=172.19.0.3,port=6379,state=full_sync
append(StrCat("slave", i), StrCat("ip=", r.address, ",port=", r.listening_port,
",state=", r.state, ",lag=", r.lsn_lag));
if (!absl::GetFlag(FLAGS_managed_service_info)) {
for (size_t i = 0; i < replicas_info.size(); i++) {
auto& r = replicas_info[i];
// e.g. slave0:ip=172.19.0.3,port=6379,state=full_sync
append(StrCat("slave", i), StrCat("ip=", r.address, ",port=", r.listening_port,
",state=", r.state, ",lag=", r.lsn_lag));
}
}
append("master_replid", master_replid_);
} else {