Skip to content
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

Implement directory atime,ctime,mtime #100

Merged
merged 6 commits into from
Feb 27, 2023
Merged

Implement directory atime,ctime,mtime #100

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6a2dd1
implemented atime, ctime, mtime for directory as the time the filesys…
Feb 21, 2023
debe7aa
Added timestamp for all the directories and updated lookup test
Feb 22, 2023
55ab225
Added test for timestamp in readdir
Feb 23, 2023
165bf78
Added test for timestamp for files in readdir
Feb 24, 2023
816b732
Corrected datetime test for files in readdir
Feb 24, 2023
125e3ee
Added 30 days to UNIX_EPOCH for file modified time
Feb 25, 2023
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
79 changes: 67 additions & 12 deletions s3-file-connector/src/inode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ struct SuperblockInner {
bucket: String,
inodes: RwLock<HashMap<InodeNo, Inode>>,
next_ino: AtomicU64,
mount_time: OffsetDateTime,
}

impl Superblock {
Expand All @@ -75,13 +76,14 @@ impl Superblock {
OsString::from(&s[..s.len() - 1])
};

let mount_time = OffsetDateTime::now_utc();
let root = Inode {
ino: ROOT_INODE_NO,
parent: ROOT_INODE_NO,
// We stash the prefix in the root inode's name so that path resolution "just works"
// with prefixes
name: stripped_prefix,
stat_cache: RwLock::new(InodeStat::for_directory(OffsetDateTime::UNIX_EPOCH)),
stat_cache: RwLock::new(InodeStat::for_directory(mount_time)),
stat_cache_expiry: Instant::now(),
data: InodeData::Directory {
children: Default::default(),
Expand All @@ -95,6 +97,7 @@ impl Superblock {
bucket,
inodes: RwLock::new(inodes),
next_ino: AtomicU64::new(2),
mount_time,
};
Self { inner: Arc::new(inner) }
}
Expand Down Expand Up @@ -215,7 +218,7 @@ impl Superblock {
// semantics, directories always shadow files.
if found_directory {
trace!(?parent, ?name, kind=?InodeKind::Directory, "suffixed lookup found a directory");
let stat = InodeStat::for_directory(OffsetDateTime::UNIX_EPOCH);
let stat = InodeStat::for_directory(self.inner.mount_time);
let ino =
self.inner
.update_or_insert(parent, name, InodeKind::Directory, stat.clone(), Instant::now())?;
Expand Down Expand Up @@ -500,7 +503,7 @@ impl ReaddirHandle {
.map(|prefix| OsString::from(&prefix[self.full_path.len()..prefix.len() - 1]))
.filter(|name| valid_inode_name(name))
.map(|name| {
let stat = InodeStat::for_directory(OffsetDateTime::UNIX_EPOCH);
let stat = InodeStat::for_directory(self.inner.mount_time);
let stat_clone = stat.clone();

self.inner
Expand Down Expand Up @@ -734,12 +737,14 @@ mod tests {
use super::*;

/// Check an [InodeStat] matches a series of fields.
/// ctime, mtime and atime are within the range of 5 seconds of given datetime.
/// It is required for directory where these are specified as mount time.
macro_rules! assert_inode_stat {
($stat:expr, $type:expr, $datetime:expr, $size:expr) => {
assert_eq!($stat.kind, $type);
assert_eq!($stat.atime, $datetime);
assert_eq!($stat.ctime, $datetime);
assert_eq!($stat.mtime, $datetime);
assert!($stat.atime >= $datetime && $stat.atime < $datetime + Duration::new(5, 0));
assert!($stat.ctime >= $datetime && $stat.ctime < $datetime + Duration::new(5, 0));
assert!($stat.mtime >= $datetime && $stat.mtime < $datetime + Duration::new(5, 0));
dannycjones marked this conversation as resolved.
Show resolved Hide resolved
assert_eq!($stat.size, $size);
};
}
Expand Down Expand Up @@ -778,6 +783,7 @@ mod tests {
client.add_object(key, obj);
}

let ts = OffsetDateTime::now_utc();
let superblock = Superblock::new(bucket.to_string(), OsString::from(prefix));

// Try it twice to test the inode reuse path too
Expand All @@ -786,42 +792,42 @@ mod tests {
.lookup(&client, FUSE_ROOT_INODE, &OsString::from("dir0"))
.await
.expect("should exist");
assert_inode_stat!(dir0.stat, InodeStatKind::Directory {}, OffsetDateTime::UNIX_EPOCH, 0);
assert_inode_stat!(dir0.stat, InodeStatKind::Directory {}, ts, 0);
assert_eq!(dir0.full_key, OsString::from(format!("{prefix}dir0")));

let dir1 = superblock
.lookup(&client, FUSE_ROOT_INODE, &OsString::from("dir1"))
.await
.expect("should exist");
assert_inode_stat!(dir1.stat, InodeStatKind::Directory {}, OffsetDateTime::UNIX_EPOCH, 0);
assert_inode_stat!(dir1.stat, InodeStatKind::Directory {}, ts, 0);
assert_eq!(dir1.full_key, OsString::from(format!("{prefix}dir1")));

let sdir0 = superblock
.lookup(&client, dir0.ino, &OsString::from("sdir0"))
.await
.expect("should exist");
assert_inode_stat!(sdir0.stat, InodeStatKind::Directory {}, OffsetDateTime::UNIX_EPOCH, 0);
assert_inode_stat!(sdir0.stat, InodeStatKind::Directory {}, ts, 0);
assert_eq!(sdir0.full_key, OsString::from(format!("{prefix}dir0/sdir0")));

let sdir1 = superblock
.lookup(&client, dir0.ino, &OsString::from("sdir1"))
.await
.expect("should exist");
assert_inode_stat!(sdir1.stat, InodeStatKind::Directory {}, OffsetDateTime::UNIX_EPOCH, 0);
assert_inode_stat!(sdir1.stat, InodeStatKind::Directory {}, ts, 0);
assert_eq!(sdir1.full_key, OsString::from(format!("{prefix}dir0/sdir1")));

let sdir2 = superblock
.lookup(&client, dir1.ino, &OsString::from("sdir2"))
.await
.expect("should exist");
assert_inode_stat!(sdir2.stat, InodeStatKind::Directory {}, OffsetDateTime::UNIX_EPOCH, 0);
assert_inode_stat!(sdir2.stat, InodeStatKind::Directory {}, ts, 0);
assert_eq!(sdir2.full_key, OsString::from(format!("{prefix}dir1/sdir2")));

let sdir3 = superblock
.lookup(&client, dir1.ino, &OsString::from("sdir3"))
.await
.expect("should exist");
assert_inode_stat!(sdir3.stat, InodeStatKind::Directory {}, OffsetDateTime::UNIX_EPOCH, 0);
assert_inode_stat!(sdir3.stat, InodeStatKind::Directory {}, ts, 0);
assert_eq!(sdir3.full_key, OsString::from(format!("{prefix}dir1/sdir3")));

for (dir, sdir, ino, n) in &[
Expand Down Expand Up @@ -880,6 +886,7 @@ mod tests {
client.add_object(key, MockObject::constant(0xaa, 30));
}

let ts = OffsetDateTime::now_utc();
let superblock = Superblock::new("test_bucket".to_string(), OsString::from(prefix));

// Try it all twice to test inode reuse
Expand All @@ -891,6 +898,22 @@ mod tests {
&["dir0", "dir1"]
);

assert_inode_stat!(
dir_handle
.inner
.inodes
.read()
.unwrap()
.get(&FUSE_ROOT_INODE)
.expect("No Inode found")
.stat_cache
.read()
.unwrap(),
InodeStatKind::Directory {},
ts,
0
);
dannycjones marked this conversation as resolved.
Show resolved Hide resolved

let dir0_inode = entries[0].ino;
let dir_handle = superblock.readdir(&client, dir0_inode, 2).await.unwrap();
let entries = dir_handle.collect(&client).await.unwrap();
Expand All @@ -899,13 +922,45 @@ mod tests {
&["file0.txt", "sdir0", "sdir1"]
);

assert_inode_stat!(
dir_handle
.inner
.inodes
.read()
.unwrap()
.get(&dir0_inode)
.expect("No Inode found")
.stat_cache
.read()
.unwrap(),
InodeStatKind::Directory {},
ts,
0
);

let sdir0_inode = entries[1].ino;
let dir_handle = superblock.readdir(&client, sdir0_inode, 2).await.unwrap();
let entries = dir_handle.collect(&client).await.unwrap();
assert_eq!(
entries.iter().map(|entry| &entry.name).collect::<Vec<_>>(),
&["file0.txt", "file1.txt", "file2.txt"]
);

assert_inode_stat!(
dir_handle
.inner
.inodes
.read()
.unwrap()
.get(&sdir0_inode)
.expect("No Inode found")
.stat_cache
.read()
.unwrap(),
InodeStatKind::Directory {},
ts,
0
);
}
}

Expand Down