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

Fix for Cassandra 2.2 full repair bug #14

Merged
merged 1 commit into from
Nov 14, 2016
Merged

Fix for Cassandra 2.2 full repair bug #14

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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<name>Cassandra Reaper</name>
<groupId>com.spotify</groupId>
<artifactId>cassandra-reaper</artifactId>
<version>0.3.1-SNAPSHOT</version>
<version>0.3.2-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dropwizard.version>0.7.1</dropwizard.version>
<dropwizard.cassandra.version>4.0.0</dropwizard.cassandra.version>
<cassandra.version>2.1.16</cassandra.version>
<cucumber.version>1.1.5</cucumber.version>
</properties>
<cassandra.version>2.2.7</cassandra.version>
<cucumber.version>1.1.5</cucumber.version>
</properties>

<dependencies>
<!--compile scope -->
Expand Down
91 changes: 47 additions & 44 deletions src/main/java/com/spotify/reaper/cassandra/JmxProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,10 @@ public String getCassandraVersion(){
* For time being, we don't allow local nor snapshot repairs.
*
* @return Repair command number, or 0 if nothing to repair
* @throws ReaperException
*/
public int triggerRepair(BigInteger beginToken, BigInteger endToken, String keyspace,
RepairParallelism repairParallelism, Collection<String> columnFamilies, boolean fullRepair) {
RepairParallelism repairParallelism, Collection<String> columnFamilies, boolean fullRepair) throws ReaperException {
checkNotNull(ssProxy, "Looks like the proxy is not connected");
String cassandraVersion = getCassandraVersion();
boolean canUseDatacenterAware = false;
Expand All @@ -373,49 +374,51 @@ public int triggerRepair(BigInteger beginToken, BigInteger endToken, String keys
columnFamilies);
LOG.info(msg);

if(!cassandraVersion.startsWith("2.0")){
if(fullRepair) {
if (repairParallelism.equals(RepairParallelism.DATACENTER_AWARE)) {
if (canUseDatacenterAware) {
return ((StorageServiceMBean) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(), keyspace,
repairParallelism.ordinal(), null, null, fullRepair,
columnFamilies
.toArray(new String[columnFamilies.size()]));
} else {
LOG.info("Cannot use DATACENTER_AWARE repair policy for Cassandra cluster with version {},"
+ " falling back to SEQUENTIAL repair.",
cassandraVersion);
repairParallelism = RepairParallelism.SEQUENTIAL;
}
}
boolean snapshotRepair = repairParallelism.equals(RepairParallelism.SEQUENTIAL);
return ((StorageServiceMBean) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(), keyspace,
snapshotRepair, false, fullRepair,
columnFamilies.toArray(new String[columnFamilies.size()]));
}
else {
return ((StorageServiceMBean) ssProxy).forceRepairAsync(keyspace, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE, fullRepair, columnFamilies.toArray(new String[columnFamilies.size()]));
}
}
else {
// Cassandra 2.0 compatibility
if (repairParallelism.equals(RepairParallelism.DATACENTER_AWARE)) {
if (canUseDatacenterAware) {
return ((StorageServiceMBean20) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(), keyspace,
repairParallelism.ordinal(), null, null,
columnFamilies
.toArray(new String[columnFamilies.size()]));
} else {
LOG.info("Cannot use DATACENTER_AWARE repair policy for Cassandra cluster with version {},"
+ " falling back to SEQUENTIAL repair.",
cassandraVersion);
repairParallelism = RepairParallelism.SEQUENTIAL;
}
}
boolean snapshotRepair = repairParallelism.equals(RepairParallelism.SEQUENTIAL);
return ((StorageServiceMBean20) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(), keyspace,
snapshotRepair, false,
columnFamilies.toArray(new String[columnFamilies.size()]));
try {
if (!cassandraVersion.startsWith("2.0")) {
if (fullRepair) {
if (repairParallelism.equals(RepairParallelism.DATACENTER_AWARE)) {
if (canUseDatacenterAware) {
return ((StorageServiceMBean) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(),
keyspace, repairParallelism.ordinal(), cassandraVersion.startsWith("2.2")?new HashSet<String>():null, cassandraVersion.startsWith("2.2")?new HashSet<String>():null, fullRepair,
columnFamilies.toArray(new String[columnFamilies.size()]));
} else {
LOG.info("Cannot use DATACENTER_AWARE repair policy for Cassandra cluster with version {},"
+ " falling back to SEQUENTIAL repair.", cassandraVersion);
repairParallelism = RepairParallelism.SEQUENTIAL;
}
}
boolean snapshotRepair = repairParallelism.equals(RepairParallelism.SEQUENTIAL);

return ((StorageServiceMBean) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(),
keyspace, snapshotRepair ? RepairParallelism.SEQUENTIAL.ordinal() : RepairParallelism.PARALLEL.ordinal(),
cassandraVersion.startsWith("2.2")?new HashSet<String>():null, cassandraVersion.startsWith("2.2")?new HashSet<String>():null, fullRepair,
columnFamilies.toArray(new String[columnFamilies.size()]));

} else {
return ((StorageServiceMBean) ssProxy).forceRepairAsync(keyspace, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE,
fullRepair, columnFamilies.toArray(new String[columnFamilies.size()]));
}
} else {
// Cassandra 2.0 compatibility
if (repairParallelism.equals(RepairParallelism.DATACENTER_AWARE)) {
if (canUseDatacenterAware) {
return ((StorageServiceMBean20) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(),
keyspace, repairParallelism.ordinal(), null, null,
columnFamilies.toArray(new String[columnFamilies.size()]));
} else {
LOG.info("Cannot use DATACENTER_AWARE repair policy for Cassandra cluster with version {},"
+ " falling back to SEQUENTIAL repair.", cassandraVersion);
repairParallelism = RepairParallelism.SEQUENTIAL;
}
}
boolean snapshotRepair = repairParallelism.equals(RepairParallelism.SEQUENTIAL);
return ((StorageServiceMBean20) ssProxy).forceRepairRangeAsync(beginToken.toString(), endToken.toString(),
keyspace, snapshotRepair, false, columnFamilies.toArray(new String[columnFamilies.size()]));
}
} catch (Exception e) {
LOG.error("Segment repair failed", e);
throw new ReaperException(e);
}

}
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/spotify/reaper/unit/service/SegmentRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void timeoutTest() throws InterruptedException, ReaperException, Executio

context.jmxConnectionFactory = new JmxConnectionFactory() {
@Override
public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host) {
public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host) throws ReaperException {
JmxProxy jmx = mock(JmxProxy.class);
when(jmx.getClusterName()).thenReturn("reaper");
when(jmx.isConnectionAlive()).thenReturn(true);
Expand Down Expand Up @@ -145,7 +145,7 @@ public void successTest() throws InterruptedException, ReaperException, Executio
context.storage = storage;
context.jmxConnectionFactory = new JmxConnectionFactory() {
@Override
public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host) {
public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host) throws ReaperException {
JmxProxy jmx = mock(JmxProxy.class);
when(jmx.getClusterName()).thenReturn("reaper");
when(jmx.isConnectionAlive()).thenReturn(true);
Expand Down Expand Up @@ -219,7 +219,7 @@ public void failureTest() throws InterruptedException, ReaperException, Executio
context.storage = storage;
context.jmxConnectionFactory = new JmxConnectionFactory() {
@Override
public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host) {
public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host) throws ReaperException {
JmxProxy jmx = mock(JmxProxy.class);
when(jmx.getClusterName()).thenReturn("reaper");
when(jmx.isConnectionAlive()).thenReturn(true);
Expand Down