From d2c1541d024d3c862e84bf1ff4b3d25634a08042 Mon Sep 17 00:00:00 2001 From: songweibin Date: Fri, 7 Dec 2018 15:48:49 +0800 Subject: [PATCH] cls/rbd: silence the log of get metadata error When getting the qos of an image without qos set, there is a lot of printing in the OSD log file. ``` 2018-12-07 15:23:51.122 7f01de695700 0 /home/swb/ceph/ceph-dev/src/cls/rbd/cls_rbd.cc:3728: error get metadata: (2) No such file or directory ``` Signed-off-by: songweibin --- src/cls/rbd/cls_rbd.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc index 843223577971..40bb1a05196f 100644 --- a/src/cls/rbd/cls_rbd.cc +++ b/src/cls/rbd/cls_rbd.cc @@ -3659,7 +3659,7 @@ int metadata_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) for (map::iterator it = data.begin(); it != data.end(); ++it) { - CLS_LOG(20, "metdata_set key=%s value=%.*s", it->first.c_str(), + CLS_LOG(20, "metadata_set key=%s value=%.*s", it->first.c_str(), it->second.length(), it->second.c_str()); raw_data[metadata_key_for_name(it->first)].swap(it->second); } @@ -3690,11 +3690,11 @@ int metadata_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) return -EINVAL; } - CLS_LOG(20, "metdata_remove key=%s", key.c_str()); + CLS_LOG(20, "metadata_remove key=%s", key.c_str()); int r = cls_cxx_map_remove_key(hctx, metadata_key_for_name(key)); if (r < 0) { - CLS_ERR("error remove metadata: %s", cpp_strerror(r).c_str()); + CLS_ERR("error removing metadata: %s", cpp_strerror(r).c_str()); return r; } @@ -3721,11 +3721,12 @@ int metadata_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) return -EINVAL; } - CLS_LOG(20, "metdata_get key=%s", key.c_str()); + CLS_LOG(20, "metadata_get key=%s", key.c_str()); int r = cls_cxx_map_get_val(hctx, metadata_key_for_name(key), &value); if (r < 0) { - CLS_ERR("error get metadata: %s", cpp_strerror(r).c_str()); + if (r != -ENOENT) + CLS_ERR("error getting metadata: %s", cpp_strerror(r).c_str()); return r; } -- 2.47.3