Bug #10425 ยป 20150121_10425_fix_v1.patch
| src/librados/RadosClient.cc | ||
|---|---|---|
|
if (err < 0)
|
||
|
goto out;
|
||
|
if (messenger) {
|
||
|
delete messenger;
|
||
|
messenger = NULL;
|
||
|
}
|
||
|
err = -ENOMEM;
|
||
|
nonce = getpid() + (1000000 * (uint64_t)rados_instance.inc());
|
||
|
messenger = Messenger::create(cct, cct->_conf->ms_type, entity_name_t::CLIENT(-1),
|
||
| ... | ... | |
|
ldout(cct, 1) << "starting objecter" << dendl;
|
||
|
// dispose objecter in case of recalling connect() after failure.
|
||
|
// the shutdown method guarantes that the object is in state suitable
|
||
|
// for removal.
|
||
|
if (objecter) {
|
||
|
delete objecter;
|
||
|
objecter = NULL;
|
||
|
}
|
||
|
err = -ENOMEM;
|
||
|
objecter = new Objecter(cct, messenger, &monclient,
|
||
|
objecter = new (std::nothrow) Objecter(cct, messenger, &monclient,
|
||
|
&finisher,
|
||
|
cct->_conf->rados_mon_op_timeout,
|
||
|
cct->_conf->rados_osd_op_timeout);
|
||