andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

env_mirror: fix a few leaks (#1363)

Browse Source 
* env_mirror: fix leak from LockFile

Signed-off-by: Sage Weil <sage@redhat.com>

* env_mirror: instruct EnvMirror whether mirrored Envs should be destroyed

The lifecycle rules for Env are frustrating and undocumented.  Notably,
Env::Default() should *not* be freed, but any Env instances we created
should be.

Explicitly instruct EnvMirror whether to clean up child Env instances.
Default to false so that we do not affect existing callers.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-10-06 12:43:05 -05:00 committed by Islam AbdelRahman
parent 5aded67ddb
commit 4985f60fc8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/rocksdb/utilities/env_mirror.h
View File

@ -33,9 +33,21 @@ class WritableFileMirror;
class EnvMirror : public EnvWrapper { class EnvMirror : public EnvWrapper {
Env* a_, *b_; Env* a_, *b_;
bool free_a_, free_b_;
public: public:
EnvMirror(Env* a, Env* b) : EnvWrapper(a), a_(a), b_(b) {} EnvMirror(Env* a, Env* b, bool free_a=false, bool free_b=false)
: EnvWrapper(a),
a_(a),
b_(b),
free_a_(free_a),
free_b_(free_b) {}
~EnvMirror() {
if (free_a_)
delete a_;
if (free_b_)
delete b_;
}
Status NewSequentialFile(const std::string& f, unique_ptr<SequentialFile>* r, Status NewSequentialFile(const std::string& f, unique_ptr<SequentialFile>* r,
const EnvOptions& options) override; const EnvOptions& options) override;
@ -155,6 +167,7 @@ class EnvMirror : public EnvWrapper {
Status as = a_->UnlockFile(ml->a_); Status as = a_->UnlockFile(ml->a_);
Status bs = b_->UnlockFile(ml->b_); Status bs = b_->UnlockFile(ml->b_);
assert(as == bs); assert(as == bs);
delete ml;
return as; return as;
} }
}; };