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

libceph: catch errors from Client::init()

Browse Source 
And clean up error paths.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-12-13 16:28:38 -08:00
parent c87f31e0a5
commit 2f281d1ffd
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/libcephfs.cc
View File

@ -63,6 +63,8 @@ public:
int mount(const std::string &mount_root)
{
int ret;
if (mounted)
return -EDOM;
@ -70,42 +72,43 @@ public:
//monmap
monclient = new MonClient(cct);
if (monclient->build_initial_monmap() < 0) {
shutdown();
return -1000;
}
ret = -1000;
if (monclient->build_initial_monmap() < 0)
goto fail;
//network connection
messenger = new SimpleMessenger(cct);
if (!messenger->register_entity(entity_name_t::CLIENT())) {
messenger->destroy();
messenger = NULL;
shutdown();
return -1001;
ret = -1001;
goto fail;
}
//at last the client
ret = -1002;
client = new Client(messenger, monclient);
if (!client) {
shutdown();
return -1002;
}
if (!client)
goto fail;
if (messenger->start_with_nonce(msgr_nonce) != 0) {
shutdown();
return -1003;
}
ret = -1003;
if (messenger->start_with_nonce(msgr_nonce) != 0)
goto fail;
client->init();
ret = client->init();
if (ret)
goto fail;
int ret = client->mount(mount_root);
if (ret) {
shutdown();
return ret;
}
ret = client->mount(mount_root);
if (ret)
goto fail;
mounted = true;
return 0;
fail:
shutdown();
return ret;
}
void shutdown()