Skip to content

Commit

Permalink
Merge branch 'cassandra-3.0' into cassandra-3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
bdeggleston committed Oct 26, 2017
2 parents 5b23054 + 8fad4cd commit 7d26815
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 33 deletions.
Expand Up @@ -20,11 +20,9 @@
*/
package org.apache.cassandra.db.commitlog;

import java.io.File;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.Semaphore;

import com.google.common.collect.ImmutableMap;
Expand All @@ -50,8 +48,11 @@
import org.jboss.byteman.contrib.bmunit.BMRules;
import org.jboss.byteman.contrib.bmunit.BMUnitRunner;

/**
* Since this test depends on byteman rules being setup during initialization, you shouldn't add tests to this class
*/
@RunWith(BMUnitRunner.class)
public class CommitLogSegmentManagerTest
public class CommitLogSegmentBackpressureTest
{
//Block commit log service from syncing
private static final Semaphore allowSync = new Semaphore(1);
Expand All @@ -67,12 +68,12 @@ public class CommitLogSegmentManagerTest
targetClass = "AbstractCommitLogService$1",
targetMethod = "run",
targetLocation = "AT INVOKE org.apache.cassandra.db.commitlog.CommitLog.sync",
action = "org.apache.cassandra.db.commitlog.CommitLogSegmentManagerTest.allowSync.acquire()"),
action = "org.apache.cassandra.db.commitlog.CommitLogSegmentBackpressureTest.allowSync.acquire()"),
@BMRule(name = "Release Semaphore after sync",
targetClass = "AbstractCommitLogService$1",
targetMethod = "run",
targetLocation = "AFTER INVOKE org.apache.cassandra.db.commitlog.CommitLog.sync",
action = "org.apache.cassandra.db.commitlog.CommitLogSegmentManagerTest.allowSync.release()")})
action = "org.apache.cassandra.db.commitlog.CommitLogSegmentBackpressureTest.allowSync.release()")})
public void testCompressedCommitLogBackpressure() throws Throwable
{
// Perform all initialization before making CommitLog.Sync blocking
Expand Down Expand Up @@ -141,32 +142,4 @@ public void testCompressedCommitLogBackpressure() throws Throwable
Thread.currentThread().interrupt();
}
}

@Test
@BMRule(name = "Make removing commitlog segments slow",
targetClass = "CommitLogSegment",
targetMethod = "discard",
action = "Thread.sleep(50)")
public void testShutdownWithPendingTasks() throws Throwable {
CommitLog.instance.resetUnsafe(true);
ColumnFamilyStore cfs1 = Keyspace.open(KEYSPACE1).getColumnFamilyStore(STANDARD1);

final Mutation m = new RowUpdateBuilder(cfs1.metadata, 0, "k")
.clustering("bytes")
.add("val", ByteBuffer.wrap(entropy))
.build();

// force creating several commitlog files
for (int i = 0; i < 10; i++) {
CommitLog.instance.add(m);
}

// schedule discarding completed segments and immediately issue a shutdown
UUID cfid = m.getColumnFamilyIds().iterator().next();
CommitLog.instance.discardCompletedSegments(cfid, CommitLogPosition.NONE, CommitLog.instance.getCurrentPosition());
CommitLog.instance.shutdownBlocking();

// the shutdown should block until all logs except the currently active one and perhaps a new, empty one are gone
Assert.assertTrue(new File(DatabaseDescriptor.getCommitLogLocation()).listFiles().length <= 2);
}
}
@@ -0,0 +1,99 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.cassandra.db.commitlog;

import java.io.File;
import java.nio.ByteBuffer;
import java.util.Random;
import java.util.UUID;

import com.google.common.collect.ImmutableMap;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.ParameterizedClass;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.RowUpdateBuilder;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.marshal.AsciiType;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.schema.KeyspaceParams;
import org.jboss.byteman.contrib.bmunit.BMRule;
import org.jboss.byteman.contrib.bmunit.BMUnitRunner;

/**
* Since this test depends on byteman rules being setup during initialization, you shouldn't add tests to this class
*/
@RunWith(BMUnitRunner.class)
public class CommitlogShutdownTest
{
private static final String KEYSPACE1 = "CommitLogTest";
private static final String STANDARD1 = "Standard1";

private final static byte[] entropy = new byte[1024 * 256];

@Test
@BMRule(name = "Make removing commitlog segments slow",
targetClass = "CommitLogSegment",
targetMethod = "discard",
action = "Thread.sleep(50)")
public void testShutdownWithPendingTasks() throws Exception
{
new Random().nextBytes(entropy);
DatabaseDescriptor.daemonInitialization();
DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of()));
DatabaseDescriptor.setCommitLogSegmentSize(1);
DatabaseDescriptor.setCommitLogSync(Config.CommitLogSync.periodic);
DatabaseDescriptor.setCommitLogSyncPeriod(10 * 1000);
SchemaLoader.prepareServer();
SchemaLoader.createKeyspace(KEYSPACE1,
KeyspaceParams.simple(1),
SchemaLoader.standardCFMD(KEYSPACE1, STANDARD1, 0, AsciiType.instance, BytesType.instance));

CompactionManager.instance.disableAutoCompaction();

CommitLog.instance.resetUnsafe(true);
ColumnFamilyStore cfs1 = Keyspace.open(KEYSPACE1).getColumnFamilyStore(STANDARD1);

final Mutation m = new RowUpdateBuilder(cfs1.metadata, 0, "k")
.clustering("bytes")
.add("val", ByteBuffer.wrap(entropy))
.build();

// force creating several commitlog files
for (int i = 0; i < 10; i++)
{
CommitLog.instance.add(m);
}

// schedule discarding completed segments and immediately issue a shutdown
UUID cfid = m.getColumnFamilyIds().iterator().next();
CommitLog.instance.discardCompletedSegments(cfid, CommitLogPosition.NONE, CommitLog.instance.getCurrentPosition());
CommitLog.instance.shutdownBlocking();

// the shutdown should block until all logs except the currently active one and perhaps a new, empty one are gone
Assert.assertTrue(new File(DatabaseDescriptor.getCommitLogLocation()).listFiles().length <= 2);
}
}

0 comments on commit 7d26815

Please sign in to comment.