rpuch commented on code in PR #5212:
URL: https://github.com/apache/ignite-3/pull/5212#discussion_r1955661047
##########
modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/snapshot/outgoing/OutgoingSnapshot.java:
##########
@@ -512,13 +514,20 @@ public boolean addRowIdToSkip(RowId rowId) {
public boolean alreadyPassed(int tableId, RowId rowId) {
assert mvOperationsLock.isLocked() : "MV operations lock must be
acquired!";
+ if (mvPartitionDeliveryState == null) {
+ // We haven't started sending MV data yet.
+ return false;
+ }
+
if (finishedMvData()) {
return true;
}
- return partitionDeliveryState != null
- && tableId <= partitionDeliveryState.currentTableId()
- && rowId.compareTo(partitionDeliveryState.currentRowId()) <= 0;
+ if (tableId == mvPartitionDeliveryState.currentTableId()) {
+ return rowId.compareTo(mvPartitionDeliveryState.currentRowId()) <=
0;
Review Comment:
Could you please add a comment saying that `currentRowId()` is already sent?
Previous version of the code operated with `lastRowId` variable that made this
obvious, but now it is not that obvious anymore
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/OutgoingPartitionSnapshotsCleaner.java:
##########
@@ -0,0 +1,28 @@
+/*
+ * 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.ignite.internal.table.distributed.raft.snapshot;
+
+/**
+ * Stops and cleans up outgoing snapshots for a partition.
+ */
+@FunctionalInterface
+public interface OutgoingPartitionSnapshotsCleaner {
Review Comment:
This interface is not used anywhere
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/SnapshotAwarePartitionDataStorage.java:
##########
@@ -194,21 +195,13 @@ private void handleSnapshotInterference(RowId rowId) {
@Override
public void close() {
- cleanupSnapshots();
- }
-
- private void cleanupSnapshots() {
- PartitionSnapshots partitionSnapshots = getPartitionSnapshots();
-
- partitionSnapshots.acquireReadLock();
-
- try {
- partitionSnapshots.ongoingSnapshots().forEach(snapshot ->
partitionsSnapshots.finishOutgoingSnapshot(snapshot.id()));
-
- partitionsSnapshots.removeSnapshots(partitionKey);
- } finally {
- partitionSnapshots.releaseReadLock();
+ if (partitionKey instanceof ZonePartitionKey) {
+ // This is a hack for the colocation feature, for zone-based
partitions snapshots are cleaned up for a bunch of storages at
Review Comment:
Would it make sense to add a TODO to remove the hack when we completely
switch to per-zone partitions?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
