New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luminous: rgw: add support for Swift's per storage policy statistics #17835

Merged
merged 9 commits into from Oct 17, 2017

Conversation

Projects
None yet
5 participants
@rzarzynski
Contributor

rzarzynski commented Sep 20, 2017

http://tracker.ceph.com/issues/21460
http://tracker.ceph.com/issues/21649

This is the luminous backport of PR #12704. It incorporates commits from the backport #17834 as dependencies.

rzarzynski added some commits Aug 28, 2017

rgw: abstract partial data processing in RGWListBuckets.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit a842dd0)
rgw: add basic support for Swift's reversed account listings.
Fixes: http://tracker.ceph.com/issues/21148
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 870f548)
rgw: {end_}marker params are handled during Swift's reversed account …
…listing.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 2f1f7a1)
rgw: enforce the std::move semantic across the path of RGWUserBuckets.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 4a7a434)
rgw: clean-up around and implement the move semantics in RGWBucketEnt.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 545dabe)
rgw: convey placement rule in RGWBucketEnt and cls_user_bucket_entry.
Fixes: http://tracker.ceph.com/issues/17932
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 5eca89f)
rgw: bucket linking stores also the info about a placement rule.
Fixes: http://tracker.ceph.com/issues/17932
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit de7a867)
rgw: calculate and print Swift's X-Account-Storage-Policy-* headers.
Fixes: http://tracker.ceph.com/issues/17932
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 5e5c067)

@smithfarm smithfarm added this to the luminous milestone Sep 20, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Sep 20, 2017

Contributor

@rzarzynski Instead of duplicating commits between backport PRs, we typically just merge the interdependent backports into a single PR. But this should be fine as it is.

Contributor

smithfarm commented Sep 20, 2017

@rzarzynski Instead of duplicating commits between backport PRs, we typically just merge the interdependent backports into a single PR. But this should be fine as it is.

@rzarzynski

This comment has been minimized.

Show comment
Hide comment

@smithfarm smithfarm changed the title from luminous: rgw: add support for Swift's per storage policy statistics to [DNM] luminous: rgw: add support for Swift's per storage policy statistics Sep 22, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Sep 22, 2017

Contributor

Quoting from the tracker:

this feature caused a regression in multisite sync - please don't merge this backport without a corresponding fix for http://tracker.ceph.com/issues/21506

Contributor

smithfarm commented Sep 22, 2017

Quoting from the tracker:

this feature caused a regression in multisite sync - please don't merge this backport without a corresponding fix for http://tracker.ceph.com/issues/21506

@cbodley

This comment has been minimized.

Show comment
Hide comment
@cbodley

cbodley Oct 2, 2017

Contributor

thanks @smithfarm. the fix for http://tracker.ceph.com/issues/21506 is merged to master and ready for luminous backport

Contributor

cbodley commented Oct 2, 2017

thanks @smithfarm. the fix for http://tracker.ceph.com/issues/21506 is merged to master and ready for luminous backport

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Oct 2, 2017

Contributor

@cbodley So @rzarzynski could just cherry-pick 3f4f760 into this PR?

Contributor

smithfarm commented Oct 2, 2017

@cbodley So @rzarzynski could just cherry-pick 3f4f760 into this PR?

@smithfarm smithfarm requested a review from cbodley Oct 2, 2017

@cbodley

This comment has been minimized.

Show comment
Hide comment
@cbodley

cbodley Oct 2, 2017

Contributor

So @rzarzynski could just cherry-pick 3f4f760 into this PR?

yes please!

Contributor

cbodley commented Oct 2, 2017

So @rzarzynski could just cherry-pick 3f4f760 into this PR?

yes please!

rgw: dont reuse stale RGWObjectCtx for get_bucket_info()
if the earlier call to store->get_bucket_entrypoint_info() failed with
ENOENT, the obj_ctx will cache exists=false.
put_bucket_entrypoint_info() doesn't invalidate that, so this call to
get_bucket_info() was reading from a stale cache and failing with ENOENT

Fixes: http://tracker.ceph.com/issues/21506

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

This comment has been minimized.

Show comment
Hide comment
@rzarzynski

rzarzynski Oct 2, 2017

Contributor

@cbodley, @smithfarm: cherry-picked. :-)

Contributor

rzarzynski commented Oct 2, 2017

@cbodley, @smithfarm: cherry-picked. :-)

@cbodley

cbodley approved these changes Oct 2, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Oct 3, 2017

Contributor

jenkins test docs

Contributor

smithfarm commented Oct 3, 2017

jenkins test docs

@smithfarm smithfarm changed the title from [DNM] luminous: rgw: add support for Swift's per storage policy statistics to luminous: rgw: add support for Swift's per storage policy statistics Oct 3, 2017

@mattbenjamin

This comment has been minimized.

Show comment
Hide comment
@mattbenjamin

mattbenjamin Oct 15, 2017

Contributor

jenkins retest this please

Contributor

mattbenjamin commented Oct 15, 2017

jenkins retest this please

@mattbenjamin

lgtm--I can't merge cleanly due to the doc build failure; @rzarzynski could you try to fix?

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Oct 15, 2017

Contributor

I can't merge cleanly due to the doc build failure

This PR doesn't touch any doc code, though?

Contributor

smithfarm commented Oct 15, 2017

I can't merge cleanly due to the doc build failure

This PR doesn't touch any doc code, though?

@cbodley

This comment has been minimized.

Show comment
Hide comment
@cbodley

cbodley Oct 16, 2017

Contributor

jenkins test docs

Contributor

cbodley commented Oct 16, 2017

jenkins test docs

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Oct 16, 2017

Contributor

@alfredodeza @tchaikov Any idea what to do about the following Jenkins doc test failure?

+ ./admin/build-doc
Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/doc/scripts/gen_state_diagram.py", line 205, in <module>
    RENDERER.read_input(INPUT_GENERATOR)
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/doc/scripts/gen_state_diagram.py", line 87, in read_input
    self.get_event(line)
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/doc/scripts/gen_state_diagram.py", line 139, in get_event
    raise "no context at line: " + line
TypeError: exceptions must be old-style classes or derived from BaseException, not str
Build step 'Execute shell' marked build as failure
Contributor

smithfarm commented Oct 16, 2017

@alfredodeza @tchaikov Any idea what to do about the following Jenkins doc test failure?

+ ./admin/build-doc
Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/doc/scripts/gen_state_diagram.py", line 205, in <module>
    RENDERER.read_input(INPUT_GENERATOR)
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/doc/scripts/gen_state_diagram.py", line 87, in read_input
    self.get_event(line)
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/doc/scripts/gen_state_diagram.py", line 139, in get_event
    raise "no context at line: " + line
TypeError: exceptions must be old-style classes or derived from BaseException, not str
Build step 'Execute shell' marked build as failure
@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Oct 16, 2017

Contributor

Just a wild guess . . . the Jenkins doc test for luminous appears to has been failing since around the time #18167 was merged?

Contributor

smithfarm commented Oct 16, 2017

Just a wild guess . . . the Jenkins doc test for luminous appears to has been failing since around the time #18167 was merged?

@tchaikov

This comment has been minimized.

Show comment
Hide comment
@tchaikov

tchaikov Oct 17, 2017

Contributor

jenkins test docs

Contributor

tchaikov commented Oct 17, 2017

jenkins test docs

@tchaikov

This comment has been minimized.

Show comment
Hide comment
@tchaikov

tchaikov Oct 17, 2017

Contributor

@smithfarm no. it's more likely 27e1450. anyway, could you help test/review #18339?

Contributor

tchaikov commented Oct 17, 2017

@smithfarm no. it's more likely 27e1450. anyway, could you help test/review #18339?

@tchaikov tchaikov merged commit bac56cc into ceph:luminous Oct 17, 2017

3 of 4 checks passed

Docs: build check Docs: failed with errors
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment