Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change a little how feature flags are returned #8434

Merged
merged 1 commit into from
Aug 29, 2024
Merged

change a little how feature flags are returned #8434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/core/viewer/json_handlers_viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ void InitViewerCheckAccessJsonHandler(TJsonHandlers& jsonHandlers) {
}

void InitViewerFeatureFlagsJsonHandler(TJsonHandlers& handlers) {
handlers.AddHandler("/viewer/feature_flags", new TJsonHandler<TJsonFeatureFlags>(TJsonFeatureFlags::GetSwagger()));
handlers.AddHandler("/viewer/feature_flags", new TJsonHandler<TJsonFeatureFlags>(TJsonFeatureFlags::GetSwagger()), 2);
}

void InitViewerJsonHandlers(TJsonHandlers& jsonHandlers) {
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/viewer/protos/viewer.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,8 @@ message TPDiskInfo {
message TFeatureFlagsConfig {
message TFeatureFlag {
string Name = 1;
bool Enabled = 2;
bool IsDefault = 3;
bool Current = 2;
bool Default = 3;
}

message TDatabase {
Expand Down
12 changes: 8 additions & 4 deletions ydb/core/viewer/viewer_feature_flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TJsonFeatureFlags : public TViewerPipeClient {
auto* domain = domains->GetDomain();
DomainPath = "/" + domain->Name;

Direct |= Event->Get()->Request.GetUri().StartsWith("/node/"); // we're already forwarding
Direct |= !TBase::Event->Get()->Request.GetHeader("X-Forwarded-From-Node").empty(); // we're already forwarding
Direct |= (FilterDatabase == AppData()->TenantName); // we're already on the right node
if (FilterDatabase && !Direct) {
RequestStateStorageEndpointsLookup(FilterDatabase); // to find some dynamic node and redirect there
Expand Down Expand Up @@ -100,8 +100,12 @@ class TJsonFeatureFlags : public TViewerPipeClient {
if (field->cpp_type() == google::protobuf::FieldDescriptor::CPPTYPE_BOOL) {
auto& feat = features[field->name()];
feat.SetName(field->name());
feat.SetEnabled(reflection->GetBool(featureFlags, field));
feat.SetIsDefault(field->default_value_bool());
if (reflection->HasField(featureFlags, field)) {
feat.SetCurrent(reflection->GetBool(featureFlags, field));
}
if (field->has_default_value()) {
feat.SetDefault(field->default_value_bool());
}
}
}
return features;
Expand All @@ -121,7 +125,7 @@ class TJsonFeatureFlags : public TViewerPipeClient {

// prepare response
NKikimrViewer::TFeatureFlagsConfig Result;
Result.SetVersion(1);
Result.SetVersion(Viewer->GetCapabilityVersion("/viewer/feature_flags"));
for (const auto& [database, features] : FeatureFlagsByDatabase) {
auto databaseProto = Result.AddDatabases();
databaseProto->SetName(database);
Expand Down
Loading