RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

librgw: unify result cases in rgw_mkdir

Browse Source 
In both paths, instantiate a file handle iff the remote op
succeeded.

If this operation lost a race to create an object with the same
name, we cannot correctly return a valid result and handle in all
cases, so don't attempt it.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Matt Benjamin 2015-12-09 20:25:22 -05:00
parent 33539db735
commit 4e9116ae52
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rgw/rgw_file.cc
View File

@ -221,7 +221,7 @@ int rgw_mkdir(struct rgw_fs *rgw_fs,
const char *name, mode_t mode, struct stat *st,
struct rgw_file_handle **fh)
{
int rc;
int rc, rc2;
/* XXXX remove uri, deal with bucket names */
string uri;
@ -236,16 +236,15 @@ int rgw_mkdir(struct rgw_fs *rgw_fs,
}
LookupFHResult fhr;
RGWFileHandle* rgw_fh;
RGWFileHandle* rgw_fh = nullptr;
if (parent->is_root()) {
/* bucket */
fhr = fs->lookup_fh(parent, name);
rgw_fh = get<0>(fhr);
uri += "/"; /* XXX */
uri += name;
RGWCreateBucketRequest req(cct, fs->get_user(), uri);
rc = librgw.get_fe()->execute_req(&req);
rc2 = req.get_ret();
} else {
/* create an object representing the directory (naive version) */
buffer::list bl;
@ -255,10 +254,19 @@ int rgw_mkdir(struct rgw_fs *rgw_fs,
RGWPutObjRequest req(cct, fs->get_user(), rgw_fh->bucket_name(),
dir_name, bl);
rc = librgw.get_fe()->execute_req(&req);
rc2 = req.get_ret();
}
struct rgw_file_handle *rfh = rgw_fh->get_fh();
*fh = rfh;
if ((rc == 0) &&
(rc2 == 0)) {
fhr = fs->lookup_fh(parent, name, RGWFileHandle::FLAG_CREATE);
rgw_fh = get<0>(fhr);
if (rgw_fh) {
struct rgw_file_handle *rfh = rgw_fh->get_fh();
*fh = rfh;
} else
rc = -EIO;
}
return rc;
}