From: Sage Weil <sage@newdream.net>
Date: Thu, 16 Feb 2017 03:51:16 +0000 (-0600)
Subject: Merge pull request #13398 from liewegas/wip-pgnls-snaps
X-Git-Tag: v12.0.1~381
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd39516023862190092e752d1218af81d2a540cc;p=ceph.git

Merge pull request #13398 from liewegas/wip-pgnls-snaps

osd: drop support for listing objects at a given snap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

fd39516023862190092e752d1218af81d2a540cc
diff --cc src/osd/PrimaryLogPG.cc
index daf667aa959b,f001fc348224..2ed79b3f3e5e
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@@ -1352,34 -1322,11 +1320,11 @@@ void PrimaryLogPG::do_pg_op(OpRequestRe
  	  if (candidate.snap == CEPH_SNAPDIR)
  	    continue;
  
- 	  if (candidate.snap < snapid)
+ 	  if (candidate.snap != CEPH_NOSNAP)
  	    continue;
  
- 	  if (snapid != CEPH_NOSNAP) {
- 	    bufferlist bl;
- 	    if (candidate.snap == CEPH_NOSNAP) {
- 	      pgbackend->objects_get_attr(
- 		candidate,
- 		SS_ATTR,
- 		&bl);
- 	      SnapSet snapset(bl);
- 	      if (snapid <= snapset.seq)
- 		continue;
- 	    } else {
- 	      bufferlist attr_bl;
- 	      pgbackend->objects_get_attr(
- 		candidate, OI_ATTR, &attr_bl);
- 	      object_info_t oi(attr_bl);
- 	      vector<snapid_t>::iterator i = find(oi.snaps.begin(),
- 						  oi.snaps.end(),
- 						  snapid);
- 	      if (i == oi.snaps.end())
- 		continue;
- 	    }
- 	  }
- 
  	  // skip wrong namespace
 -	  if (candidate.get_namespace() != m->get_object_locator().nspace)
 +	  if (candidate.get_namespace() != m->get_hobj().nspace)
  	    continue;
  
  	  if (filter && !pgls_filter(filter, candidate, filter_out))