timoninmaxim commented on code in PR #10263:
URL: https://github.com/apache/ignite/pull/10263#discussion_r985502301
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java:
##########
@@ -1123,6 +1241,31 @@ public List<String> localSnapshotNames() {
}
}
+ /**
+ * @param snpName Full snapshot name.
+ * @return List of
Review Comment:
Wrong javadocs
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java:
##########
@@ -1123,6 +1241,31 @@ public List<String> localSnapshotNames() {
}
}
+ /**
+ * @param snpName Full snapshot name.
+ * @return List of
+ */
+ private int maxLocalIncrementSnapshot(String snpName, @Nullable String
snpPath) throws IgniteCheckedException {
Review Comment:
no need throw Exception
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotMetadata.java:
##########
@@ -0,0 +1,106 @@
+/*
+ * 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.processors.cache.persistence.snapshot;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.UUID;
+import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
+/**
+ * Incremental snapshot metadata file.
+ *
+ * @see IgniteSnapshotManager#createIncrementalSnapshot(String)
+ */
+public class IncrementalSnapshotMetadata implements Serializable {
+ /** Serial version uid. */
+ private static final long serialVersionUID = 0L;
+
+ /** Unique snapshot request id. */
+ private final UUID rqId;
+
+ /** Snapshot name. */
+ private final String snpName;
+
+ /** Increment index. */
Review Comment:
Also timestamp as attribute must be present. And showed in snapshot view.
##########
modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java:
##########
@@ -3364,6 +3364,30 @@ public static String readableSize(long bytes, boolean
si) {
return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
}
+ /**
+ * Generates file name from index.
+ *
+ * @param idx Index.
+ * @param len Length of the name.
+ * @param ext Optional extension
+ * @return File name.
+ */
+ public static String fileName(long idx, int len, @Nullable String ext) {
Review Comment:
Let's make it method name more clear - walSegmentFileName?
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java:
##########
@@ -1602,10 +1761,21 @@ public IgniteFutureImpl<Void> createSnapshot(String
name, @Nullable String snpPa
Set<UUID> bltNodeIds =
new HashSet<>(F.viewReadOnly(srvNodes, F.node2id(), (node) ->
CU.baselineNode(node, clusterState)));
- startSnpProc.start(snpFut0.rqId,
- new SnapshotOperationRequest(snpFut0.rqId, cctx.localNodeId(),
name, snpPath, grps, bltNodeIds));
-
- String msg = "Cluster-wide snapshot operation started [snpName=" +
name + ", grps=" + grps + ']';
+ startSnpProc.start(snpFut0.rqId, new SnapshotOperationRequest(
+ snpFut0.rqId,
+ cctx.localNodeId(),
+ name,
+ snpPath,
+ grps,
+ bltNodeIds,
+ incremental,
+ incIdx
+ ));
+
+ String msg =
+ "Cluster-wide snapshot operation started [snpName=" + name +
", grps=" + grps +
+ (incremental ? "" : (", incremental=true, index=" + 0)) +
Review Comment:
incremental, index should be params
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java:
##########
@@ -1505,7 +1648,12 @@ public List<SnapshotMetadata>
readSnapshotMetadatas(String snpName, @Nullable St
/** {@inheritDoc} */
@Override public IgniteFuture<Void> createSnapshot(String name) {
- return createSnapshot(name, null);
+ return createSnapshot(name, null, false);
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteFuture<Void> createIncrementalSnapshot(String name)
{
+ return createSnapshot(name, null, true);
Review Comment:
Path to full snapshot also must be specified for incremental snapshot,
increments must be inside related snapshot directory.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
