Merge pull request #24833 from trociny/wip-36630-luminous

luminous: osd: potential deadlock in PG::_scan_snaps when repairing snap mapper

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #24989 from jonsger/wip-36638-luminous

luminous: core: bluestore: rename does not old ref to replacement onode at old name

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #24992 from jonsger/wip-26943-luminous

luminous: os/bluestore/BlueStore.cc: 1025: FAILED assert(buffer_bytes >= b->length) from ObjectStore/StoreTest.ColSplitTest2/2

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #25018 from smithfarm/wip-36436-luminous

luminous: core: rados rm --force-full is blocked when cluster is in full status

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #25267 from noahdesu/luminous-docs

luminous: doc: show edit on github links and version warnings

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

doc/_templates/page.html: add link to report doc bugs

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit de30c4d3c5927bb58b49b44b391647e397e1fe4f)

luminous: doc: show edit on github links and version warnings

backport of #24452 that adds edit on
github links to documentation and notification banners that display
warnings when old documentation is being viewed.

this is not a cherry-pick: it removes from the original patch the
dynamic generation of the releases schedule from a yaml database file.
backporting this portion requires modifying the patch to deal with a
different file / directory structure [in luminous] with no real added value.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>

Merge pull request #25049 from gregsfortytwo/luminous-readable-failures

luminous: test: make readable.sh fail if it doesn't run anything

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #25001 from MrStupnikov/luminous-docfix-1358

luminous: doc: Put command template into literal block

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #24752 from joscollin/wip-36309-luminous

luminous: doc: Fix typo error on cephfs/fuse/

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>

Merge pull request #24434 from joscollin/wip-36312-luminous

luminous: doc: fix broken fstab url in cephfs/fuse

Reviewed-by: Yan, Zheng <zyan@redhat.com>

12.2.10

Merge pull request #25170 from badone/wip-luminous-ceph_ansible-specify-branch-stable-3.2

luminous: qa/ceph-ansible: Specify stable-3.2 branch

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

qa/ceph-ansible: Specify stable-3.2 branch

Ceph-ansible no longer supports luminous post stable-3.2.

Fixes: https://tracker.ceph.com/issues/37331
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #25162 from yuriw/wip-yuriw-ceph-ansible-ver-luminous

qa/tests: clean up

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

qa/tests: clean up

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

luminous: doc: put command template into literal block

``ceph-deploy osd create --data {device} {ceph-node}`` command
is not displayed properly because of missing double colons.

Signed-off-by: Alexey Stupnikov <aleksey.stupnikov@gmail.com>
(cherry picked from commit bff5a2122fd2a059c6576f36d7d1505c8d747776)

Merge pull request #25134 from alfredodeza/luminous-c-v-dont-duplicated-rejected-reasons

luminous ceph-volume: rename Device property valid to available

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

c-v device test: rename valid to available

Update test to reflect 8a80990471108b0920d1d8aa1239733ae2b20e9c

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 047dc1c157e44642fa83873f02674b146e6d9028)

inventory test: rename valid to available

Fixes test to reflect 8a80990471108b0920d1d8aa1239733ae2b20e9c

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit d895f97bb021c765f3c4d2d091b23bd0eef19f71)

ceph-volume: rename Device property valid to available

This flag is used in the inventory reporting and available is deemed more
appropriate. Furthermore this fixes a bug where rejected_reasons
accumulated duplicate entries.

Fixes: http://tracker.ceph.com/issues/36701
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8a80990471108b0920d1d8aa1239733ae2b20e9c)

Merge pull request #25131 from alfredodeza/luminous-c-v-inventory-doc

luminous doc: add ceph-volume inventory sections

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

doc: add ceph-volume inventory sections

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit dfc0e1d9a69f6f9ffb1d3e0b0ec33a75827c36e0)

Merge pull request #25117 from alfredodeza/luminous-rm26953

luminous ceph-volume: allow to specify --cluster-fsid instead of reading from ceph.conf

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

ceph-volume tests.lvm verify get_cluster_fsid can read from args or ceph.conf

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 02ea6dc0663cdaf764fdb1a1a5b31a736b854e6e)

ceph-volume lvm.prepare consume the value from --cluster-fsid if available

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a92883e60f3f2206a11b43762b3afcb84b05f07e)

ceph-volume lvm.common add the --cluster-fsid flag

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 15546ae6991c244197537d81092875b12613e20b)

Merge pull request #25104 from alfredodeza/luminous-rm-27062

luminous ceph-volume: reject devices that have existing GPT headers

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #25101 from alfredodeza/luminous-bz1644828

luminous ceph-volume: remove LVs when using zap --destroy

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

ceph-volume: update tests after removing the LVPath arg validator

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit 0cb95ace88a731f7c30adf3f2286691fa3b2c49c)

ceph-volume: return lvs as vg/lv from ValidDevice if as_string is True

All code in prepare and activate expect lvs to be in that format.
Eventually we can refactor all that to use the Device class as well.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit fdf7f3c575299b6be0ac40fb6eee5106cea010c9)

ceph-volume: adds lv_name property to Device class

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit cc0317efac5a3a25edcdb48af2a63a969c2ac43a)

ceph-volume: combine the LVPath arg validator with ValidDevice

This combines the two arg validators and makes both batch and
prepare/active both use ValidDevice.

This will also allow us to use lvs with a full path, like
/dev/vg/lv instead of always enforcing vg/lv.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit d6a5a7606c3a0c1f1624c5784abb02bb1a4e1620)

ceph-volume: adds has_gpt_headers property to Device class

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit 568a0ce5be0161541772ceacb9b81652f51659f5)

ceph-volume: add PTTYPE to blkid parser

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit 3d86d2dda9fae87e143e5212d5f354a22f02909d)

ceph-volume tests update tests to handle new SystemExit exceptions in main

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 27d0a915d4a7f56aafc603a949b4e4c36772d236)

ceph-volume tests.api verify that Volume object can be removed

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9527cffbe335043f7c5a60162138dfe093ae51da)

ceph-volume api.lvm allow passing a Volume object to remove_lv

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e7daa71604f4d08ace1125bb63dcfe909796d3ab)

ceph-volume tests.functional.lvm test full removal of LVs

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 4656bf0e333a50e0fca5fd0612cdda98ab5d70f9)

ceph-volume main raise sys.exit to prevent garbage in help

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f695d1716e9fc6252dd713eb8fb08c28b1284611)

ceph-volume lvm.zap remove vgs|lvs when --destroy is used

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 677cbbb059185fe2808746b36bd3f988ff2af41c)

Merge pull request #25067 from alfredodeza/luminous-rm36768

luminous ceph-volume: patch Device when testing

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

ceph-volume tests patch Device() by splitting parametrized method

This was causing failures on systems where there is no LVM or where the
device names don't match. Patching is always recommended to avoid
conflicts with the system testing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 82d96f876484c9668e2fc4726057691ba2c50f06)

ceph-volume tests inventory should patch before using .get_devices()

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7ee7a59910c9837659419c235f669a53cc9f613c)

Merge pull request #25012 from alfredodeza/luminous-rm36470

luminous ceph-volume enable  --no-systemd flag for simple sub-command

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #25014 from alfredodeza/luminous-ceph-volume-inventory

luminous ceph-volume: add inventory command

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

test: make readable.sh fail if it doesn't run anything

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 66239633880952bc29a64f15a42b3cd20e856957)

osd: potential deadlock in PG::_scan_snaps when repairing snap mapper

Using apply_transaction when holding the pg lock is not safe.

It was fixed in master (mimic) during os, osd refactoring, and this
commit is a partial backport of 907b6281e99ece3677dd7b012cf4955731db6120.

Fixes: http://tracker.ceph.com/issues/36630
Signed-off-by: Mykola Golub <mgolub@suse.com>

tools/rados/rados.cc: fix rados rm --force-full blocking problem

Fixes: https://tracker.ceph.com/issues/36177
Signed-off-by: Yang Honggang <yanghonggang@umcloud.com>
(cherry picked from commit 3d2b99405ebb120d7c3fc1b2710cdfac4a59441a)

Conflicts:
src/tools/rados/rados.cc
- trivial resolution

ceph-volume: add inventory command

The inventory command provides information about a nodes disk inventory.
Existing logical volumes on a disk or one of its partitions are scanned
and reported.
The output can be formatted as plain text or json.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 57adfc6bb8abd9fc84b1378d5f69a16994d19e11)

ceph-volume tests ensure activate behavior with systemd disabling

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 3e80118ccaccaa61e92b01f4f389d6056401d8a7)

ceph-volume simple.activate factor out systemd interactions for easier testing

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 18ddd962116b5359af770088535f502797ac79c4)

ceph-volume simple.trigger replace systemd with from_trigger keyword argument

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 9526587403b76fa5397ae80b63328e3a59765c2e)

ceph-volume simple.activate allow a --no-systemd flag to skip systemctl actions

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 4d9ad0d3d4bedd5efa95653fbb86607f0b469174)

Merge pull request #24981 from alfredodeza/luminous-bz1644265

luminous ceph-volume util.encryption robust blkid+lsblk detection of lockbox

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

os/bluestore: fix split vs finish_write race

In _tcx_finish(), we were looking at the right Cache for the collection,
and then calling finish_write with that Cache and taking the lock.  This
could race with a split_cache() such that after we got the lock the
collection was not on a different cache.  This would in turn lead to a
failed assertion later on in _rm_buffer when the sharedblob was trimmed.

Fixes: http://tracker.ceph.com/issues/24439
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f21f1f14f2d2a465ba072118bd8e32271bf8906e)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

os/bluestore: show compress and buffered from WriteContext

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 90c3c2032cd903505ed706aa5406b1536de03d4a)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

os/bluestore: fix rename race with trim on replacement onode at old name

- rename from foo to bar
 - foo onode is moved to bar in onode_map
 - keys removed at position foo as part of txc
 - new onode for foo is installed at foo in map
...
- cache trims foo
...
- new txn B does get_onode on foo, reads old foo (now bar) onode into foo ***
- txn A commits
-> onode cache has foo with stale bar content

Fix by holding a ref to the replacement foo onode so that get_onode cannot
read stale metadata out of kvdb before txn A commits.

Fixes: http://tracker.ceph.com/issues/36541
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6e14a50e20c18d5f851d34d6979148128c12a279)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>

ceph-volume util.encryption robust blkid+lsblk detection of lockbox

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit fc3e6ea3d9200e0fe2a3aa2576fcd45db223c277)

Merge pull request #24960 from alfredodeza/luminous-rm36672

luminous ceph-volume tests install ceph-ansible's requirements.txt dependencies

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #24958 from alfredodeza/luminous-rm36704

luminous: ceph-volume tests.systemd update imports for systemd module

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

ceph-volume tests install ceph-ansible's requirements.txt dependencies

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 52ddb69813c5849506db5f850a3f2532ff1124b5)

ceph-volume tests.systemd update imports for systemd module

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a63a6c86a03738bf50fa71a490951343a83afff6)

ceph-volume systemd import main so console_scripts work for executable

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 280e2baab27cc061d2d5e456f098cd3405f36873)

Merge pull request #24827 from alfredodeza/luminous-rm36246

luminous ceph-volume util.encryption don't push stderr to terminal

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #24837 from alfredodeza/luminous-no-scripts

luminous ceph-volume: use console_scripts

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #24853 from ceph/luminous-rm36648

luminous ceph-volume systemd import main so console_scripts work for executable

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #24902 from neha-ojha/wip-revert-23493-luminous

luminous: Revert "PG: add custom_reaction Backfilled and release reservations after backfill

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #24903 from neha-ojha/wip-revert-pg-log-limit

luminous: Revert pg log limit changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #24432 from smithfarm/wip-35935-luminous

luminous: OSDMapMapping does not handle active.size() > pool size

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #24706 from smithfarm/wip-36552-luminous

luminous: gperftools-libs-2.6.1-1 or newer required for binaries linked against corresponding version at build time

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>

Merge pull request #24746 from smithfarm/wip-36591-luminous

luminous: segv in BlueStore::OldExtent::create

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #24802 from tchaikov/wip-luminous-35067

luminous: core: by pass cache if performing deep scrub

Reviewed-by: Neha Ojha <nojha@redhat.com>

doc: make note of pg log hard limit upgrade bug in PendingReleaseNotes

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd: make calc_trim_to() independent of min_last_complete_ondisk"

This reverts commit 3ecbf2a41fef3591ff247a212338b9a2d02a3468.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd: print pg log length and trim_to"

This reverts commit 21a72d2a52f8241ebe0a5455f030d2095e413025.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd: handle trim() during backfill"

This reverts commit bdfc2a3b4fa8038ade31ccab5f5479508e9afff3.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd: allow trim() to proceed when there are missing items"

This reverts commit d08f0aec86ecd9b23310f1c41f9cb9060f10bc6b.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd: reset complete_to when trimming the log past it"

This reverts commit 715d1fdbfc407de81686784d99fe28b51c6d97ef.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd/PGLog: allow pg log trim when complete_to is less than trim_to"

This reverts commit be8b406d9162a1f46b3eac2fca07b0cf20697b90.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd/PGLog.cc: use lgeneric_subdout instead of generic_dout"

This reverts commit f2ea4f8b67ac972cd428e8ea8f2ff062b1624677.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "src/osd/PG.cc: remove redundant call to trim_log()"

This reverts commit 31616627dcfb2b6ab7db7da025e191dc34094bb8.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd/PGLog.cc: check if complete_to points to log.end()"

This reverts commit ac772c90dfc3749527246242a3a84e5e48ff52e1.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd/PrimaryLogPG.cc: limit trimming at can_rollback_to"

This reverts commit 0e57c101c9dd51ee3a84123c96e626799ab6d21e.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd/PrimaryLogPG: avoid dereferencing invalid complete_to"

This reverts commit eb3bdf0714b9c78c5b3634d4efe3b603824fea09.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "osd/PrimaryLogPG: fix potential pg-log overtrimming"

This reverts commit 85a029a7242a1c6eef4e90ae246541e08207302a.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Revert "PG: add custom_reaction Backfilled and release reservations after backfill"

This reverts commit f512f905b140bfa9cc3241793e441de2c377e60b.

Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #24854 from cbodley/wip-36536

luminous: rgw: user stats account for resharded buckets

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

Merge pull request #24855 from cbodley/wip-36534

luminous: cls/user: cls_user_remove_bucket writes modified header

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

Merge pull request #24862 from jonsger/luminous-backport-pr#23242

luminous: rgw: set default objecter_inflight_ops = 24576

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

Merge pull request #24454 from croit/luminous-36041

luminous: rgw/beast: drop privileges after binding ports

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

Merge pull request #24507 from pdvian/wip-36212-luminous

luminous: rgw: RGWAsyncGetBucketInstanceInfo does not access coroutine memory

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

Merge pull request #24519 from pdvian/wip-36214-luminous

luminous: rgw: fix leak of curl handle on shutdown

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

Merge pull request #24570 from joke-lee/luminous-list-RGWPostObj-when-enable-versioning

luminous: rgw: list bucket can not show the object uploaded by RGWPostObj when enable bucket versioning

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

Merge pull request #24857 from jonsger/luminous-backport-pr#23534

luminous: rgw: multisite: enforce spawn_window for data full sync

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

rgw: set default objecter_inflight_ops = 24576

Fixes: http://tracker.ceph.com/issues/25109
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 102c5bd)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Conflicts:
src/rgw/rgw_main.cc: use the existing vector, there is no map

ceph-volume systemd import main so console_scripts work for executable

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0bcda52566279404b88184b2ce7b2200d581b0b7)

cls/user: cls_user_remove_bucket writes modified header

if cls_user_remove_bucket() modifies the header with dec_header_stats(),
it should write the updated header back

Fixes: http://tracker.ceph.com/issues/36496
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit dac26de1fa7b56ce0ec2fd43d26ab9a9b6a32e3d)

rgw: cls_user_set_buckets_info can update bucket id

if cls_user_set_bucket_info() finds an existing bucket entry, it does
not update its bucket id

Fixes: https://tracker.ceph.com/issues/24505
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit e1b97fc2e804d040e8aa6fc8a94e336222d1175e)

rgw: rgw_user_sync_all_stats uses bucket entrypoint

when bucket reshard completes, rgw_link_bucket() passes the new bucket
instance id down to cls_user, but cls_user_set_buckets_info() does not
change the instance id when it's updating an existing bucket. so when
rgw_user_sync_all_stats() looks up each of the user's buckets, it uses
the original bucket instance id instead of the resharded one and
calculates user stats that may not match the current bucket stats

as a workaround, rgw_user_sync_all_stats() no longer relies on the
bucket instance id it gets from rgw_read_user_buckets(), and instead
calls get_bucket_info() to look up the current instance in the bucket
entrypoint

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b33328ff9bacd11d8449cb3b5c52f94d9dffec6e)