AngersZhuuuu commented on code in PR #2547:
URL: https://github.com/apache/celeborn/pull/2547#discussion_r1635761428
##########
master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/StateMachine.java:
##########
@@ -114,6 +98,7 @@ public void initialize(RaftServer server, RaftGroupId id,
RaftStorage raftStorag
public void reinitialize() throws IOException {
LOG.info("Reinitializing state machine.");
getLifeCycle().compareAndTransition(PAUSED, STARTING);
+ storage.refreshLatestSnapshot();
Review Comment:
Remove this
##########
master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/CelebornStateMachineStorage.java:
##########
@@ -0,0 +1,219 @@
+/*
+ * 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.celeborn.service.deploy.master.clustermeta.ha;
+
+import static org.apache.ratis.util.MD5FileUtil.MD5_SUFFIX;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.ratis.io.MD5Hash;
+import org.apache.ratis.server.storage.FileInfo;
+import org.apache.ratis.server.storage.RaftStorage;
+import org.apache.ratis.statemachine.SnapshotRetentionPolicy;
+import org.apache.ratis.statemachine.StateMachineStorage;
+import org.apache.ratis.statemachine.impl.SingleFileSnapshotInfo;
+import org.apache.ratis.util.FileUtils;
+import org.apache.ratis.util.MD5FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Copy from org.apache.ratis.statemachine.impl.SimpleStateMachineStorage, We
need to refresh latest
+ * snapshot after install snapshot from leader which makes StateMachine load
latest snapshot
+ * correctly.
+ */
+public class CelebornStateMachineStorage implements StateMachineStorage {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(CelebornStateMachineStorage.class);
+
+ static final String SNAPSHOT_FILE_PREFIX = "snapshot";
+ /** snapshot.term_index */
+ public static final Pattern SNAPSHOT_REGEX =
+ Pattern.compile(SNAPSHOT_FILE_PREFIX + "\\.(\\d+)_(\\d+)");
+
+ public static final Pattern SNAPSHOT_MD5_REGEX =
+ Pattern.compile(SNAPSHOT_FILE_PREFIX + "\\.(\\d+)_(\\d+)" + MD5_SUFFIX);
+ private static final DirectoryStream.Filter<Path> SNAPSHOT_MD5_FILTER =
+ entry ->
+ Optional.ofNullable(entry.getFileName())
+ .map(Path::toString)
+ .map(SNAPSHOT_MD5_REGEX::matcher)
+ .filter(Matcher::matches)
+ .isPresent();
+
+ private volatile File stateMachineDir = null;
+ private final AtomicReference<SingleFileSnapshotInfo> latestSnapshot = new
AtomicReference<>();
+
+ File tmpDir = null;
+
+ @Override
+ public void init(RaftStorage storage) throws IOException {
+ this.stateMachineDir = storage.getStorageDir().getStateMachineDir();
+ getLatestSnapshot();
+ tmpDir = storage.getStorageDir().getTmpDir();
+ }
+
+ @Override
+ public void format() throws IOException {
+ // TODO
+ }
+
+ static List<SingleFileSnapshotInfo> getSingleFileSnapshotInfos(Path dir)
throws IOException {
+ final List<SingleFileSnapshotInfo> infos = new ArrayList<>();
+ try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+ for (Path path : stream) {
+ final Path filename = path.getFileName();
+ if (filename != null) {
+ final Matcher matcher = SNAPSHOT_REGEX.matcher(filename.toString());
+ if (matcher.matches()) {
+ final long term = Long.parseLong(matcher.group(1));
+ final long index = Long.parseLong(matcher.group(2));
+ final FileInfo fileInfo = new FileInfo(path, null); // No
FileDigest here.
+ infos.add(new SingleFileSnapshotInfo(fileInfo, term, index));
+ }
+ }
+ }
+ }
+ return infos;
+ }
+
+ @Override
+ public void cleanupOldSnapshots(SnapshotRetentionPolicy
snapshotRetentionPolicy)
+ throws IOException {
+ if (stateMachineDir == null) {
+ return;
+ }
+
+ final int numSnapshotsRetained =
+ Optional.ofNullable(snapshotRetentionPolicy)
+ .map(SnapshotRetentionPolicy::getNumSnapshotsRetained)
+ .orElse(SnapshotRetentionPolicy.DEFAULT_ALL_SNAPSHOTS_RETAINED);
+ if (numSnapshotsRetained <= 0) {
+ return;
+ }
+
+ final List<SingleFileSnapshotInfo> allSnapshotFiles =
+ getSingleFileSnapshotInfos(stateMachineDir.toPath());
+
+ if (allSnapshotFiles.size() >
snapshotRetentionPolicy.getNumSnapshotsRetained()) {
+
allSnapshotFiles.sort(Comparator.comparing(SingleFileSnapshotInfo::getIndex).reversed());
+ allSnapshotFiles.subList(numSnapshotsRetained,
allSnapshotFiles.size()).stream()
+ .map(SingleFileSnapshotInfo::getFile)
+ .map(FileInfo::getPath)
+ .forEach(
+ snapshotPath -> {
+ LOG.info("Deleting old snapshot at {}",
snapshotPath.toAbsolutePath());
+ FileUtils.deletePathQuietly(snapshotPath);
+ });
+ // clean up the md5 files if the corresponding snapshot file does not
exist
+ try (DirectoryStream<Path> stream =
+ Files.newDirectoryStream(stateMachineDir.toPath(),
SNAPSHOT_MD5_FILTER)) {
+ for (Path md5path : stream) {
+ Path md5FileNamePath = md5path.getFileName();
+ if (md5FileNamePath == null) {
+ continue;
+ }
+ final String md5FileName = md5FileNamePath.toString();
+ final File snapshotFile =
+ new File(
+ stateMachineDir,
+ md5FileName.substring(0, md5FileName.length() -
MD5_SUFFIX.length()));
+ if (!snapshotFile.exists()) {
+ FileUtils.deletePathQuietly(md5path);
+ }
+ }
+ }
+ }
+ }
+
+ public File getSnapshotFile(long term, long endIndex) {
+ final File dir = Objects.requireNonNull(stateMachineDir, "stateMachineDir
== null");
+ return new File(dir, getSnapshotFileName(term, endIndex));
+ }
+
+ static SingleFileSnapshotInfo findLatestSnapshot(Path dir) throws
IOException {
+ final Iterator<SingleFileSnapshotInfo> i =
getSingleFileSnapshotInfos(dir).iterator();
+ if (!i.hasNext()) {
+ return null;
+ }
+
+ SingleFileSnapshotInfo latest = i.next();
+ for (; i.hasNext(); ) {
+ final SingleFileSnapshotInfo info = i.next();
+ if (info.getIndex() > latest.getIndex()) {
+ latest = info;
+ }
+ }
+
+ // read md5
+ final Path path = latest.getFile().getPath();
+ final MD5Hash md5 = MD5FileUtil.readStoredMd5ForFile(path.toFile());
+ final FileInfo info = new FileInfo(path, md5);
+ return new SingleFileSnapshotInfo(info, latest.getTerm(),
latest.getIndex());
+ }
+
+ public SingleFileSnapshotInfo updateLatestSnapshot(SingleFileSnapshotInfo
info) {
+ return latestSnapshot.updateAndGet(
+ previous -> previous == null || info.getIndex() > previous.getIndex()
? info : previous);
+ }
+
+ public static String getSnapshotFileName(long term, long endIndex) {
+ return SNAPSHOT_FILE_PREFIX + "." + term + "_" + endIndex;
+ }
+
+ @Override
+ public SingleFileSnapshotInfo getLatestSnapshot() {
+ final SingleFileSnapshotInfo s = latestSnapshot.get();
+ if (s != null) {
+ return s;
+ }
Review Comment:
Seems we can directly remove this three line
--
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]
