Skip to content

CASSANDRA-21135 Fix JMXFeatureTest failure due to disabled AsyncProfiler #4585

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
arvindKandpal-ksolves wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

CASSANDRA-21135 Fix JMXFeatureTest failure due to disabled AsyncProfiler #4585

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
4 changes: 4 additions & 0 deletions src/java/org/apache/cassandra/service/AsyncProfilerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,10 @@ public void purge()
@Override
public String status()
{
if (!ASYNC_PROFILER_ENABLED.getBoolean())
{
return "Async Profiler is not enabled. Enable it by setting " + ASYNC_PROFILER_ENABLED.getKey() + " property to true.";
}
return run(new ThrowingFunction<>()
{
@Override
Expand Down
9 changes: 4 additions & 5 deletions test/unit/org/apache/cassandra/service/AsyncProfilerServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,13 @@ public void testSecondStartNotExecuted()
}

@Test
public void testProfilerDisabledThrowsException()
public void testProfilerDisabledReturnsMessage()
{
try (WithProperties properties = new WithProperties().set(ASYNC_PROFILER_UNSAFE_MODE, true).set(ASYNC_PROFILER_ENABLED, false))
{
assertThatThrownBy(() -> {
AsyncProfilerService profiler = getProfiler(true);
profiler.status();
}).hasMessageContaining("Async Profiler is not enabled. Enable it by setting cassandra.async_profiler.enabled property to true.");
AsyncProfilerService profiler = getProfiler(true);
String status = profiler.status();
assertTrue(status.contains("Async Profiler is not enabled. Enable it by setting cassandra.async_profiler.enabled property to true."));
}
}

Expand Down