You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ad...@apache.org on 2020/09/07 12:31:05 UTC
svn commit: r1881532 -
/jackrabbit/oak/trunk/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
Author: adulceanu
Date: Mon Sep 7 12:31:05 2020
New Revision: 1881532
URL: http://svn.apache.org/viewvc?rev=1881532&view=rev
Log:
OAK-9170 - Make loading segment disk cache fail safe in case when write operation is interrupted by failure
Explicitly closing the channel before move operation
Modified:
jackrabbit/oak/trunk/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
Modified: jackrabbit/oak/trunk/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java?rev=1881532&r1=1881531&r2=1881532&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java (original)
+++ jackrabbit/oak/trunk/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java Mon Sep 7 12:31:05 2020
@@ -139,8 +139,11 @@ public class PersistentDiskCache extends
Runnable task = () -> {
if (writesPending.add(segmentId)) {
- try (FileChannel channel = new FileOutputStream(tempSegmentFile).getChannel()) {
- int fileSize = bufferCopy.write(channel);
+ try {
+ int fileSize;
+ try (FileChannel channel = new FileOutputStream(tempSegmentFile).getChannel()) {
+ fileSize = bufferCopy.write(channel);
+ }
try {
Files.move(tempSegmentFile.toPath(), segmentFile.toPath(), StandardCopyOption.ATOMIC_MOVE);
} catch (AtomicMoveNotSupportedException e) {