@@ -229,6 +229,9 @@ static int refresh(struct ceph_journaler *journaler, bool init)
list_splice_tail_init(&tmp_clients, &journaler->clients_cache);
// calculate the minimum_commit_set.
+ // TODO: unregister clients if the commit position is too long behind
+ // active positions. similar with rbd_journal_max_concurrent_object_sets
+ // in user space journal.
minimum_commit_set = journaler->active_set;
list_for_each_entry(client, &journaler->clients, node) {
struct ceph_journaler_object_pos *pos;
@@ -1902,3 +1905,88 @@ int ceph_journaler_allocate_tag(struct ceph_journaler *journaler,
return ret;
}
EXPORT_SYMBOL(ceph_journaler_allocate_tag);
+
+// trimming
+static int ceph_journaler_obj_remove_sync(struct ceph_journaler *journaler,
+ struct ceph_object_id *oid,
+ struct ceph_object_locator *oloc)
+
+{
+ struct ceph_osd_client *osdc = journaler->osdc;
+ struct ceph_osd_request *req;
+ int ret;
+
+ req = ceph_osdc_alloc_request(osdc, NULL, 1, false, GFP_NOIO);
+ if (!req)
+ return -ENOMEM;
+
+ ceph_oid_copy(&req->r_base_oid, oid);
+ ceph_oloc_copy(&req->r_base_oloc, oloc);
+ req->r_flags = CEPH_OSD_FLAG_WRITE;
+
+ osd_req_op_init(req, 0, CEPH_OSD_OP_DELETE, 0);
+
+ ret = ceph_osdc_alloc_messages(req, GFP_NOIO);
+ if (ret)
+ goto out_req;
+
+ ceph_osdc_start_request(osdc, req, false);
+ ret = ceph_osdc_wait_request(osdc, req);
+
+out_req:
+ ceph_osdc_put_request(req);
+ return ret;
+}
+
+static int remove_set(struct ceph_journaler *journaler, uint64_t object_set)
+{
+ uint64_t object_num = 0;
+ int splay_offset = 0;
+ struct ceph_object_id object_oid;
+ int ret = 0;
+
+ ceph_oid_init(&object_oid);
+ for (splay_offset = 0; splay_offset < journaler->splay_width; splay_offset++) {
+ object_num = splay_offset + (object_set * journaler->splay_width);
+ if (!ceph_oid_empty(&object_oid)) {
+ ceph_oid_destroy(&object_oid);
+ ceph_oid_init(&object_oid);
+ }
+ ret = ceph_oid_aprintf(&object_oid, GFP_NOIO, "%s%llu",
+ journaler->object_oid_prefix, object_num);
+ if (ret) {
+ pr_err("aprintf error : %d", ret);
+ goto out;
+ }
+ ret = ceph_journaler_obj_remove_sync(journaler, &object_oid,
+ &journaler->data_oloc);
+ if (ret < 0 && ret != -ENOENT) {
+ pr_err("%s: failed to remove object: %llu",
+ __func__, object_num);
+ goto out;
+ }
+ }
+ ret = 0;
+out:
+ ceph_oid_destroy(&object_oid);
+ return ret;
+}
+
+static int set_minimum_set(struct ceph_journaler* journaler,
+ uint64_t minimum_set)
+{
+ int ret = 0;
+
+ ret = ceph_cls_journaler_set_minimum_set(journaler->osdc,
+ &journaler->header_oid,
+ &journaler->header_oloc,
+ minimum_set);
+ if (ret < 0) {
+ pr_err("%s: failed to set_minimum_set: %d", __func__, ret);
+ return ret;
+ }
+
+ queue_work(journaler->task_wq, &journaler->notify_update_work);
+
+ return ret;
+}
When we found there is no client refre to the object set, we can remove the objects. Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn> --- net/ceph/journaler.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)