]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
client: do not check file size when inode does not have Fc caps
authorVenky Shankar <vshankar@redhat.com>
Tue, 20 May 2025 12:19:41 +0000 (12:19 +0000)
committerVenky Shankar <vshankar@redhat.com>
Thu, 19 Jun 2025 08:53:46 +0000 (08:53 +0000)
Since the client is holding Fr caps, the read request can be
directly sent to the OSD. The offset/in->size comparison check
is causing the read request to return with no data since in->size
isn't yet updated when another client does an extending write.

Introduced-by: 942474c2f5b4c696364f3b7411ae7d96444edfa8
Fixes: http://tracker.ceph.com/issues/70726
Signed-off-by: Venky Shankar <vshankar@redhat.com>
src/client/Client.cc

index f899b183110693d347f9834ad1ad467c56faa938..c57e282ca6b21408ea319704e93fc9053026262d 100644 (file)
@@ -11160,10 +11160,9 @@ retry:
     // C_Read_Sync_NonBlocking::finish().
 
     // trim read based on file size?
-    if (std::cmp_greater_equal(offset, in->size) || (size == 0)) {
-      // read is requested at the EOF or the read len is zero, therefore just
-      // release managed pointers and complete the C_Read_Finisher immediately with 0 bytes
-
+    if (size == 0) {
+      // zero byte read requested -- therefore just release managed
+      // pointers and complete the C_Read_Finisher immediately with 0 bytes
       Context *iof = iofinish.release();
       crf.release();
       iof->complete(0);