Repository: cassandra Updated Branches: refs/heads/trunk aba582fb4 -> f56871b88
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56871b8/test/unit/org/apache/cassandra/audit/InMemoryAuditLogger.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/audit/InMemoryAuditLogger.java b/test/unit/org/apache/cassandra/audit/InMemoryAuditLogger.java new file mode 100644 index 0000000..7052d76 --- /dev/null +++ b/test/unit/org/apache/cassandra/audit/InMemoryAuditLogger.java @@ -0,0 +1,47 @@ +/* + * 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.audit; + +import java.nio.file.Path; +import java.util.LinkedList; +import java.util.Queue; + +public class InMemoryAuditLogger implements IAuditLogger +{ + final Queue<AuditLogEntry> inMemQueue = new LinkedList<>(); + private boolean enabled = true; + + @Override + public boolean enabled() + { + return enabled; + } + + @Override + public void log(AuditLogEntry logMessage) + { + inMemQueue.offer(logMessage); + } + + @Override + public void stop() + { + enabled = false; + inMemQueue.clear(); + } +} http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56871b8/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java index 084ad7e..4078e2a 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java @@ -119,6 +119,11 @@ public class DatabaseDescriptorRefTest "org.apache.cassandra.LogbackStatusListener$1", "org.apache.cassandra.LogbackStatusListener$2", "org.apache.cassandra.TeeingAppender", + "org.apache.cassandra.audit.IAuditLogger", + "org.apache.cassandra.audit.BinAuditLogger", + "org.apache.cassandra.audit.BinLogAuditLogger", + "org.apache.cassandra.audit.FullQueryLogger", + "org.apache.cassandra.audit.AuditLogOptions", // generated classes "org.apache.cassandra.config.ConfigBeanInfo", "org.apache.cassandra.config.ConfigCustomizer", http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56871b8/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index dacb37c..e53342d 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -543,6 +543,13 @@ public abstract class CQLTester return tables.get(tables.size() - 1); } + protected String currentKeyspace() + { + if (keyspaces.isEmpty()) + return null; + return keyspaces.get(keyspaces.size() - 1); + } + protected ByteBuffer unset() { return ByteBufferUtil.UNSET_BYTE_BUFFER; http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56871b8/test/unit/org/apache/cassandra/db/fullquerylog/FullQueryLoggerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/fullquerylog/FullQueryLoggerTest.java b/test/unit/org/apache/cassandra/db/fullquerylog/FullQueryLoggerTest.java deleted file mode 100644 index 175cf8c..0000000 --- a/test/unit/org/apache/cassandra/db/fullquerylog/FullQueryLoggerTest.java +++ /dev/null @@ -1,601 +0,0 @@ -/* - * 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.fullquerylog; - - -import java.io.File; -import java.nio.ByteBuffer; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.After; -import org.junit.BeforeClass; -import org.junit.Test; - -import io.netty.buffer.Unpooled; -import net.openhft.chronicle.queue.ChronicleQueue; -import net.openhft.chronicle.queue.ChronicleQueueBuilder; -import net.openhft.chronicle.queue.ExcerptTailer; -import net.openhft.chronicle.queue.RollCycles; -import net.openhft.chronicle.wire.ValueIn; -import net.openhft.chronicle.wire.WireOut; -import org.apache.cassandra.Util; -import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.fullquerylog.FullQueryLogger.WeighableMarshallableQuery; -import org.apache.cassandra.db.fullquerylog.FullQueryLogger.WeighableMarshallableBatch; -import org.apache.cassandra.transport.ProtocolVersion; -import org.apache.cassandra.transport.Server; -import org.apache.cassandra.utils.ObjectSizes; -import org.apache.cassandra.utils.binlog.BinLogTest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public class FullQueryLoggerTest -{ - private static Path tempDir; - - @BeforeClass - public static void beforeClass() throws Exception - { - tempDir = BinLogTest.tempDir(); - } - - @After - public void tearDown() - { - FullQueryLogger.instance.reset(tempDir.toString()); - } - - @Test(expected = NullPointerException.class) - public void testConfigureNullPath() throws Exception - { - FullQueryLogger.instance.configure(null, "", true, 1, 1); - } - - @Test(expected = NullPointerException.class) - public void testConfigureNullRollCycle() throws Exception - { - FullQueryLogger.instance.configure(BinLogTest.tempDir(), null, true, 1, 1); - } - - @Test(expected = IllegalArgumentException.class) - public void testConfigureInvalidRollCycle() throws Exception - { - FullQueryLogger.instance.configure(BinLogTest.tempDir(), "foobar", true, 1, 1); - } - - @Test(expected = IllegalArgumentException.class) - public void testConfigureInvalidMaxQueueWeight() throws Exception - { - FullQueryLogger.instance.configure(BinLogTest.tempDir(), "DAILY", true, 0, 1); - } - - @Test(expected = IllegalArgumentException.class) - public void testConfigureInvalidMaxQueueLogSize() throws Exception - { - FullQueryLogger.instance.configure(BinLogTest.tempDir(), "DAILY", true, 1, 0); - } - - @Test(expected = IllegalArgumentException.class) - public void testConfigureOverExistingFile() throws Exception - { - File f = File.createTempFile("foo", "bar"); - f.deleteOnExit(); - FullQueryLogger.instance.configure(f.toPath(), "TEST_SECONDLY", true, 1, 1); - } - - @Test(expected = IllegalArgumentException.class) - public void testCanRead() throws Exception - { - tempDir.toFile().setReadable(false); - try - { - configureFQL(); - } - finally - { - tempDir.toFile().setReadable(true); - } - } - - @Test(expected = IllegalArgumentException.class) - public void testCanWrite() throws Exception - { - tempDir.toFile().setWritable(false); - try - { - configureFQL(); - } - finally - { - tempDir.toFile().setWritable(true); - } - } - - @Test(expected = IllegalArgumentException.class) - public void testCanExecute() throws Exception - { - tempDir.toFile().setExecutable(false); - try - { - configureFQL(); - } - finally - { - tempDir.toFile().setExecutable(true); - } - } - - @Test - public void testResetWithoutConfigure() throws Exception - { - FullQueryLogger.instance.reset(tempDir.toString()); - FullQueryLogger.instance.reset(tempDir.toString()); - } - - @Test - public void stopWithoutConfigure() throws Exception - { - FullQueryLogger.instance.stop(); - FullQueryLogger.instance.stop(); - } - - /** - * Both the last used and supplied directory should get cleaned - */ - @Test - public void testResetCleansPaths() throws Exception - { - configureFQL(); - File tempA = File.createTempFile("foo", "bar", tempDir.toFile()); - assertTrue(tempA.exists()); - File tempB = File.createTempFile("foo", "bar", BinLogTest.tempDir().toFile()); - FullQueryLogger.instance.reset(tempB.getParent()); - assertFalse(tempA.exists()); - assertFalse(tempB.exists()); - } - - /** - * The last used and configured directory are the same and it shouldn't be an issue - */ - @Test - public void testResetSamePath() throws Exception - { - configureFQL(); - File tempA = File.createTempFile("foo", "bar", tempDir.toFile()); - assertTrue(tempA.exists()); - FullQueryLogger.instance.reset(tempA.getParent()); - assertFalse(tempA.exists()); - } - - @Test(expected = IllegalStateException.class) - public void testDoubleConfigure() throws Exception - { - configureFQL(); - configureFQL(); - } - - @Test - public void testCleansDirectory() throws Exception - { - assertTrue(new File(tempDir.toFile(), "foobar").createNewFile()); - configureFQL(); - assertEquals(tempDir.toFile().listFiles().length, 1); - assertEquals("directory-listing.cq4t", tempDir.toFile().listFiles()[0].getName()); - } - - @Test - public void testEnabledReset() throws Exception - { - assertFalse(FullQueryLogger.instance.enabled()); - configureFQL(); - assertTrue(FullQueryLogger.instance.enabled()); - FullQueryLogger.instance.reset(tempDir.toString()); - assertFalse(FullQueryLogger.instance.enabled()); - } - - @Test - public void testEnabledStop() throws Exception - { - assertFalse(FullQueryLogger.instance.enabled()); - configureFQL(); - assertTrue(FullQueryLogger.instance.enabled()); - FullQueryLogger.instance.stop(); - assertFalse(FullQueryLogger.instance.enabled()); - } - - /** - * Test that a thread will block if the FQL is over weight, and unblock once the backup is cleared - */ - @Test - public void testBlocking() throws Exception - { - configureFQL(); - //Prevent the bin log thread from making progress, causing the task queue to block - Semaphore blockBinLog = new Semaphore(0); - try - { - //Find out when the bin log thread has been blocked, necessary to not run into batch task drain behavior - Semaphore binLogBlocked = new Semaphore(0); - FullQueryLogger.instance.binLog.put(new WeighableMarshallableQuery("foo1", QueryOptions.DEFAULT, 1) - { - - public void writeMarshallable(WireOut wire) - { - //Notify that the bin log is blocking now - binLogBlocked.release(); - try - { - //Block the bin log thread so the task queue can be filled - blockBinLog.acquire(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - super.writeMarshallable(wire); - } - - public void release() - { - super.release(); - } - }); - - //Wait for the bin log thread to block so it can't batch drain tasks - Util.spinAssertEquals(true, binLogBlocked::tryAcquire, 60); - - //Now fill the task queue - logQuery("foo2"); - - //Start a thread to block waiting on the bin log queue - Thread t = new Thread(() -> - { - logQuery("foo3"); - //Should be able to log another query without an issue - logQuery("foo4"); - }); - t.start(); - Thread.sleep(500); - //If thread state is terminated then the thread started, finished, and didn't block on the full task queue - assertTrue(t.getState() != Thread.State.TERMINATED); - } - finally - { - //Unblock the binlog thread - blockBinLog.release(); - } - Util.spinAssertEquals(true, () -> checkForQueries(Arrays.asList("foo1", "foo2", "foo3", "foo4")), 60); - } - - private boolean checkForQueries(List<String> queries) - { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) - { - ExcerptTailer tailer = queue.createTailer(); - List<String> expectedQueries = new LinkedList<>(queries); - while (!expectedQueries.isEmpty()) - { - if (!tailer.readDocument(wire -> { - assertEquals(expectedQueries.get(0), wire.read("query").text()); - expectedQueries.remove(0); - })) - { - return false; - } - } - assertFalse(tailer.readDocument(wire -> {})); - return true; - } - } - - @Test - public void testNonBlocking() throws Exception - { - FullQueryLogger.instance.configure(tempDir, "TEST_SECONDLY", false, 1, 1024 * 1024 * 256); - //Prevent the bin log thread from making progress, causing the task queue to refuse tasks - Semaphore blockBinLog = new Semaphore(0); - try - { - //Find out when the bin log thread has been blocked, necessary to not run into batch task drain behavior - Semaphore binLogBlocked = new Semaphore(0); - FullQueryLogger.instance.binLog.put(new WeighableMarshallableQuery("foo1", QueryOptions.DEFAULT, 1) - { - - public void writeMarshallable(WireOut wire) - { - //Notify that the bin log is blocking now - binLogBlocked.release(); - try - { - //Block the bin log thread so the task queue can be filled - blockBinLog.acquire(); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - super.writeMarshallable(wire); - } - - public void release() - { - super.release(); - } - }); - - //Wait for the bin log thread to block so it can't batch drain tasks - Util.spinAssertEquals(true, binLogBlocked::tryAcquire, 60); - - //Now fill the task queue - logQuery("foo2"); - - //This sample should get dropped AKA released without being written - AtomicInteger releasedCount = new AtomicInteger(0); - AtomicInteger writtenCount = new AtomicInteger(0); - FullQueryLogger.instance.logRecord(new WeighableMarshallableQuery("foo3", QueryOptions.DEFAULT, 1) { - public void writeMarshallable(WireOut wire) - { - writtenCount.incrementAndGet(); - super.writeMarshallable(wire); - } - - public void release() - { - releasedCount.incrementAndGet(); - super.release(); - } - }, FullQueryLogger.instance.binLog); - - Util.spinAssertEquals(1, releasedCount::get, 60); - assertEquals(0, writtenCount.get()); - } - finally - { - blockBinLog.release(); - } - //Wait for tasks to drain so there should be space in the queue - Util.spinAssertEquals(true, () -> checkForQueries(Arrays.asList("foo1", "foo2")), 60); - //Should be able to log again - logQuery("foo4"); - Util.spinAssertEquals(true, () -> checkForQueries(Arrays.asList("foo1", "foo2", "foo4")), 60); - } - - @Test - public void testRoundTripQuery() throws Exception - { - configureFQL(); - logQuery("foo"); - Util.spinAssertEquals(true, () -> checkForQueries(Arrays.asList("foo")), 60); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) - { - ExcerptTailer tailer = queue.createTailer(); - assertTrue(tailer.readDocument(wire -> { - assertEquals("single", wire.read("type").text()); - ProtocolVersion protocolVersion = ProtocolVersion.decode(wire.read("protocol-version").int32()); - assertEquals(ProtocolVersion.CURRENT, protocolVersion); - QueryOptions queryOptions = QueryOptions.codec.decode(Unpooled.wrappedBuffer(wire.read("query-options").bytes()), protocolVersion); - compareQueryOptions(QueryOptions.DEFAULT, queryOptions); - assertEquals(1L, wire.read("query-time").int64()); - assertEquals("foo", wire.read("query").text()); - })); - } - } - - @Test - public void testRoundTripBatch() throws Exception - { - configureFQL(); - FullQueryLogger.instance.logBatch("UNLOGGED", Arrays.asList("foo1", "foo2"), Arrays.asList(Arrays.asList(ByteBuffer.allocate(1) , ByteBuffer.allocateDirect(2)), Arrays.asList()), QueryOptions.DEFAULT, 1); - Util.spinAssertEquals(true, () -> - { - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) - { - return queue.createTailer().readingDocument().isPresent(); - } - }, 60); - try (ChronicleQueue queue = ChronicleQueueBuilder.single(tempDir.toFile()).rollCycle(RollCycles.TEST_SECONDLY).build()) - { - ExcerptTailer tailer = queue.createTailer(); - assertTrue(tailer.readDocument(wire -> { - assertEquals("batch", wire.read("type").text()); - ProtocolVersion protocolVersion = ProtocolVersion.decode(wire.read("protocol-version").int32()); - assertEquals(ProtocolVersion.CURRENT, protocolVersion); - QueryOptions queryOptions = QueryOptions.codec.decode(Unpooled.wrappedBuffer(wire.read("query-options").bytes()), protocolVersion); - assertEquals(1L, wire.read("query-time").int64()); - compareQueryOptions(QueryOptions.DEFAULT, queryOptions); - assertEquals("UNLOGGED", wire.read("batch-type").text()); - ValueIn in = wire.read("queries"); - assertEquals(2, in.int32()); - assertEquals("foo1", in.text()); - assertEquals("foo2", in.text()); - in = wire.read("values"); - assertEquals(2, in.int32()); - assertEquals(2, in.int32()); - assertTrue(Arrays.equals(new byte[1], in.bytes())); - assertTrue(Arrays.equals(new byte[2], in.bytes())); - assertEquals(0, in.int32()); - })); - } - } - - @Test - public void testQueryWeight() - { - //Empty query should have some weight - WeighableMarshallableQuery query = new WeighableMarshallableQuery("", QueryOptions.DEFAULT, 1); - assertTrue(query.weight() >= 95); - - StringBuilder sb = new StringBuilder(); - for (int ii = 0; ii < 1024 * 1024; ii++) - { - sb.append('a'); - } - query = new WeighableMarshallableQuery(sb.toString(), QueryOptions.DEFAULT, 1); - - //A large query should be reflected in the size, * 2 since characters are still two bytes - assertTrue(query.weight() > ObjectSizes.measureDeep(sb.toString())); - - //Large query options should be reflected - QueryOptions largeOptions = QueryOptions.forInternalCalls(Arrays.asList(ByteBuffer.allocate(1024 * 1024))); - query = new WeighableMarshallableQuery("", largeOptions, 1); - assertTrue(query.weight() > 1024 * 1024); - System.out.printf("weight %d%n", query.weight()); - } - - @Test - public void testBatchWeight() - { - //An empty batch should have weight - WeighableMarshallableBatch batch = new WeighableMarshallableBatch("", new ArrayList<>(), new ArrayList<>(), QueryOptions.DEFAULT, 1); - assertTrue(batch.weight() >= 183); - - StringBuilder sb = new StringBuilder(); - for (int ii = 0; ii < 1024 * 1024; ii++) - { - sb.append('a'); - } - - //The weight of the type string should be reflected - batch = new WeighableMarshallableBatch(sb.toString(), new ArrayList<>(), new ArrayList<>(), QueryOptions.DEFAULT, 1); - assertTrue(batch.weight() > ObjectSizes.measureDeep(sb.toString())); - - //The weight of the list containing queries should be reflected - List<String> bigList = new ArrayList(100000); - for (int ii = 0; ii < 100000; ii++) - { - bigList.add(""); - } - batch = new WeighableMarshallableBatch("", bigList, new ArrayList<>(), QueryOptions.DEFAULT, 1); - assertTrue(batch.weight() > ObjectSizes.measureDeep(bigList)); - - //The size of the query should be reflected - bigList = new ArrayList(1); - bigList.add(sb.toString()); - batch = new WeighableMarshallableBatch("", bigList, new ArrayList<>(), QueryOptions.DEFAULT, 1); - assertTrue(batch.weight() > ObjectSizes.measureDeep(bigList)); - - bigList = null; - //The size of the list of values should be reflected - List<List<ByteBuffer>> bigValues = new ArrayList<>(100000); - for (int ii = 0; ii < 100000; ii++) - { - bigValues.add(new ArrayList<>(0)); - } - bigValues.get(0).add(ByteBuffer.allocate(1024 * 1024 * 5)); - batch = new WeighableMarshallableBatch("", new ArrayList<>(), bigValues, QueryOptions.DEFAULT, 1); - assertTrue(batch.weight() > ObjectSizes.measureDeep(bigValues)); - - //As should the size of the values - QueryOptions largeOptions = QueryOptions.forInternalCalls(Arrays.asList(ByteBuffer.allocate(1024 * 1024))); - batch = new WeighableMarshallableBatch("", new ArrayList<>(), new ArrayList<>(), largeOptions, 1); - assertTrue(batch.weight() > 1024 * 1024); - } - - @Test(expected = NullPointerException.class) - public void testLogBatchNullType() throws Exception - { - FullQueryLogger.instance.logBatch(null, new ArrayList<>(), new ArrayList<>(), QueryOptions.DEFAULT, 1); - } - - @Test(expected = NullPointerException.class) - public void testLogBatchNullQueries() throws Exception - { - FullQueryLogger.instance.logBatch("", null, new ArrayList<>(), QueryOptions.DEFAULT, 1); - } - - @Test(expected = NullPointerException.class) - public void testLogBatchNullQueriesQuery() throws Exception - { - configureFQL(); - FullQueryLogger.instance.logBatch("", Arrays.asList((String)null), new ArrayList<>(), QueryOptions.DEFAULT, 1); - } - - @Test(expected = NullPointerException.class) - public void testLogBatchNullValues() throws Exception - { - FullQueryLogger.instance.logBatch("", new ArrayList<>(), null, QueryOptions.DEFAULT, 1); - } - - @Test(expected = NullPointerException.class) - public void testLogBatchNullValuesValue() throws Exception - { - FullQueryLogger.instance.logBatch("", new ArrayList<>(), Arrays.asList((List<ByteBuffer>)null), null, 1); - } - - @Test(expected = NullPointerException.class) - public void testLogBatchNullQueryOptions() throws Exception - { - FullQueryLogger.instance.logBatch("", new ArrayList<>(), new ArrayList<>(), null, 1); - } - - @Test(expected = IllegalArgumentException.class) - public void testLogBatchNegativeTime() throws Exception - { - FullQueryLogger.instance.logBatch("", new ArrayList<>(), new ArrayList<>(), QueryOptions.DEFAULT, -1); - } - - @Test(expected = NullPointerException.class) - public void testLogQueryNullQuery() throws Exception - { - FullQueryLogger.instance.logQuery(null, QueryOptions.DEFAULT, 1); - } - - @Test(expected = NullPointerException.class) - public void testLogQueryNullQueryOptions() throws Exception - { - FullQueryLogger.instance.logQuery("", null, 1); - } - - @Test(expected = IllegalArgumentException.class) - public void testLogQueryNegativeTime() throws Exception - { - FullQueryLogger.instance.logQuery("", QueryOptions.DEFAULT, -1); - } - - private static void compareQueryOptions(QueryOptions a, QueryOptions b) - { - assertEquals(a.getClass(), b.getClass()); - assertEquals(a.getProtocolVersion(), b.getProtocolVersion()); - assertEquals(a.getPageSize(), b.getPageSize()); - assertEquals(a.getConsistency(), b.getConsistency()); - assertEquals(a.getPagingState(), b.getPagingState()); - assertEquals(a.getValues(), b.getValues()); - assertEquals(a.getSerialConsistency(), b.getSerialConsistency()); - } - - private void configureFQL() throws Exception - { - FullQueryLogger.instance.configure(tempDir, "TEST_SECONDLY", true, 1, 1024 * 1024 * 256); - } - - private void logQuery(String query) - { - FullQueryLogger.instance.logQuery(query, QueryOptions.DEFAULT, 1); - } - -} - http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56871b8/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java index 8c4f5f6..e4ecbea 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -34,6 +34,7 @@ import org.junit.runner.RunWith; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.audit.AuditLogManager; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.Gossiper; @@ -618,4 +619,31 @@ public class StorageServiceServerTest Gossiper.instance.getEndpointStateForEndpoint(internalAddress).addApplicationState(ApplicationState.NATIVE_ADDRESS_AND_PORT, valueFactory.nativeaddressAndPort(InetAddressAndPort.getByName("127.0.0.3:666"))); assertEquals("127.0.0.3:666", StorageService.instance.getNativeaddress(internalAddress, true)); } + + @Test(expected = IllegalStateException.class) + public void testAuditLogEnableLoggerNotFound() throws Exception + { + StorageService.instance.enableAuditLog(null, null, null, null, null, null, null); + assertTrue(AuditLogManager.getInstance().isAuditingEnabled()); + StorageService.instance.enableAuditLog("foobar", null, null, null, null, null, null); + } + + @Test + public void testAuditLogEnableLoggerTransitions() throws Exception + { + StorageService.instance.enableAuditLog(null, null, null, null, null, null, null); + assertTrue(AuditLogManager.getInstance().isAuditingEnabled()); + + try + { + StorageService.instance.enableAuditLog("foobar", null, null, null, null, null, null); + } + catch (ConfigurationException | IllegalStateException e) + { + e.printStackTrace(); + } + + StorageService.instance.enableAuditLog(null, null, null, null, null, null, null); + assertTrue(AuditLogManager.getInstance().isAuditingEnabled()); + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56871b8/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java b/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java index 204e27b..64b0d4f 100644 --- a/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java +++ b/test/unit/org/apache/cassandra/utils/binlog/BinLogTest.java @@ -114,7 +114,7 @@ public class BinLogTest AtomicInteger releaseCount = new AtomicInteger(); binLog.put(new BinLog.ReleaseableWriteMarshallable() { - protected void release() + public void release() { releaseCount.incrementAndGet(); } @@ -139,7 +139,7 @@ public class BinLogTest } - protected void release() + public void release() { releaseCount.incrementAndGet(); } @@ -174,7 +174,7 @@ public class BinLogTest Semaphore released = new Semaphore(0); binLog.sampleQueue.put(new BinLog.ReleaseableWriteMarshallable() { - protected void release() + public void release() { released.release(); } @@ -220,7 +220,7 @@ public class BinLogTest { binLog.put(new BinLog.ReleaseableWriteMarshallable() { - protected void release() + public void release() { } @@ -296,7 +296,7 @@ public class BinLogTest { assertTrue(binLog.offer(new BinLog.ReleaseableWriteMarshallable() { - protected void release() + public void release() { } @@ -412,7 +412,7 @@ public class BinLogTest { return new BinLog.ReleaseableWriteMarshallable() { - protected void release() + public void release() { //Do nothing } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
