Skip to content

Fix flaky tests (batch 14): BacklogTracer volatile + QuartzPersistentStore MBean collision #24713

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

Open
gnodet wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix flaky tests (batch 14): BacklogTracer volatile + QuartzPersistentStore MBean collision #24713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0f13bc
Fix flaky tests (batch 14): BacklogTracerActivityTest, CxfTimeoutTest…
gnodet Jul 16, 2026
918c7b5
Fix CxfTimeoutTest root cause: use explicit CxfConfigurer for Receive…
gnodet Jul 15, 2026
0fafabc
BacklogTracer: clarify volatile comment to name all three fields
gnodet Jul 17, 2026
2750c7b
Fix SpringQuartzPersistentStoreRestartApp MBean collision with unique…
gnodet Jul 20, 2026
3016fd2
Remove CxfTimeoutTest fix — moved to separate issue #24954
gnodet Jul 20, 2026
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 ...camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</property>
</bean>

<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#-cron1" xmlns="http://camel.apache.org/schema/spring">
<route id="quartzRoute">
<from uri="quartzBean://app/test?cron=0+0/1+*+1/1+*+?+*"/>
<to uri="log:trigger"/>
Expand Down
2 changes: 1 addition & 1 deletion ...camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</property>
</bean>

<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#1" xmlns="http://camel.apache.org/schema/spring">
<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#-cron2" xmlns="http://camel.apache.org/schema/spring">
<route id="quartzRoute">
<from uri="quartzBean://app/test?cron=0+0/2+*+1/1+*+?+*"/>
<to uri="log:trigger"/>
Expand Down
2 changes: 1 addition & 1 deletion ...apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</property>
</bean>

<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#-opts1" xmlns="http://camel.apache.org/schema/spring">
<route id="quartzRoute">
<from uri="quartzBean://app/test?trigger.repeatInterval=10&amp;trigger.repeatCount=1"/>
<to uri="log:trigger"/>
Expand Down
2 changes: 1 addition & 1 deletion ...apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</property>
</bean>

<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
<camelContext id="camelContext-{{testClassSimpleName}}" managementNamePattern="#name#-opts2" xmlns="http://camel.apache.org/schema/spring">
<route id="quartzRoute">
<from uri="quartzBean://app/test?trigger.repeatInterval=20&amp;trigger.repeatCount=2"/>
<to uri="log:trigger"/>
Expand Down
11 changes: 8 additions & 3 deletions core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/BacklogTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,12 @@ public class BacklogTracer extends ServiceSupport implements org.apache.camel.sp
public static final int MAX_BACKLOG_SIZE = 1000;
private final CamelContext camelContext;
private final Language simple;
private boolean enabled;
private boolean standby;
// enabled, standby, and activityEnabled (further below) are toggled at runtime via
// JMX/management APIs while routing threads read them in shouldTrace() and traceEvent().
// Other boolean fields (removeOnDump, bodyIncludeStreams, traceRests, etc.) are set during
// initialization and do not change while routes are processing, so they do not need volatile.
private volatile boolean enabled;
private volatile boolean standby;
private final AtomicLong traceCounter = new AtomicLong();
// use a queue with an upper limit to avoid storing too many messages
private final Queue<BacklogTracerEventMessage> queue = new LinkedBlockingQueue<>(MAX_BACKLOG_SIZE);
Expand All @@ -87,7 +91,8 @@ public class BacklogTracer extends ServiceSupport implements org.apache.camel.sp
private boolean includeExchangeProperties = true;
private boolean includeExchangeVariables = true;
private boolean includeException = true;
private boolean activityEnabled;
// volatile: toggled at runtime via JMX, same rationale as enabled/standby above
private volatile boolean activityEnabled;
private boolean traceRests;
private boolean traceTemplates;
// a pattern to filter tracing nodes
Expand Down