librados: fix resources leakage in RadosClient::connect() #3828
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If RadosClient::connect was called a second time (which could happen as a part of recovery from failure), the instances of Objecter and Messenger allocated by the first call were leaked. Additionally, the implementation of the method wrongly reported memory allocation problems -- it throwed std::bad_alloc exception instead of returning -ENOMEM error code. Fixes: #10425 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com> (cherry picked from commit 624c056) Conflicts: src/librados/RadosClient.cc resolve adding (std::nothrow) that failed because the prototype of the constructor is not the same
RadosClient::wait_for_osdmap() did not signalize lack of connection via -ENOTCONN error code when the Objecter instance was allocated. The proper way is to check the connection state explicitly. Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com> (cherry picked from commit 34473f7) Conflicts: src/librados/RadosClient.cc the modified guard was not present: add the new guard instead of modifying it
|
@rzarzynski does this backport look right to you ? |
ghost
self-assigned this
|
SUCCESS: the output of run-make-check.sh on centos-centos7 for f70222c is http://paste2.org/_4XVJg3Ca |
Sent from 
|
@dachary it looks fine in my opinion. |
ghost
pushed a commit
that referenced
this pull request
Mar 11, 2015
librados: fix resources leakage in RadosClient::connect() Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
ghost
merged commit
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
http://tracker.ceph.com/issues/10425
corresponding master pull request #3513