From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 4 Feb 2021 23:22:23 +0000 (-0500)
Subject: Merge pull request #38538 from chenerqi/qos-skip-discard
X-Git-Tag: v17.1.0~3050
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22b845d9f89fc28cfc82405a655edad45518ac8a;p=ceph.git

Merge pull request #38538 from chenerqi/qos-skip-discard

librbd: optionally exclude ops from qos

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

22b845d9f89fc28cfc82405a655edad45518ac8a
diff --cc src/CMakeLists.txt
index 8f0bb60e1562,05235b691852..d76aca4ff653
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -385,10 -385,8 +385,11 @@@ set(libcommon_file
    osdc/Objecter.cc
    osdc/error_code.cc
    librbd/Features.cc
+   librbd/io/IoOperations.cc
    ${mds_files})
 +if(WITH_JAEGER)
 +  list(APPEND libcommon_files common/tracer.cc)
 +endif()
  set_source_files_properties(ceph_ver.c
    APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/src/include/ceph_ver.h)
  add_library(common-objs OBJECT ${libcommon_files})