Skip to content

Cassandra 4 fixes #410

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

Draft
adutra wants to merge 2 commits into
base: 1.x
Choose a base branch
from
Draft

Cassandra 4 fixes #410

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
855cf00
Re-enable Cassandra 4.0 in CI
adutra Feb 24, 2022
77abb54
Fix failing partitioner tests
adutra Feb 24, 2022
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
3 changes: 1 addition & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,7 @@ pipeline {
axes {
axis {
name 'CASSANDRA_VERSION'
values '2.1', '2.2', '3.0', '3.11',
// '4.0', removed until GA
values '2.1', '2.2', '3.0', '3.11', '4.0',
'dse-4.7', 'dse-4.8', 'dse-5.1', 'dse-6.0', 'dse-6.7', 'dse-6.8'
}
}
Expand Down
28 changes: 7 additions & 21 deletions partitioner/src/it/java/com/datastax/oss/dsbulk/partitioner/PartitionerCCMITBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
import static org.assertj.core.api.Assertions.fail;
import static org.awaitility.Awaitility.await;
import static org.awaitility.Durations.ONE_MINUTE;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.junit.jupiter.params.provider.Arguments.arguments;

import com.datastax.oss.driver.api.core.CqlIdentifier;
import com.datastax.oss.driver.api.core.CqlSession;
import com.datastax.oss.driver.api.core.Version;
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
import com.datastax.oss.driver.api.core.cql.ResultSet;
import com.datastax.oss.driver.api.core.cql.Row;
Expand All @@ -41,15 +39,12 @@
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles;
import com.datastax.oss.dsbulk.tests.ccm.CCMCluster;
import com.datastax.oss.dsbulk.tests.ccm.CCMCluster.Type;
import com.datastax.oss.dsbulk.tests.ccm.CCMExtension;
import com.datastax.oss.dsbulk.tests.ccm.annotations.CCMRequirements;
import com.datastax.oss.dsbulk.tests.ccm.annotations.CCMVersionRequirement;
import com.datastax.oss.dsbulk.tests.driver.VersionUtils;
import com.datastax.oss.dsbulk.tests.utils.CQLUtils;
import com.datastax.oss.dsbulk.tests.utils.StringUtils;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;
Expand All @@ -76,9 +71,6 @@ abstract class PartitionerCCMITBase {
private static final int EXPECTED_TOTAL = 10_000;
private static final CqlIdentifier TABLE_NAME = CqlIdentifier.fromInternal("MY_TABLE");

private static final Version DSE_6_0 = Objects.requireNonNull(Version.parse("6.0.0"));
private static final Version DSE_6_8 = Objects.requireNonNull(Version.parse("6.8.0"));

private final CCMCluster ccm;
private final CqlSession session;
private final boolean multiDc;
Expand All @@ -93,12 +85,6 @@ abstract class PartitionerCCMITBase {
@MethodSource
void should_scan_table(int rf, int splitCount) {

// TODO remove when DB-4412 is fixed
assumeFalse(
ccm.getClusterType() == Type.DSE
&& VersionUtils.isWithinRange(ccm.getVersion(), DSE_6_0, DSE_6_8),
"This test fails frequently for DSE 6.0 and 6.7, see https://datastax.jira.com/browse/DB-4412");

CqlIdentifier ks = createSchema(rf);
populateTable(ks);
TableMetadata table = getTable(ks).orElseThrow(IllegalStateException::new);
Expand Down Expand Up @@ -184,17 +170,17 @@ private Optional<TableMetadata> getTable(CqlIdentifier ks) {
private void populateTable(CqlIdentifier ks) {
PreparedStatement ps =
session.prepare(
String.format(
"INSERT INTO %s.%s (\"PK\", \"V\") VALUES (?, 1)",
ks.asCql(true), TABLE_NAME.asCql(true)));
SimpleStatement.newInstance(
String.format(
"INSERT INTO %s.%s (\"PK\", \"V\") VALUES (?, 1)",
ks.asCql(true), TABLE_NAME.asCql(true)))
.setConsistencyLevel(ALL)
.setExecutionProfile(SessionUtils.slowProfile(session)));
for (int i = 1; i <= EXPECTED_TOTAL; i++) {
int attempts = 1;
while (true) {
try {
session.execute(
ps.bind(i)
.setConsistencyLevel(ALL)
.setExecutionProfile(SessionUtils.slowProfile(session)));
session.execute(ps.bind(i));
break;
} catch (RuntimeException e) {
if (attempts == 3) {
Expand Down
13 changes: 10 additions & 3 deletions partitioner/src/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@

-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%-5level [%thread] %logger{40} - %msg%n</pattern>
</encoder>
</appender>
<root level="${log.root.level:-ERROR}">
<appender-ref ref="STDOUT"/>
<root level="${log.root.level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
<!-- Log messages from remote CCM processes -->
<logger name="dsbulk.ccm.CCM_OUT" level="${log.ccm.level:-INFO}" additivity="false">
<appender-ref ref="${log.ccm.appender:-CONSOLE}"/>
</logger>
<logger name="dsbulk.ccm.CCM_ERR" level="${log.ccm.level:-INFO}" additivity="false">
<appender-ref ref="${log.ccm.appender:-CONSOLE}"/>
</logger>
</configuration>