hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use noatime by default

Browse Source
This commit is contained in:
Sebastian Messmer 2020-07-13 18:52:23 -07:00
parent b603d3b58a
commit ad0e064f42
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -8,7 +8,10 @@ Other changes:
* Now requires CMake 3.6 or later
New features:
* Add support for atime mount options (noatime, strictatime, relatime, atime, nodiratime). As before, relatime is the default.
* Add support for atime mount options (noatime, strictatime, relatime, atime, nodiratime).
* The default is atime behavior is now *noatime* (in 0.10.x is was relatime).
Noatime reduces the amount of write necessary and with that reduces the probability for synchronization conflicts
or corrupted file systems if a power outage happens while writing.
* Add an --immediate flag to cryfs-unmount that tries to unmount immediately and doesn't wait for processes to release their locks on the file system.

6
src/fspp/fuse/Fuse.cpp
View File

@ -371,8 +371,8 @@ void Fuse::_createContext(const vector<string> &fuseOptions) {
const bool has_strictatime_flag = fuseOptions.end() != std::find(fuseOptions.begin(), fuseOptions.end(), "strictatime");
const bool has_nodiratime_flag = fuseOptions.end() != std::find(fuseOptions.begin(), fuseOptions.end(), "nodiratime");
// Default is RELATIME
_context = Context(relatime());
// Default is NOATIME, this reduces the probability for synchronization conflicts
_context = Context(noatime());
if (has_noatime_flag) {
ASSERT(!has_atime_flag, "Cannot have both, noatime and atime flags set.");
@ -412,7 +412,7 @@ void Fuse::_createContext(const vector<string> &fuseOptions) {
ASSERT(!has_atime_flag, "This shouldn't happen, or we would have hit a case above");
ASSERT(!has_relatime_flag, "This shouldn't happen, or we would have hit a case above");
ASSERT(!has_strictatime_flag, "This shouldn't happen, or we would have hit a case above");
_context->setTimestampUpdateBehavior(nodiratime_relatime()); // use relatime by default
_context->setTimestampUpdateBehavior(noatime()); // use noatime by default
}
}

17
test/fspp/fuse/TimestampTest.cpp
View File

@ -10,7 +10,7 @@ typedef FuseTest FuseTimestampTest;
TEST_F(FuseTimestampTest, whenCalledWithoutAnyAtimeFlag_thenHasRelatimeBehavior) {
auto fs = TestFS({});
EXPECT_EQ(fspp::relatime().get(), context().timestampUpdateBehavior().get());
EXPECT_EQ(fspp::noatime().get(), context().timestampUpdateBehavior().get());
}
TEST_F(FuseTimestampTest, whenCalledWithNoatimeFlag_thenHasNoatimeBehavior) {
@ -33,9 +33,10 @@ TEST_F(FuseTimestampTest, whenCalledWithAtimeFlag_thenHasRelatimeBehavior) {
EXPECT_EQ(fspp::relatime().get(), context().timestampUpdateBehavior().get());
}
TEST_F(FuseTimestampTest, whenCalledWithNodiratimeFlag_thenHasNodiratimeRelatimeBehavior) {
TEST_F(FuseTimestampTest, whenCalledWithNodiratimeFlag_thenHasNoatimeBehavior) {
// note: this behavior is correct because "noatime" is default and adding "nodiratime" doesn't change anything.
auto fs = TestFS({"-o", "nodiratime"});
EXPECT_EQ(fspp::nodiratime_relatime().get(), context().timestampUpdateBehavior().get());
EXPECT_EQ(fspp::noatime().get(), context().timestampUpdateBehavior().get());
}
@ -302,12 +303,14 @@ TEST_F(FuseTimestampTest, whenCalledWithNodiratimeStrictatimeFlag_withSeparateFl
EXPECT_EQ(fspp::nodiratime_strictatime().get(), context().timestampUpdateBehavior().get());
}
TEST_F(FuseTimestampTest, whenCalledWithNodiratimeNodiratimeFlag_withCsv_thenHasNodiratimeRelatimeBehavior) {
TEST_F(FuseTimestampTest, whenCalledWithNodiratimeNodiratimeFlag_withCsv_thenHasNoatimeBehavior) {
// note: this behavior is correct because "noatime" is default and adding "nodiratime" doesn't change anything.
auto fs = TestFS({"-o", "nodiratime,nodiratime"});
EXPECT_EQ(fspp::nodiratime_relatime().get(), context().timestampUpdateBehavior().get());
EXPECT_EQ(fspp::noatime().get(), context().timestampUpdateBehavior().get());
}
TEST_F(FuseTimestampTest, whenCalledWithNodiratimeNodiratimeFlag_withSeparateFlags_thenHasNodiratimeRelatimeBehavior) {
TEST_F(FuseTimestampTest, whenCalledWithNodiratimeNodiratimeFlag_withSeparateFlags_thenHasNoatimeBehavior) {
// note: this behavior is correct because "noatime" is default and adding "nodiratime" doesn't change anything.
auto fs = TestFS({"-o", "nodiratime", "-o", "nodiratime"});
EXPECT_EQ(fspp::nodiratime_relatime().get(), context().timestampUpdateBehavior().get());
EXPECT_EQ(fspp::noatime().get(), context().timestampUpdateBehavior().get());
}