You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by le...@apache.org on 2024/12/14 03:42:45 UTC
(flink-cdc) branch master updated: [FLINK-36891[[source-connector][mysql] Fix corrupted state in case of serialization failure in MySQL CDC Source
This is an automated email from the ASF dual-hosted git repository.
leonard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-cdc.git
The following commit(s) were added to refs/heads/master by this push:
new b50d1728e [FLINK-36891[[source-connector][mysql] Fix corrupted state in case of serialization failure in MySQL CDC Source
b50d1728e is described below
commit b50d1728e083c2364ae104c9050a4599d1301ab9
Author: Sergei Morozov <mo...@tut.by>
AuthorDate: Fri Dec 13 19:42:40 2024 -0800
[FLINK-36891[[source-connector][mysql] Fix corrupted state in case of serialization failure in MySQL CDC Source
This closes #3794.
---
.../state/PendingSplitsStateSerializer.java | 46 ++++++-----
.../state/PendingSplitsStateSerializerTest.java | 96 ++++++++++++++++++++++
.../state/PendingSplitsStateSerializer.java | 46 ++++++-----
.../state/PendingSplitsStateSerializerTest.java | 22 +++++
4 files changed, 168 insertions(+), 42 deletions(-)
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializer.java
index cc5fb3592..1ede00ebb 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializer.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializer.java
@@ -80,28 +80,32 @@ public class PendingSplitsStateSerializer implements SimpleVersionedSerializer<P
}
final DataOutputSerializer out = SERIALIZER_CACHE.get();
- out.writeInt(splitSerializer.getVersion());
- if (state instanceof SnapshotPendingSplitsState) {
- out.writeInt(SNAPSHOT_PENDING_SPLITS_STATE_FLAG);
- serializeSnapshotPendingSplitsState((SnapshotPendingSplitsState) state, out);
- } else if (state instanceof StreamPendingSplitsState) {
- out.writeInt(STREAM_PENDING_SPLITS_STATE_FLAG);
- serializeStreamPendingSplitsState((StreamPendingSplitsState) state, out);
- } else if (state instanceof HybridPendingSplitsState) {
- out.writeInt(HYBRID_PENDING_SPLITS_STATE_FLAG);
- serializeHybridPendingSplitsState((HybridPendingSplitsState) state, out);
- } else {
- throw new IOException(
- "Unsupported to serialize PendingSplitsState class: "
- + state.getClass().getName());
- }
+ try {
+ out.writeInt(splitSerializer.getVersion());
+ if (state instanceof SnapshotPendingSplitsState) {
+ out.writeInt(SNAPSHOT_PENDING_SPLITS_STATE_FLAG);
+ serializeSnapshotPendingSplitsState((SnapshotPendingSplitsState) state, out);
+ } else if (state instanceof StreamPendingSplitsState) {
+ out.writeInt(STREAM_PENDING_SPLITS_STATE_FLAG);
+ serializeStreamPendingSplitsState((StreamPendingSplitsState) state, out);
+ } else if (state instanceof HybridPendingSplitsState) {
+ out.writeInt(HYBRID_PENDING_SPLITS_STATE_FLAG);
+ serializeHybridPendingSplitsState((HybridPendingSplitsState) state, out);
+ } else {
+ throw new IOException(
+ "Unsupported to serialize PendingSplitsState class: "
+ + state.getClass().getName());
+ }
+
+ final byte[] result = out.getCopyOfBuffer();
+ // optimization: cache the serialized from, so we avoid the byte work during repeated
+ // serialization
+ state.serializedFormCache = result;
- final byte[] result = out.getCopyOfBuffer();
- // optimization: cache the serialized from, so we avoid the byte work during repeated
- // serialization
- state.serializedFormCache = result;
- out.clear();
- return result;
+ return result;
+ } finally {
+ out.clear();
+ }
}
@Override
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java
new file mode 100644
index 000000000..b31f31013
--- /dev/null
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.flink.cdc.connectors.base.source.assigner.state;
+
+import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset;
+import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory;
+import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitSerializer;
+
+import io.debezium.relational.TableId;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Map;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
+
+/** Tests for {@link PendingSplitsStateSerializer}. */
+public class PendingSplitsStateSerializerTest {
+
+ private final TableId tableId = TableId.parse("catalog.schema.table1");
+
+ @Test
+ public void testOutputIsFinallyCleared() throws Exception {
+ PendingSplitsStateSerializer serializer =
+ new PendingSplitsStateSerializer(constructSourceSplitSerializer());
+ StreamPendingSplitsState state = new StreamPendingSplitsState(true);
+
+ final byte[] ser1 = serializer.serialize(state);
+ state.serializedFormCache = null;
+
+ PendingSplitsState unsupportedState = new UnsupportedPendingSplitsState();
+
+ assertThrows(IOException.class, () -> serializer.serialize(unsupportedState));
+
+ final byte[] ser2 = serializer.serialize(state);
+ assertArrayEquals(ser1, ser2);
+ }
+
+ private SourceSplitSerializer constructSourceSplitSerializer() {
+ return new SourceSplitSerializer() {
+ @Override
+ public OffsetFactory getOffsetFactory() {
+ return new OffsetFactory() {
+ @Override
+ public Offset newOffset(Map<String, String> offset) {
+ return null;
+ }
+
+ @Override
+ public Offset newOffset(String filename, Long position) {
+ return null;
+ }
+
+ @Override
+ public Offset newOffset(Long position) {
+ return null;
+ }
+
+ @Override
+ public Offset createTimestampOffset(long timestampMillis) {
+ return null;
+ }
+
+ @Override
+ public Offset createInitialOffset() {
+ return null;
+ }
+
+ @Override
+ public Offset createNoStoppingOffset() {
+ return null;
+ }
+ };
+ }
+ };
+ }
+
+ /** An implementation for {@link PendingSplitsState} which will cause a serialization error. */
+ static class UnsupportedPendingSplitsState extends PendingSplitsState {}
+}
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java
index 2793702e8..ca5f377d0 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java
@@ -72,28 +72,32 @@ public class PendingSplitsStateSerializer implements SimpleVersionedSerializer<P
}
final DataOutputSerializer out = SERIALIZER_CACHE.get();
- out.writeInt(splitSerializer.getVersion());
- if (state instanceof SnapshotPendingSplitsState) {
- out.writeInt(SNAPSHOT_PENDING_SPLITS_STATE_FLAG);
- serializeSnapshotPendingSplitsState((SnapshotPendingSplitsState) state, out);
- } else if (state instanceof BinlogPendingSplitsState) {
- out.writeInt(BINLOG_PENDING_SPLITS_STATE_FLAG);
- serializeBinlogPendingSplitsState((BinlogPendingSplitsState) state, out);
- } else if (state instanceof HybridPendingSplitsState) {
- out.writeInt(HYBRID_PENDING_SPLITS_STATE_FLAG);
- serializeHybridPendingSplitsState((HybridPendingSplitsState) state, out);
- } else {
- throw new IOException(
- "Unsupported to serialize PendingSplitsState class: "
- + state.getClass().getName());
- }
+ try {
+ out.writeInt(splitSerializer.getVersion());
+ if (state instanceof SnapshotPendingSplitsState) {
+ out.writeInt(SNAPSHOT_PENDING_SPLITS_STATE_FLAG);
+ serializeSnapshotPendingSplitsState((SnapshotPendingSplitsState) state, out);
+ } else if (state instanceof BinlogPendingSplitsState) {
+ out.writeInt(BINLOG_PENDING_SPLITS_STATE_FLAG);
+ serializeBinlogPendingSplitsState((BinlogPendingSplitsState) state, out);
+ } else if (state instanceof HybridPendingSplitsState) {
+ out.writeInt(HYBRID_PENDING_SPLITS_STATE_FLAG);
+ serializeHybridPendingSplitsState((HybridPendingSplitsState) state, out);
+ } else {
+ throw new IOException(
+ "Unsupported to serialize PendingSplitsState class: "
+ + state.getClass().getName());
+ }
+
+ final byte[] result = out.getCopyOfBuffer();
+ // optimization: cache the serialized from, so we avoid the byte work during repeated
+ // serialization
+ state.serializedFormCache = result;
- final byte[] result = out.getCopyOfBuffer();
- // optimization: cache the serialized from, so we avoid the byte work during repeated
- // serialization
- state.serializedFormCache = result;
- out.clear();
- return result;
+ return result;
+ } finally {
+ out.clear();
+ }
}
@Override
diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java
index db0757f47..c9ea4c8af 100644
--- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java
+++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java
@@ -33,6 +33,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -42,8 +43,10 @@ import java.util.List;
import java.util.Map;
import static org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit.generateSplitId;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
/**
* Tests for {@link
@@ -102,6 +105,22 @@ public class PendingSplitsStateSerializerTest {
assertSame(ser1, ser3);
}
+ @Test
+ public void testOutputIsFinallyCleared() throws Exception {
+ final PendingSplitsStateSerializer serializer =
+ new PendingSplitsStateSerializer(MySqlSplitSerializer.INSTANCE);
+
+ final byte[] ser1 = serializer.serialize(state);
+ state.serializedFormCache = null;
+
+ PendingSplitsState unsupportedState = new UnsupportedPendingSplitsState();
+
+ assertThrows(IOException.class, () -> serializer.serialize(unsupportedState));
+
+ final byte[] ser2 = serializer.serialize(state);
+ assertArrayEquals(ser1, ser2);
+ }
+
static PendingSplitsState serializeAndDeserializeSourceEnumState(PendingSplitsState state)
throws Exception {
final PendingSplitsStateSerializer serializer =
@@ -270,4 +289,7 @@ public class PendingSplitsStateSerializerTest {
throw new UnsupportedOperationException("Not implemented.");
}
}
+
+ /** An implementation for {@link PendingSplitsState} which will cause a serialization error. */
+ static class UnsupportedPendingSplitsState extends PendingSplitsState {}
}