natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SamplingManager samples before cancelling. 

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18065
This commit is contained in:
Brandon Williams 2023-08-25 05:31:29 -05:00
parent a9606c6f4b
commit c611632eb5
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/metrics/SamplingManager.java
View File

@ -195,12 +195,6 @@ public class SamplingManager
{
return () ->
{
if (cancelingTasks.contains(jobId))
{
logger.debug("The sampling job of {} is currently canceling. Not issuing a new run.", jobId);
activeSamplingTasks.remove(jobId);
return;
}
List<String> tableNames = StreamSupport.stream(tables.spliterator(), false)
.map(cfs -> String.format("%s.%s", cfs.keyspace, cfs.name))
.collect(Collectors.toList());

9
test/unit/org/apache/cassandra/tools/TopPartitionsTest.java
View File

@ -31,7 +31,6 @@ import java.util.stream.Collectors;
import javax.management.openmbean.CompositeData;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Uninterruptibles;
import org.junit.BeforeClass;
import org.junit.Test;
@ -43,6 +42,8 @@ import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.metrics.Sampler;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.Util;
import static java.lang.String.format;
import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
@ -217,11 +218,7 @@ public class TopPartitionsTest
assertTrue("Existing scheduled sampling tasks should be cancellable", ss.stopSamplingPartitions(null, null));
int timeout = 10;
while (timeout-- > 0 && ss.getSampleTasks().size() > 0)
Uninterruptibles.sleepUninterruptibly(10, TimeUnit.MILLISECONDS);
assertEquals("Scheduled sampled tasks should be removed", Collections.emptyList(), ss.getSampleTasks());
Util.spinAssertEquals(Collections.emptyList(), ss::getSampleTasks, 30);
assertTrue("When nothing is scheduled, you should be able to stop all scheduled sampling tasks",
ss.stopSamplingPartitions(null, null));