From: J. Eric Ivancich <ivancich@redhat.com>
Date: Mon, 8 Jun 2020 23:50:04 +0000 (-0400)
Subject: Merge pull request #33511 from theanalyst/rgw/append-gc-fixes
X-Git-Tag: v16.1.0~2109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d6d48725e8e5e4a3a975f6ddabb783c26404c68;p=ceph.git

Merge pull request #33511 from theanalyst/rgw/append-gc-fixes

rgw: append obj: prevent tail from being GC'ed

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

7d6d48725e8e5e4a3a975f6ddabb783c26404c68
diff --cc src/rgw/rgw_putobj_processor.cc
index a08966c5e8dc,2f51ff526761..94aab6778216
--- a/src/rgw/rgw_putobj_processor.cc
+++ b/src/rgw/rgw_putobj_processor.cc
@@@ -560,13 -561,9 +560,14 @@@ int AppendObjectProcessor::prepare(opti
        size_t pos = s.find("-");
        cur_etag = s.substr(0, pos);
      }
 +
 +    iter = astate->attrset.find(RGW_ATTR_STORAGE_CLASS);
 +    if (iter != astate->attrset.end()) {
 +      tail_placement_rule.storage_class = iter->second.to_str();
 +    }
      cur_manifest = &(*astate->manifest);
      manifest.set_prefix(cur_manifest->get_prefix());
+     astate->keep_tail = true;
    }
    manifest.set_multipart_part_rule(store->ctx()->_conf->rgw_obj_stripe_size, cur_part_num);