RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-22 03:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8413 from runsisi/wip-fix-eexist

Browse Source 
cls_journal: fix -EEXIST checking

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-04-01 11:16:12 -05:00
commit d21646ade6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cls/journal/cls_journal.cc
View File

@ -250,9 +250,11 @@ int journal_create(cls_method_context_t hctx, bufferlist *in, bufferlist *out) {
bufferlist stored_orderbl;
int r = cls_cxx_map_get_val(hctx, HEADER_KEY_ORDER, &stored_orderbl);
if (r != -ENOENT) {
if (r >= 0) {
CLS_ERR("journal already exists");
return -EEXIST;
} else if (r != -ENOENT) {
return r;
}
r = write_key(hctx, HEADER_KEY_ORDER, order);
@ -556,9 +558,11 @@ int journal_client_register(cls_method_context_t hctx, bufferlist *in,
std::string key(key_from_client_id(id));
bufferlist stored_clientbl;
r = cls_cxx_map_get_val(hctx, key, &stored_clientbl);
if (r != -ENOENT) {
if (r >= 0) {
CLS_ERR("duplicate client id: %s", id.c_str());
return -EEXIST;
} else if (r != -ENOENT) {
return r;
}
cls::journal::Client client(id, data);
@ -866,9 +870,11 @@ int journal_tag_create(cls_method_context_t hctx, bufferlist *in,
std::string key(key_from_tag_tid(tag_tid));
bufferlist stored_tag_bl;
int r = cls_cxx_map_get_val(hctx, key, &stored_tag_bl);
if (r != -ENOENT) {
if (r >= 0) {
CLS_ERR("duplicate tag id: %" PRIu64, tag_tid);
return -EEXIST;
} else if (r != -ENOENT) {
return r;
}
// verify tag tid ordering