-
Notifications
You must be signed in to change notification settings - Fork 34
CASSANALYTICS-196: Skip CDC-irrelevant mutations on deserialization failure #241
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.
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
base: trunk
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,9 @@ | |
| import org.apache.cassandra.io.util.FileDataInput; | ||
| import org.apache.cassandra.io.util.RandomAccessReader; | ||
| import org.apache.cassandra.io.util.RebufferingInputStream; | ||
| import org.apache.cassandra.schema.Schema; | ||
| import org.apache.cassandra.schema.TableId; | ||
| import org.apache.cassandra.schema.TableMetadata; | ||
| import org.apache.cassandra.spark.exceptions.TransportFailureException; | ||
| import org.apache.cassandra.spark.utils.AsyncExecutor; | ||
| import org.apache.cassandra.spark.utils.LoggerHelper; | ||
|
|
@@ -567,6 +570,16 @@ private void readMutationInternal(byte[] inputBuffer, | |
| catch (Throwable t) | ||
| { | ||
| JVMStabilityInspector.inspectThrowable(t); | ||
|
|
||
| if (failedMutationHasNoCdcTable(inputBuffer, size)) | ||
| { | ||
| // No CDC-enabled table is involved – safe to skip and move on | ||
| logger.trace("Ignoring mutation that failed to deserialize; no CDC-enabled table involved", "error", t); | ||
| stats.mutationsDeserializeFailedNonCdcCount(1); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| Path p = Files.createTempFile("mutation", "dat"); | ||
|
|
||
| try (DataOutputStream out = new DataOutputStream(Files.newOutputStream(p))) | ||
|
|
@@ -604,6 +617,45 @@ private void readMutationInternal(byte[] inputBuffer, | |
| this.handleMutation(mutation, size, mutationPosition, desc); | ||
| } | ||
|
|
||
| /** | ||
| * Best-effort check for whether a mutation that failed to deserialize is guaranteed not to involve any | ||
| * CDC-enabled table, so the failure can be safely ignored. | ||
| * Only reads the first {@link TableId} to make the decision, as mutations contain single partition update in most cases. | ||
| * If a mutation has more than one partition update, it conservatively assumes a CDC-enabled table is involved. | ||
| * | ||
| * @param inputBuffer raw byte array w/Mutation data | ||
| * @param size serialized size of the mutation | ||
| * @return false if the first table touched by the mutation is confirmed CDC-enabled, or the mutation has more | ||
| * than one {@link PartitionUpdate} (so the rest can't be safely checked); true otherwise, including | ||
| * when the table's metadata can't be found, or even the first {@link TableId} can't be read | ||
| */ | ||
| @VisibleForTesting | ||
| static boolean failedMutationHasNoCdcTable(byte[] inputBuffer, int size) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe it is just me, but I tend to not like the negative on method names. HasNo + false is what we are looking for here -> that double negative always messes my head :-P What do you think on having a failedMutationHasCdcTable method instead that returns true if it needs to be handled, and false if it needs to be ignored? Obviously not a blocker. |
||
| { | ||
| try (DataInputBuffer in = new DataInputBuffer(inputBuffer, 0, size)) | ||
| { | ||
| int updateCount = (int) in.readUnsignedVInt(); | ||
| TableId tableId = TableId.deserialize(in); | ||
| TableMetadata metadata = Schema.instance.getTableMetadata(tableId); | ||
| if (metadata != null && metadata.params.cdc) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| if (updateCount > 1) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can't we check this before we need to extract the tableId and the metadata? (just at line 638) |
||
| { | ||
| // Can't safely reach the remaining updates' TableIds without deserializing this update's body, | ||
| // conservatively assume it may involve a CDC-enabled table. | ||
| return false; | ||
| } | ||
| } | ||
| catch (Throwable t) | ||
| { | ||
| // unable to read the first TableId | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public void close() | ||
| { | ||
| if (updates == null) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /* | ||
| * 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.util.UUID; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import org.apache.cassandra.bridge.CassandraBridgeImplementation; | ||
| import org.apache.cassandra.cql3.CQLFragmentParser; | ||
| import org.apache.cassandra.cql3.CqlParser; | ||
| import org.apache.cassandra.db.Keyspace; | ||
| import org.apache.cassandra.io.util.DataOutputBuffer; | ||
| import org.apache.cassandra.schema.KeyspaceMetadata; | ||
| import org.apache.cassandra.schema.KeyspaceParams; | ||
| import org.apache.cassandra.schema.Schema; | ||
| import org.apache.cassandra.schema.TableId; | ||
| import org.apache.cassandra.schema.TableMetadata; | ||
| import org.apache.cassandra.schema.Types; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class BufferingCommitLogReaderTableContextTests | ||
| { | ||
| @Test | ||
| public void testFailedMutationHasNoCdcTableWhenNonCdcTableIdReadableButRestCorrupted() throws Exception | ||
| { | ||
| TableId tableId = registerTable("ks_non_cdc", "tbl", false); | ||
| byte[] corruptedMutation = buildCorruptedMutation(1, tableId); | ||
|
|
||
| boolean failedMutationHasNoCdcTable = BufferingCommitLogReader.failedMutationHasNoCdcTable(corruptedMutation, | ||
| corruptedMutation.length); | ||
|
|
||
| assertThat(failedMutationHasNoCdcTable).isTrue(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFailedMutationHasNoCdcTableWhenCdcTableIdReadableButRestCorrupted() throws Exception | ||
| { | ||
| TableId tableId = registerTable("ks_cdc", "tbl", true); | ||
| byte[] corruptedMutation = buildCorruptedMutation(1, tableId); | ||
|
|
||
| boolean failedMutationHasNoCdcTable = BufferingCommitLogReader.failedMutationHasNoCdcTable(corruptedMutation, | ||
| corruptedMutation.length); | ||
|
|
||
| assertThat(failedMutationHasNoCdcTable).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFailedMutationHasNoCdcTableWhenTableIdUnresolvable() throws Exception | ||
| { | ||
| CassandraBridgeImplementation.setup(); | ||
| TableId unknownTableId = TableId.fromUUID(UUID.randomUUID()); | ||
|
Comment on lines
+69
to
+70
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: Maybe move these two to a helper getUnregisteredTable method? |
||
| byte[] corruptedMutation = buildCorruptedMutation(1, unknownTableId); | ||
|
|
||
| boolean failedMutationHasNoCdcTable = BufferingCommitLogReader.failedMutationHasNoCdcTable(corruptedMutation, | ||
| corruptedMutation.length); | ||
|
|
||
| // an unresolvable table is treated as not CDC-enabled | ||
| assertThat(failedMutationHasNoCdcTable).isTrue(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFailedMutationHasNoCdcTableWhenMultipleUpdatesEvenIfFirstIsNonCdc() throws Exception | ||
| { | ||
| TableId tableId = registerTable("ks_non_cdc_multi", "tbl", false); | ||
| byte[] corruptedMutation = buildCorruptedMutation(2, tableId); | ||
|
|
||
| boolean failedMutationHasNoCdcTable = BufferingCommitLogReader.failedMutationHasNoCdcTable(corruptedMutation, | ||
| corruptedMutation.length); | ||
|
|
||
| // can't safely check the remaining update(s) without deserializing this one's body, so this is | ||
| // conservatively treated as possibly involving a CDC-enabled table | ||
| assertThat(failedMutationHasNoCdcTable).isFalse(); | ||
| } | ||
|
|
||
| private TableId registerTable(String keyspaceName, String tableName, boolean cdc) | ||
| { | ||
| CassandraBridgeImplementation.setup(); | ||
| KeyspaceMetadata keyspaceMetadata = KeyspaceMetadata.create(keyspaceName, KeyspaceParams.simple(1)); | ||
| Schema.instance.load(keyspaceMetadata); | ||
| Keyspace.openWithoutSSTables(keyspaceName); | ||
|
|
||
| String createTableStatement = "CREATE TABLE " + keyspaceName + "." + tableName + " (pk int PRIMARY KEY)" | ||
| + (cdc ? " WITH cdc = true" : ""); | ||
| TableMetadata tableMetadata = CQLFragmentParser | ||
| .parseAny(CqlParser::createTableStatement, createTableStatement, "CREATE TABLE") | ||
| .keyspace(keyspaceName) | ||
| .prepare(null) | ||
| .builder(Types.none()) | ||
| .build(); | ||
| KeyspaceMetadata keyspace = Schema.instance.getKeyspaceMetadata(keyspaceName); | ||
| Schema.instance.load(keyspace.withSwapped(keyspace.tables.with(tableMetadata))); | ||
| return tableMetadata.id; | ||
| } | ||
|
|
||
| // Builds a mutation buffer by hand: a valid header (vint update count, followed by the real TableId of the | ||
| // first update) followed by garbage bytes standing in for a partition update body that fails to deserialize | ||
| // (e.g. due to a schema mismatch). The checksum in BufferingCommitLogReader already guarantees these bytes | ||
| // aren't randomly corrupted, so this reproduces a mutation whose first TableId is intact but whose body | ||
| // cannot be parsed. | ||
| private byte[] buildCorruptedMutation(int updateCount, TableId firstTableId) throws Exception | ||
| { | ||
| try (DataOutputBuffer out = new DataOutputBuffer()) | ||
| { | ||
| out.writeUnsignedVInt(updateCount); | ||
| firstTableId.serialize(out); | ||
| out.write(new byte[]{(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF}); | ||
| return out.toByteArray(); | ||
| } | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is scary that this new behavior doesn't break a pre-existing test :-(