Skip to content

ZOOKEEPER-3595: restore the handling of the fsync parameter #1146

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

Closed
yaojingguo wants to merge 1 commit into from
Closed

ZOOKEEPER-3595: restore the handling of the fsync parameter #1146

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileSnap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public synchronized void serialize(
File snapShot,
boolean fsync) throws IOException {
if (!close) {
try (CheckedOutputStream snapOS = SnapStream.getOutputStream(snapShot)) {
try (CheckedOutputStream snapOS = SnapStream.getOutputStream(snapShot, fsync)) {
OutputArchive oa = BinaryOutputArchive.getArchive(snapOS);
FileHeader header = new FileHeader(SNAP_MAGIC, VERSION, dbId);
serialize(dt, sessions, oa, header);
Expand Down
6 changes: 4 additions & 2 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/SnapStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.zip.GZIPOutputStream;
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.zookeeper.common.AtomicFileOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xerial.snappy.SnappyCodec;
Expand Down Expand Up @@ -119,11 +120,12 @@ public static CheckedInputStream getInputStream(File file) throws IOException {
* Return the OutputStream based on predefined stream mode.
*
* @param file the file the OutputStream writes to
* @param fsync sync the file immediately after write
* @return the specific OutputStream
* @throws IOException
*/
public static CheckedOutputStream getOutputStream(File file) throws IOException {
FileOutputStream fos = new FileOutputStream(file);
public static CheckedOutputStream getOutputStream(File file, boolean fsync) throws IOException {
OutputStream fos = fsync ? new AtomicFileOutputStream(file) : new FileOutputStream(file);
OutputStream os;
switch (streamMode) {
case GZIP:
Expand Down
16 changes: 13 additions & 3 deletions zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/SnapStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,17 @@ public void testSerializeDeserializeWithGZIP() throws IOException {
}

private void testSerializeDeserialize(StreamMode mode, String fileSuffix) throws IOException {
testSerializeDeserialize(mode, fileSuffix, false);
testSerializeDeserialize(mode, fileSuffix, true);
}

private void testSerializeDeserialize(StreamMode mode, String fileSuffix, boolean fsync) throws IOException {
SnapStream.setStreamMode(mode);

// serialize with gzip stream
File tmpDir = createTmpDir();
File file = new File(tmpDir, "snapshot.180000e3a2" + fileSuffix);
CheckedOutputStream os = SnapStream.getOutputStream(file);
CheckedOutputStream os = SnapStream.getOutputStream(file, fsync);
OutputArchive oa = BinaryOutputArchive.getArchive(os);
FileHeader header = new FileHeader(FileSnap.SNAP_MAGIC, 2, 1);
header.serialize(oa, "fileheader");
Expand All @@ -103,20 +108,25 @@ private void testSerializeDeserialize(StreamMode mode, String fileSuffix) throws
SnapStream.checkSealIntegrity(is, ia);
}

private void checkInvalidSnapshot(String filename) throws IOException {
private void checkInvalidSnapshot(String filename, boolean fsync) throws IOException {
// set the output stream mode to CHECKED
SnapStream.setStreamMode(StreamMode.CHECKED);

// serialize to CHECKED file without magic header
File tmpDir = createTmpDir();
File file = new File(tmpDir, filename);
OutputStream os = SnapStream.getOutputStream(file);
OutputStream os = SnapStream.getOutputStream(file, fsync);
os.write(1);
os.flush();
os.close();
assertFalse(SnapStream.isValidSnapshot(file));
}

private void checkInvalidSnapshot(String filename) throws IOException {
checkInvalidSnapshot(filename, false);
checkInvalidSnapshot(filename, true);
}

@Test
public void testInvalidSnapshot() throws IOException {
assertFalse(SnapStream.isValidSnapshot(null));
Expand Down