ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rocksdb: check spdk_fs_open_file() return value

Browse Source 
Make sure spdk_fs_open_file() succeeds in all of the RocksDB environment
file constructors.  NewSequentialFile() already checked this, but
SpdkRandomAccessFile and SpdkWritableFile did not.

Change-Id: Ie298e0cd29366eb698a0358740310fec62af7f9c
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/405326
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2018-03-26 09:39:12 -07:00
parent 56cfdb1daa
commit e2af3284cb
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/rocksdb/env_spdk.cc
View File

@ -158,18 +158,13 @@ class SpdkRandomAccessFile : public RandomAccessFile
{ {
struct spdk_file *mFile; struct spdk_file *mFile;
public: public:
SpdkRandomAccessFile(const std::string &fname, const EnvOptions &options); SpdkRandomAccessFile(struct spdk_file *file) : mFile(file) {}
virtual ~SpdkRandomAccessFile(); virtual ~SpdkRandomAccessFile();
virtual Status Read(uint64_t offset, size_t n, Slice *result, char *scratch) const override; virtual Status Read(uint64_t offset, size_t n, Slice *result, char *scratch) const override;
virtual Status InvalidateCache(size_t offset, size_t length) override; virtual Status InvalidateCache(size_t offset, size_t length) override;
}; };
SpdkRandomAccessFile::SpdkRandomAccessFile(const std::string &fname, const EnvOptions &options)
{
spdk_fs_open_file(g_fs, g_sync_args.channel, fname.c_str(), 0, &mFile);
}
SpdkRandomAccessFile::~SpdkRandomAccessFile(void) SpdkRandomAccessFile::~SpdkRandomAccessFile(void)
{ {
spdk_file_close(mFile, g_sync_args.channel); spdk_file_close(mFile, g_sync_args.channel);
@ -195,7 +190,7 @@ class SpdkWritableFile : public WritableFile
uint32_t mSize; uint32_t mSize;
public: public:
SpdkWritableFile(const std::string &fname, const EnvOptions &options); SpdkWritableFile(struct spdk_file *file) : mFile(file), mSize(0) {}
~SpdkWritableFile() ~SpdkWritableFile()
{ {
if (mFile != NULL) { if (mFile != NULL) {
@ -271,11 +266,6 @@ public:
#endif #endif
}; };
SpdkWritableFile::SpdkWritableFile(const std::string &fname, const EnvOptions &options) : mSize(0)
{
spdk_fs_open_file(g_fs, g_sync_args.channel, fname.c_str(), SPDK_BLOBFS_OPEN_CREATE, &mFile);
}
Status Status
SpdkWritableFile::Append(const Slice &data) SpdkWritableFile::Append(const Slice &data)
{ {
@ -349,8 +339,18 @@ public:
{ {
if (fname.compare(0, mDirectory.length(), mDirectory) == 0) { if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
std::string name = sanitize_path(fname, mDirectory); std::string name = sanitize_path(fname, mDirectory);
result->reset(new SpdkRandomAccessFile(name, options)); struct spdk_file *file;
return Status::OK(); int rc;
rc = spdk_fs_open_file(g_fs, g_sync_args.channel,
name.c_str(), 0, &file);
if (rc == 0) {
result->reset(new SpdkRandomAccessFile(file));
return Status::OK();
} else {
errno = -rc;
return Status::IOError(name, strerror(errno));
}
} else { } else {
return EnvWrapper::NewRandomAccessFile(fname, result, options); return EnvWrapper::NewRandomAccessFile(fname, result, options);
} }
@ -362,8 +362,18 @@ public:
{ {
if (fname.compare(0, mDirectory.length(), mDirectory) == 0) { if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
std::string name = sanitize_path(fname, mDirectory); std::string name = sanitize_path(fname, mDirectory);
result->reset(new SpdkWritableFile(name, options)); struct spdk_file *file;
return Status::OK(); int rc;
rc = spdk_fs_open_file(g_fs, g_sync_args.channel, name.c_str(),
SPDK_BLOBFS_OPEN_CREATE, &file);
if (rc == 0) {
result->reset(new SpdkWritableFile(file));
return Status::OK();
} else {
errno = -rc;
return Status::IOError(name, strerror(errno));
}
} else { } else {
return EnvWrapper::NewWritableFile(fname, result, options); return EnvWrapper::NewWritableFile(fname, result, options);
} }