]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_file: remove post-unlink lookup check 15216/head
authorMatt Benjamin <mbenjamin@redhat.com>
Mon, 22 May 2017 21:37:11 +0000 (17:37 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Tue, 23 May 2017 02:08:40 +0000 (22:08 -0400)
This could induce asserts in multi-nfs-gateway scenarios.

Fixes: http://tracker.ceph.com/issues/20047
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
src/rgw/rgw_file.cc

index e756c484417f9e908f31413abdfe19be0a832ef7..dd6c1e8ed8f76a339ae3b21e0d3cf4fd58297753 100644 (file)
@@ -342,13 +342,6 @@ namespace rgw {
     fh_cache.remove(rgw_fh->fh.fh_hk.object, rgw_fh,
                    RGWFileHandle::FHCache::FLAG_LOCK);
 
-#if 1 /* XXX verify clear cache */
-    fh_key fhk(rgw_fh->fh.fh_hk);
-    LookupFHResult tfhr = lookup_fh(fhk, RGWFileHandle::FLAG_LOCKED);
-    RGWFileHandle* nfh = get<0>(tfhr);
-    assert(!nfh);
-#endif
-
     if (! rc) {
       real_time t = real_clock::now();
       parent->set_mtime(real_clock::to_timespec(t));