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

osd: filestore: restructure journal and op queue throttling #7767

Merged
merged 8 commits into from Mar 1, 2016

Conversation

athanatos
Copy link
Contributor

Tested, see below.

@athanatos
Copy link
Contributor Author

@liewegas Does this make sense?

@liewegas
Copy link
Member

looks good to me, yep!

@athanatos athanatos force-pushed the wip-sam-journal-throttle-4 branch 8 times, most recently from b26ab08 to a9ad657 Compare February 25, 2016 17:13
Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Samuel Just <sjust@redhat.com>
Using the throttle here is sketchy, mainly because we won't wake
up if something new is queued.  Let's do it explicitely.

Signed-off-by: Samuel Just <sjust@redhat.com>
The existing FileJournal::throttle_(ops|bytes) throttles overlap with
the FileStore op queue throttles.  It doesn't seem important whether
pending ops are waiting on the journal or the backing fs, so the
FileJournal ones are out.  Instead, there is now a throttle which
is taken in queue_transaction and released in _committed_thru
(after sync) which reflects the current fullness of the journal
and gradually delays ops as the journal fills up.  The intention is
to smooth out workloads on small journals.

Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Samuel Just <sjust@redhat.com>
@somnathr
Copy link

@athanatos The commit for changing filestore_max_byte to OPT_U64 is missing in this PR

Signed-off-by: Samuel Just <sjust@redhat.com>
This is awkward, if there are later users other than this test
and JournalingObjectStore, it'll be worth making it a bit less
clunky and error prone.

Signed-off-by: Samuel Just <sjust@redhat.com>
@athanatos athanatos changed the title DNM: Wip sam journal throttle 4 Wip sam journal throttle 4 Mar 1, 2016
@athanatos
Copy link
Contributor Author

@liewegas Tested and ready for merge. Looks ok? sjust@teuthology:/a/samuelj-2016-02-29_16:00:45-rados-wip-sam-testing-distro-basic-smithi

@liewegas liewegas changed the title Wip sam journal throttle 4 osd: filestore: restructure journal and op queue throttling Mar 1, 2016
@liewegas
Copy link
Member

liewegas commented Mar 1, 2016

lgtm

athanatos added a commit that referenced this pull request Mar 1, 2016
osd: filestore: restructure journal and op queue throttling

Reviewed-by: Samuel Just <sjust@redhat.com>
@athanatos athanatos merged commit c1e41af into ceph:master Mar 1, 2016
@wildinto
Copy link

cool

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants