libcephfs/test.cc: close fd before umount

Fixes: #10415
Signed-off-by: Yan, Zheng <zyan@redhat.com>
librados: only call watch_flush if necessary

Fix bug #10424
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Merge pull request #3243 from yuyuyu101/wip-10424

librados: only call watch_flush if necessary

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10132: osd: tries to set ioprio when the config option is blank

According to documentation, ioprio params will only be used if both
osd disk thread ioprio class and osd disk thread ioprio priority are
set to a non default value.

So, add a proper check and do not generate "set_disk_tp_priority(22)
Invalid argument" warning for the default settings.
Merge pull request #3245 from trociny/fix-10132

10132: osd: tries to set ioprio when the config option is blank

Reviewed-by: Sage Weil <sage@redhat.com>
Merge pull request #3241 from ceph/wip-10415

libcephfs/test.cc: close fd before umount

Reviewed-by: Sage Weil <sage@redhat.com>
AsyncMessenger: fix the leak of file_events

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
FileJournal: Don't cache journal data if journal w/o directio mode

Only read journal data in osd starting.So no need to keep journal
data in kernel cache/buffer.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
PG:: filter_snapc: Return immediately if no snapc need to trim
we can return immediately if no snapc need to trim. Do not iterater snapc vector and do extra judgement and ops.

Signed-off-by: Ning Yao <zay11022@gmail.com>
Merge pull request #3256 from majianpeng/fix4

FileJournal: Don't cache journal data if journal w/o directio mode

Reviewed-by: Sage Weil <sage@redhat.com>
Merge pull request #3257 from mslovy/wip-y02

PG:: filter_snapc: Return immediately if no snapc need to trim

Reviewed-by: Sage Weil <sage@redhat.com>
AsyncMessenger: reset newly allocated file_events

* otherwise there is chance that Event could take them as already
  initialized ones even they are filled with random bits from heap.
Merge pull request #3255 from tchaikov/async-leak

AsyncMessenger: fix the leak of file_events
rbd: add header parser for merge-diff

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
rbd: add a strategy for merge-diff

We only handle the image-diff with "--stripe-count == 1"

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
rbd: add command line for merge-diff

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
test: add test case for rbd merge-diff

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>