rgw_file: v3: fix write-timer action

For now, unify with v4 write-on-close path, by calling
RGWFileHandle::close() on write-timer expire, since it will
call write_finish() as a side-effect.

Fixes: http://tracker.ceph.com/issues/19932
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit ce6ecb553b85ea158af28c22827b93135a75d159)

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 595e6a48711b9f4fbfcdee7af71eb50e62ba2fef..7d77a137b07d1a91b345564dbba8b78fa33c21d4 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -1101,6 +1101,8 @@ namespace rgw {
     int rc = write_finish(FLAG_LOCKED);
 
     flags &= ~FLAG_OPEN;
+    flags &= ~FLAG_STATELESS_OPEN;
+
     return rc;
   } /* RGWFileHandle::close */
 

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 7bc62785ed510f95db45db5e5841009d3028b9da..834a156e5d786d63d6b223cb15faeca2838aaf07 100644 (file)
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -770,7 +770,7 @@ namespace rgw {
       }
 
       void operator()() {
-       rgw_fh.write_finish();
+       rgw_fh.close(); /* will finish in-progress write */
        rgw_fh.get_fs()->unref(&rgw_fh);
       }
     };