Skip to content

fix: use atomic write for project.json to prevent corruption from concurrent saves #358

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.

Sign up for GitHub

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

Open
Isaries wants to merge 1 commit into
base: develop
Choose a base branch
from
+36 −10
Open

fix: use atomic write for project.json to prevent corruption from concurrent saves #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions src/main/java/org/wise/portal/service/project/impl/ProjectServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
Expand Down Expand Up @@ -857,20 +860,43 @@ public void replaceMetadataInProjectJSONFile(String projectFilePath, ProjectMeta
String projectStr = FileUtils.readFileToString(new File(projectFilePath));
JSONObject projectJSONObj = new JSONObject(projectStr);
projectJSONObj.put("metadata", metadata.toJSONObject());
File newProjectJSONFile = new File(projectFilePath);
Writer writer = new BufferedWriter(
new OutputStreamWriter(new FileOutputStream(newProjectJSONFile), "UTF-8"));
writer.write(projectJSONObj.toString());
writer.close();
Path targetPath = new File(projectFilePath).toPath();
Path tempFile = Files.createTempFile(targetPath.getParent(), "project-", ".tmp");
try {
try (Writer writer = new BufferedWriter(
new OutputStreamWriter(new FileOutputStream(tempFile.toFile()), "UTF-8"))) {
writer.write(projectJSONObj.toString());
}
tempFile.toFile().setReadable(true, false);
atomicMoveWithFallback(tempFile, targetPath);
} finally {
Files.deleteIfExists(tempFile);
}
}

public void saveProjectContentToDisk(String projectJSONString, Project project)
throws FileNotFoundException, IOException {
String projectJSONPath = curriculumBaseDir + project.getModulePath();
Writer writer = new BufferedWriter(
new OutputStreamWriter(new FileOutputStream(new File(projectJSONPath)), "UTF-8"));
writer.write(projectJSONString);
writer.close();
Path targetPath = new File(curriculumBaseDir + project.getModulePath()).toPath();
Path tempFile = Files.createTempFile(targetPath.getParent(), "project-", ".tmp");
try {
try (Writer writer = new BufferedWriter(
new OutputStreamWriter(new FileOutputStream(tempFile.toFile()), "UTF-8"))) {
writer.write(projectJSONString);
}
tempFile.toFile().setReadable(true, false);
atomicMoveWithFallback(tempFile, targetPath);
} finally {
Files.deleteIfExists(tempFile);
}
}

private static void atomicMoveWithFallback(Path source, Path target) throws IOException {
try {
Files.move(source, target, StandardCopyOption.REPLACE_EXISTING,
StandardCopyOption.ATOMIC_MOVE);
} catch (java.nio.file.AtomicMoveNotSupportedException e) {
Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
}
}

public Map<String, Object> getDirectoryInfo(File directory) {
Expand Down
Loading