Skip to content

Ensure atomic session persistence in FileStore using write-then-rename pattern #1016

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
sahvx655-wq wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

Ensure atomic session persistence in FileStore using write-then-rename pattern #1016

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
10 changes: 9 additions & 1 deletion java/org/apache/catalina/session/FileStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,21 @@ public void save(Session session) throws IOException {
.trace(sm.getString(getStoreName() + ".saving", session.getIdInternal(), file.getAbsolutePath()));
}

File tempFile = new File(file.getAbsolutePath() + ".tmp");

Lock writeLock = sessionLocksById.getLock(session.getIdInternal()).writeLock();
writeLock.lock();
try {
try (FileOutputStream fos = new FileOutputStream(file.getAbsolutePath());
try (FileOutputStream fos = new FileOutputStream(tempFile);
ObjectOutputStream oos = new ObjectOutputStream(new BufferedOutputStream(fos))) {
((StandardSession) session).writeObjectData(oos);
}
if (!tempFile.renameTo(file)) {
if (tempFile.exists() && !tempFile.delete()) {
log.warn(sm.getString("fileStore.deleteFailed", tempFile));
}
throw new IOException(sm.getString("fileStore.renameFailed", tempFile, file));
}
} finally {
writeLock.unlock();
}
Expand Down