Skip to content

Add is_deleted flag to inode #17

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
amulyan13 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add is_deleted flag to inode #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c8a955
Add is_deleted flag to inode
Jan 7, 2025
76c4cc0
Fix deadlock
Jan 7, 2025
a2f499e
Refactor
Jan 9, 2025
b7d00c9
Refactor
Jan 9, 2025
2da737f
Fix bug
Jan 10, 2025
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
29 changes: 26 additions & 3 deletions turbonfs/inc/fs-handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ static void aznfsc_ll_unlink(fuse_req_t req,
fmt::ptr(req), parent_ino, name);

struct nfs_client *client = get_nfs_client_from_fuse_req(req);
struct nfs_inode *parent_inode = client->get_nfs_inode_from_ino(parent_ino);
struct nfs_inode *inode = parent_inode->lookup(name);
const fuse_ino_t ino = inode ? inode->get_fuse_ino() : 0;

/*
* Call silly_rename() to see if it wants to silly rename instead of unlink.
Expand All @@ -167,7 +170,7 @@ static void aznfsc_ll_unlink(fuse_req_t req,
return;
}

client->unlink(req, parent_ino, name, false /* for_silly_rename */);
client->unlink(req, parent_ino, name, ino, false /* for_silly_rename */);
}

[[maybe_unused]]
Expand All @@ -181,7 +184,11 @@ static void aznfsc_ll_rmdir(fuse_req_t req,
fmt::ptr(req), parent_ino, name);

struct nfs_client *client = get_nfs_client_from_fuse_req(req);
client->rmdir(req, parent_ino, name);
struct nfs_inode *parent_inode = client->get_nfs_inode_from_ino(parent_ino);
struct nfs_inode *inode = parent_inode->lookup(name);
const fuse_ino_t ino = inode ? inode->get_fuse_ino() : 0;

client->rmdir(req, parent_ino, name, ino);
}

[[maybe_unused]]
Expand Down Expand Up @@ -271,8 +278,12 @@ static void aznfsc_ll_rename(fuse_req_t req,
return;
}

struct nfs_inode *newparent_inode = client->get_nfs_inode_from_ino(newparent_ino);
struct nfs_inode *inode = newparent_inode->lookup(newname);
const fuse_ino_t ino_to_del = inode ? inode->get_fuse_ino(): 0;

// Perform user requested rename.
client->rename(req, parent_ino, name, newparent_ino, newname);
client->rename(req, parent_ino, name, newparent_ino, newname, ino_to_del);
}

[[maybe_unused]]
Expand Down Expand Up @@ -329,6 +340,12 @@ static void aznfsc_ll_open(fuse_req_t req,
// Make sure it's not called for directories.
assert(!inode->is_dir());

/*
* Fuse should not call open() for deleted inode.
* The inode will still be valid till a forget call is made.
*/
assert(!inode->is_deleted);

/*
* TODO: See comments in readahead.h, ideally readahead state should be
* per file pointer (per open handle) but since fuse doesn't let
Expand Down Expand Up @@ -524,6 +541,12 @@ static void aznfsc_ll_opendir(fuse_req_t req,

assert(inode->is_dir());

/*
* Fuse should not call opendir() for deleted inode.
* The inode will still be valid till a forget call is made.
*/
assert(!inode->is_deleted);

inode->on_fuse_open(FUSE_OPENDIR);
assert(inode->opencnt > 0);

Expand Down
5 changes: 4 additions & 1 deletion turbonfs/inc/nfs_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,12 +425,14 @@ struct nfs_client
fuse_req_t req,
fuse_ino_t parent_ino,
const char *name,
fuse_ino_t ino,
bool for_silly_rename);

void rmdir(
fuse_req_t req,
fuse_ino_t parent_ino,
const char* name);
const char* name,
fuse_ino_t ino);

void symlink(
fuse_req_t req,
Expand All @@ -455,6 +457,7 @@ struct nfs_client
const char *name,
fuse_ino_t newparent_ino,
const char *new_name,
fuse_ino_t ino_to_mark_deleted = 0,
bool silly_rename = false,
fuse_ino_t silly_rename_ino = 0,
fuse_ino_t oldparent_ino = 0,
Expand Down
5 changes: 5 additions & 0 deletions turbonfs/inc/nfs_inode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ struct nfs_inode
*/
std::atomic<uint64_t> opencnt = 0;

/*
* This will be marked to true when this inode is deleted.
*/
std::atomic<bool> is_deleted = 0;

/*
* Silly rename related info.
* If this inode has been successfully silly renamed, is_silly_renamed will
Expand Down
46 changes: 45 additions & 1 deletion turbonfs/inc/rpc_task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,11 @@ struct unlink_rpc_task
return parent_ino;
}

fuse_ino_t get_ino() const
{
return ino;
}

const char *get_file_name() const
{
return file_name;
Expand All @@ -1011,6 +1016,11 @@ struct unlink_rpc_task
parent_ino = parent;
}

void set_ino(fuse_ino_t _ino)
{
ino = _ino;
}

void set_file_name(const char *name)
{
file_name = ::strdup(name);
Expand All @@ -1030,6 +1040,9 @@ struct unlink_rpc_task
fuse_ino_t parent_ino;
char *file_name;

// Inode being deleted.
fuse_ino_t ino;

/*
* Is this unlink task deleting a silly-renamed file when the last opencnt
* is dropped? If yes, then we need to drop the extra ref on the parent
Expand All @@ -1050,6 +1063,11 @@ struct rmdir_rpc_task
return dir_name;
}

fuse_ino_t get_ino() const
{
return ino;
}

void set_parent_ino(fuse_ino_t parent)
{
parent_ino = parent;
Expand All @@ -1060,6 +1078,11 @@ struct rmdir_rpc_task
dir_name = ::strdup(name);
}

void set_ino(fuse_ino_t dirino)
{
ino = dirino;
}

void release()
{
::free(dir_name);
Expand All @@ -1068,6 +1091,8 @@ struct rmdir_rpc_task
private:
fuse_ino_t parent_ino;
char *dir_name;
// Inode of the directory being deleted.
fuse_ino_t ino;
};

struct symlink_rpc_task
Expand Down Expand Up @@ -1191,6 +1216,16 @@ struct rename_rpc_task
return newname;
}

void set_ino_to_be_deleted(fuse_ino_t ino_to_del)
{
ino_to_be_deleted = ino_to_del;
}

fuse_ino_t get_ino_to_be_deleted() const
{
return ino_to_be_deleted;
}

/*
* oldparent_ino/oldname will be non-zero/non-null only for silly rename
* triggered by user requested rename operation.
Expand Down Expand Up @@ -1257,6 +1292,12 @@ struct rename_rpc_task
fuse_ino_t parent_ino;
fuse_ino_t newparent_ino;
fuse_ino_t oldparent_ino;
/*
* This is the inode which will go out of scope once the rename
* operation completes.
*/
fuse_ino_t ino_to_be_deleted;

char *name;
char *newname;
char *oldname;
Expand Down Expand Up @@ -2007,6 +2048,7 @@ struct rpc_task
void init_unlink(fuse_req *request,
fuse_ino_t parent_ino,
const char *name,
fuse_ino_t ino,
bool for_silly_rename);

void run_unlink();
Expand All @@ -2016,7 +2058,8 @@ struct rpc_task
*/
void init_rmdir(fuse_req *request,
fuse_ino_t parent_ino,
const char *name);
const char *name,
fuse_ino_t ino);

void run_rmdir();

Expand Down Expand Up @@ -2070,6 +2113,7 @@ struct rpc_task
const char *name,
fuse_ino_t newparent_ino,
const char *newname,
fuse_ino_t ino_to_mark_deleted = 0,
bool silly_rename = false,
fuse_ino_t silly_rename_ino = 0,
fuse_ino_t oldparent_ino = 0,
Expand Down
36 changes: 26 additions & 10 deletions turbonfs/src/nfs_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ void nfs_client::jukebox_runner()
js->rpc_api->rmdir_task.get_dir_name());
rmdir(js->rpc_api->req,
js->rpc_api->rmdir_task.get_parent_ino(),
js->rpc_api->rmdir_task.get_dir_name());
js->rpc_api->rmdir_task.get_dir_name(),
js->rpc_api->rmdir_task.get_ino());
break;
case FUSE_UNLINK:
AZLogWarn("[JUKEBOX REISSUE] unlink(req={}, parent_ino={}, "
Expand All @@ -372,6 +373,7 @@ void nfs_client::jukebox_runner()
unlink(js->rpc_api->req,
js->rpc_api->unlink_task.get_parent_ino(),
js->rpc_api->unlink_task.get_file_name(),
js->rpc_api->unlink_task.get_ino(),
js->rpc_api->unlink_task.get_for_silly_rename());
break;
case FUSE_SYMLINK:
Expand Down Expand Up @@ -412,7 +414,8 @@ void nfs_client::jukebox_runner()
js->rpc_api->rename_task.get_name(),
js->rpc_api->rename_task.get_newparent_ino(),
js->rpc_api->rename_task.get_newname(),
js->rpc_api->rename_task.get_silly_rename(),
js->rpc_api->rename_task.get_ino_to_be_deleted(),
js->rpc_api->rename_task.get_silly_rename(),
js->rpc_api->rename_task.get_silly_rename_ino(),
js->rpc_api->rename_task.get_oldparent_ino(),
js->rpc_api->rename_task.get_oldname());
Expand Down Expand Up @@ -1233,9 +1236,18 @@ bool nfs_client::silly_rename(
*/
inode->opencnt++;

rename(req, parent_ino, name, parent_ino, newname,
true /* silly_rename */, inode->get_fuse_ino(),
oldparent_ino, old_name);
if (rename_triggered_silly_rename) {
rename(req, parent_ino, name, parent_ino, newname,
inode->get_fuse_ino(),
true /* silly_rename */, inode->get_fuse_ino(),
oldparent_ino, old_name);
}
else {
rename(req, parent_ino, name, parent_ino, newname,
0 /* ino_to_mark_deleted */,
true /* silly_rename */, inode->get_fuse_ino(),
oldparent_ino, old_name);
}

return true;
} else if (!inode) {
Expand Down Expand Up @@ -1271,22 +1283,24 @@ void nfs_client::unlink(
fuse_req_t req,
fuse_ino_t parent_ino,
const char* name,
fuse_ino_t ino,
bool for_silly_rename)
{
struct rpc_task *tsk = rpc_task_helper->alloc_rpc_task(FUSE_UNLINK);

tsk->init_unlink(req, parent_ino, name, for_silly_rename);
tsk->init_unlink(req, parent_ino, name, ino, for_silly_rename);
tsk->run_unlink();
}

void nfs_client::rmdir(
fuse_req_t req,
fuse_ino_t parent_ino,
const char* name)
const char* name,
fuse_ino_t ino)
{
struct rpc_task *tsk = rpc_task_helper->alloc_rpc_task(FUSE_RMDIR);
struct nfs_inode *parent_inode = get_nfs_inode_from_ino(parent_ino);
struct nfs_inode *inode = parent_inode->lookup(name);
struct nfs_inode *inode = get_nfs_inode_from_ino(ino);

if (parent_inode->has_dircache()) {
parent_inode->get_dircache()->dnlc_remove(name);
Expand All @@ -1297,7 +1311,7 @@ void nfs_client::rmdir(
inode->invalidate_attribute_cache();
}

tsk->init_rmdir(req, parent_ino, name);
tsk->init_rmdir(req, parent_ino, name, ino);
tsk->run_rmdir();
}

Expand Down Expand Up @@ -1325,6 +1339,7 @@ void nfs_client::rename(
const char *name,
fuse_ino_t newparent_ino,
const char *new_name,
fuse_ino_t ino_to_mark_deleted,
bool silly_rename,
fuse_ino_t silly_rename_ino,
fuse_ino_t oldparent_ino,
Expand Down Expand Up @@ -1356,7 +1371,8 @@ void nfs_client::rename(
}

tsk->init_rename(req, parent_ino, name, newparent_ino, new_name,
silly_rename, silly_rename_ino, oldparent_ino, old_name);
ino_to_mark_deleted, silly_rename, silly_rename_ino,
oldparent_ino, old_name);
tsk->run_rename();
}

Expand Down
2 changes: 1 addition & 1 deletion turbonfs/src/nfs_inode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ bool nfs_inode::release(fuse_req_t req)
invalidate_attribute_cache();

client->unlink(req, parent_ino,
silly_renamed_name.c_str(), true /* for_silly_rename */);
silly_renamed_name.c_str(), 0, true /* for_silly_rename */);
return true;
}

Expand Down
Loading