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 default value of FORWARD_ALL_LOG_LEVELS to true #32619

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Change default value of FORWARD_ALL_LOG_LEVELS to true #32619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b44d2d5
Change default value of FORWARD_ALL_LOG_LEVELS to true
hmusum Oct 21, 2024
c0b6c20
Forward all log levels only when hosted
hmusum Oct 21, 2024
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 config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ interface FeatureFlags {
@ModelFeatureFlag(owners = {"vekterli"}) default boolean enforceStrictlyIncreasingClusterStateVersions() { return false; }
@ModelFeatureFlag(owners = {"vekterli"}) default boolean distributionConfigFromClusterController() { return false; }
@ModelFeatureFlag(owners = {"arnej"}) default boolean useLegacyWandQueryParsing() { return true; }
@ModelFeatureFlag(owners = {"hmusum"}) default boolean forwardAllLogLevels() { return false; }
@ModelFeatureFlag(owners = {"hmusum"}) default boolean forwardAllLogLevels() { return true; }
}

/** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */
Expand Down
5 changes: 3 additions & 2 deletions config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public ZooKeepersConfigProvider getZooKeepersConfigProvider() {
}

public void getConfig(LogdConfig.Builder builder) {
var forwardAllLogLevels = isHostedVespa && featureFlags.forwardAllLogLevels();
if (logserver == null) {
builder.logserver(new LogdConfig.Logserver.Builder().use(false));
}
Expand All @@ -206,8 +207,8 @@ public void getConfig(LogdConfig.Builder builder) {
host(logserver.getHostName()).
rpcport(logserver.getRelativePort(0)))
.loglevel(new LogdConfig.Loglevel.Builder().
debug(new LogdConfig.Loglevel.Debug.Builder().forward(featureFlags.forwardAllLogLevels())).
spam(new LogdConfig.Loglevel.Spam.Builder().forward(featureFlags.forwardAllLogLevels())));
debug(new LogdConfig.Loglevel.Debug.Builder().forward(forwardAllLogLevels)).
spam(new LogdConfig.Loglevel.Spam.Builder().forward(forwardAllLogLevels)));
}
}

Expand Down
2 changes: 1 addition & 1 deletion flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ public class PermanentFlags {
"Takes effect on next iteration of UserManagementMaintainer");

public static final UnboundBooleanFlag FORWARD_ALL_LOG_LEVELS = defineFeatureFlag(
"forward-all-log-levels", false,
"forward-all-log-levels", true,
"Forward all log levels from nodes to logserver (debug and spam levels will be forwarded only if this flag is enabled)",
"Takes effect at redeployment");

Expand Down