Skip to content
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

nautilus: rgw: remove rgw_num_rados_handles; set autoscale parameters or rgw metadata pools #27684

Merged
merged 6 commits into from Aug 19, 2019

Conversation

@liewegas
Copy link
Member

commented Apr 18, 2019

Backport of #27102 and #27375. The rados handles removal got rid of conflicts with rgw_init_ioctx() in svc_rados.cc ... maybe there is an easier way?

@liewegas liewegas requested review from cbodley and adamemerson Apr 18, 2019

@liewegas liewegas added the rgw label Apr 18, 2019

@liewegas liewegas added this to the nautilus milestone Apr 18, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented May 20, 2019

@liewegas This PR now has a conflict in PendingReleaseNotes - can you please fix?

@cbodley Review?

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

@liewegas Pinging second time for rebase

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

@yuriw This just needs a PendingReleaseNotes tweak and it's good to go into testing.

@theanalyst theanalyst force-pushed the liewegas:wip-rgw-pgs-nautilus branch from 6283752 to 00531d7 Aug 15, 2019

@theanalyst

This comment has been minimized.

Copy link
Member

commented Aug 15, 2019

updated release notes

@yuriw

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

@liewegas @cbodley pls rebase

--- pr 27684 --- pulling https://github.com/liewegas/ceph.git branch wip-rgw-pgs-nautilus
remote: Enumerating objects: 50, done.
remote: Counting objects: 100% (50/50), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 50 (delta 42), reused 46 (delta 42), pack-reused 0
Unpacking objects: 100% (50/50), done.
From https://github.com/liewegas/ceph

  • branch wip-rgw-pgs-nautilus -> FETCH_HEAD
    Auto-merging src/rgw/rgw_op.cc
    Auto-merging src/rgw/rgw_gc.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_gc.cc
    Automatic merge failed; fix conflicts and then commit the result.
    Traceback (most recent call last):
    File "/home/yuriw/wip_master/src/script/build-integration-branch", line 62, in
    assert not r
    AssertionError
@yuriw

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Aug 19, 2019

Needs another rebase.

adamemerson and others added 6 commits Jan 23, 2019
rgw: Get rid of num_rados_handles infrastructure in RGWRados
Since we aren't supporting multiple handles, don't have the overhead.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 042776b)
rgw: Get rid of num_rados_handles infrastructure in RGWSI_RADOS
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 5666b4c)
rgw: Remove rgw_num_rados_handles option
This has been deprecated for some time and underlies much of the
complexity of the RADOS service.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 5518051)

Conflicts:
	PendingReleaseNotes
updated to reflect current nautilus status
rgw: move rgw_init_ioctx() to rgw_tools.cc
move rgw_init_ioctx() out of rgw_rados.cc so that it doesn't need to be
duplicated by services/svc_rados.cc

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

 Conflicts:
	src/rgw/rgw_gc.cc
include conflicts with scope_guard, added rgw_tools include as well which
	introduces rgw_init_ioctx
rgw/rgw_rados: pass mostly_omap flag when opening/creating pools
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c4b8300)
rgw: pass mostly_omap flag when opening/creating pools
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit af30e3a)

@theanalyst theanalyst force-pushed the liewegas:wip-rgw-pgs-nautilus branch from 00531d7 to 6be1ab1 Aug 19, 2019

@theanalyst

This comment has been minimized.

Copy link
Member

commented Aug 19, 2019

done

@cbodley cbodley merged commit cff1897 into ceph:nautilus Aug 19, 2019

4 checks passed

Docs: build check OK - docs built
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
@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Aug 19, 2019

Thanks, @cbodley

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.