From: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Date: Thu, 20 Aug 2015 11:40:25 +0000 (+0800)
Subject: set skip promote flag if NOCACHE or DONTNEED flag set
X-Git-Tag: v9.1.0~301^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5629%2Fhead;p=ceph.git

set skip promote flag if NOCACHE or DONTNEED flag set

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bff5339455e2..4dcea5d584d1 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8679,6 +8679,15 @@ int OSD::init_op_flags(OpRequestRef& op)
       }
       break;
 
+    case CEPH_OSD_OP_READ:
+    case CEPH_OSD_OP_SYNC_READ:
+    case CEPH_OSD_OP_SPARSE_READ:
+      if (m->ops.size() == 1 &&
+          (iter->op.flags & CEPH_OSD_OP_FLAG_FADVISE_NOCACHE ||
+           iter->op.flags & CEPH_OSD_OP_FLAG_FADVISE_DONTNEED)) {
+        op->set_skip_promote();
+      }
+      break;
     default:
       break;
     }