Skip to content

Commit

Permalink
cls_rbd: change object_map_update to return 0 on success, add logging
Browse files Browse the repository at this point in the history
The rbd_object_map_update class method returns the size of the data read
from the object map when no update is necessary. Change this to return 0
on success. Add error logging to differentiate error cases.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
  • Loading branch information
Douglas Fuller committed Nov 6, 2015
1 parent 3eccde9 commit 26befe1
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/cls/rbd/cls_rbd.cc
Expand Up @@ -2199,6 +2199,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out
::decode(new_object_state, iter);
::decode(current_object_state, iter);
} catch (const buffer::error &err) {
CLS_ERR("failed to decode message");
return -EINVAL;
}

Expand All @@ -2212,6 +2213,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out
bufferlist header_bl;
r = cls_cxx_read(hctx, 0, object_map.get_header_length(), &header_bl);
if (r < 0) {
CLS_ERR("object map header read failed");
return r;
}

Expand Down Expand Up @@ -2247,6 +2249,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out
r = cls_cxx_read(hctx, object_map.get_header_length() + byte_offset,
byte_length, &data_bl);
if (r < 0) {
CLS_ERR("object map data read failed");
return r;
}

Expand Down Expand Up @@ -2285,8 +2288,15 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out
object_map.encode_footer(footer_bl);
r = cls_cxx_write(hctx, object_map.get_footer_offset(), footer_bl.length(),
&footer_bl);
} else {
CLS_LOG(20, "object_map_update: no update necessary");
}
return r;

if (r < 0) {
return r;
}

return 0;
}

/**
Expand Down

0 comments on commit 26befe1

Please sign in to comment.