RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43773 from linuxbox2/wip-rgwnfs-crash

Browse Source 
librgw: treat empty root path as "/" on mount

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
This commit is contained in:
Casey Bodley 2021-11-12 15:57:37 -05:00 committed by GitHub
commit 2a6fce4edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rgw/rgw_file.cc
View File

@ -2043,10 +2043,21 @@ int rgw_mount2(librgw_t rgw, const char *uid, const char *acc_key,
{
int rc = 0;
/* if the config has no value for path/root, choose "/" */
RGWLibFS* new_fs{nullptr};
if(root &&
(!strcmp(root, ""))) {
/* stash access data for "mount" */
RGWLibFS* new_fs = new RGWLibFS(static_cast<CephContext*>(rgw), uid, acc_key,
sec_key, root);
ceph_assert(new_fs);
new_fs = new RGWLibFS(
static_cast<CephContext*>(rgw), uid, acc_key, sec_key, "/");
}
else {
/* stash access data for "mount" */
new_fs = new RGWLibFS(
static_cast<CephContext*>(rgw), uid, acc_key, sec_key, root);
}
ceph_assert(new_fs); /* should we be using ceph_assert? */
const DoutPrefix dp(rgwlib.get_store()->ctx(), dout_subsys, "rgw mount2: ");
rc = new_fs->authorize(&dp, rgwlib.get_store());

6
src/rgw/rgw_file.h
View File

@ -371,6 +371,10 @@ namespace rgw {
fh.fh_private = this;
}
const std::string& get_name() const {
return name;
}
const fh_key& get_key() const {
return fhk;
}
@ -1291,6 +1295,8 @@ namespace rgw {
struct rgw_fs* get_fs() { return &fs; }
RGWFileHandle& get_fh() { return root_fh; }
uint64_t get_fsid() { return root_fh.state.dev; }
RGWUserInfo* get_user() { return &user->get_info(); }

15
src/test/librgw_file_nfsns.cc
View File

@ -189,6 +189,21 @@ TEST(LibRGW, INIT) {
ASSERT_NE(rgw_h, nullptr);
}
TEST(LibRGW, MOUNT_NOROOT) {
/* do a mount at root="" and verify that it's root is "/" */
struct rgw_fs *fs = nullptr;
int ret = rgw_mount2(rgw_h, userid.c_str(), access_key.c_str(),
secret_key.c_str(), "", &fs, RGW_MOUNT_FLAG_NONE);
ASSERT_EQ(ret, 0);
ASSERT_NE(fs, nullptr);
auto& root_fh = static_cast<RGWLibFS*>(fs->fs_private)->get_fh();
ASSERT_EQ(root_fh.get_name(), "/");
ret = rgw_umount(fs, RGW_UMOUNT_FLAG_NONE);
ASSERT_EQ(ret, 0);
}
TEST(LibRGW, MOUNT) {
int ret = rgw_mount2(rgw_h, userid.c_str(), access_key.c_str(),
secret_key.c_str(), "/", &fs, RGW_MOUNT_FLAG_NONE);