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.

Sign up for GitHub

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

Jump to bottom

osd: make the all osd/filestore thread pool suicide timeouts separately configurable #5823

Merged
7 commits merged into from
Oct 23, 2015
Merged

osd: make the all osd/filestore thread pool suicide timeouts separately configurable #5823

7 commits merged into from
Oct 23, 2015

Conversation

smithfarm
Copy link
Contributor

@athanatos @smithfarm
OSD: add command_wq suicide timeout
f85ec2a 
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit df4e5de)

Conflicts:
	src/common/config_opts.h
           place OPTION(osd_command_thread_suicide_timeout, ...)
           directly after OPTION(osd_command_thread_timeout, ...)
@athanatos @smithfarm
OSD: add recovery_wq suicide timeout
d31d1f6 
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 85311b6)

Conflicts:
	src/common/config_opts.h
           place OPTION(osd_command_thread_suicide_timeout, ...)
           directly after OPTION(osd_command_thread_timeout, ...)
@athanatos @smithfarm
OSD: add snap_trim_wq suicide timeout
6926a64 
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit e1073a4)
@smithfarm smithfarm self-assigned this Sep 5, 2015
@smithfarm smithfarm added this to the firefly milestone Sep 5, 2015
@smithfarm smithfarm force-pushed the wip-11700-firefly branch 2 times, most recently from 9d0d3d7 to 9ecac54 Compare September 6, 2015 13:11
athanatos and others added 4 commits September 6, 2015 15:35
@athanatos @smithfarm
OSD: add remove_wq suicide timeout
9ce8ce6 
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f2fbfa3)

Conflicts:
	src/osd/OSD.cc
           No next_removal_seq(0) in master
@athanatos @smithfarm
OSD: add op_wq suicide timeout
7f6ec65 
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 3f2946a)

Conflicts:
	src/osd/OSD.cc
          adapt op_wq() and peering_wq() calls in OSD::OSD
	src/osd/OSD.h
          adapt OpWQ instead of ShardedOpWQ
@athanatos @smithfarm
OSD: add scrub_wq suicide timeout
91d4c21 
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 547a704)

Conflicts:
        src/osd/OSD.cc
            firefly still has scrub_finalize_wq
@smithfarm
OSD: add scrub_finalize_wq suicide timeout
bff2f47 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@loic-bot
Copy link

loic-bot commented Sep 6, 2015

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/7551/

@smithfarm
Copy link
Contributor Author

Waiting for @athanatos review. The biggest anomaly is the last commit bff2f47 .

@ghost
Copy link

ghost commented Sep 6, 2015

@smithfarm could you explain what the anomaly is and why this pull request needs review from Sam ?

@smithfarm
Copy link
Contributor Author

@dachary The anomaly is that firefly has "scrub_finalize_wq" but hammer and above do not have this. On a hunch, I added a commit bff2f47 (which is not in the original master PR) that adds a configurable suicide timeout for this, in the same manner as the other suicide timeouts. However, I don't know enough about this feature to know for sure that this is the right thing to do. Maybe there is someone else who could review it in Sam's absence?

ghost pushed a commit that referenced this pull request Oct 20, 2015
@ldachary
Merge pull request #5823: make the all osd/filestore thread pool suic…
f45a062 
…ide timeouts separately configurable

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost
Copy link

ghost commented Oct 20, 2015

@athanatos does this backport look good to merge ? It passed a run of the firefly rados suite ( see http://tracker.ceph.com/issues/11644#note-110 ). Note that there was a valgrind issues but it is unrelated and fixed by #6325.

ghost pushed a commit that referenced this pull request Oct 21, 2015
@ldachary
Merge pull request #5823: make the all osd/filestore thread pool suic…
74040da 
…ide timeouts separately configurable

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost
Copy link

ghost commented Oct 23, 2015

@athanatos ping ?

@athanatos
Copy link
Contributor

Yep, that looks fine.

ghost pushed a commit that referenced this pull request Oct 23, 2015
Merge pull request #5823 from SUSE/wip-11700-firefly
c551622 
make the all osd/filestore thread pool suicide timeouts separately configurable

Reviewed-by: Samuel Just <sjust@redhat.com>
@ghost ghost merged commit c551622 into ceph:firefly Oct 23, 2015
@smithfarm smithfarm deleted the wip-11700-firefly branch October 23, 2015 19:52
@ghost ghost changed the title make the all osd/filestore thread pool suicide timeouts separately configurable osd: make the all osd/filestore thread pool suicide timeouts separately configurable Oct 24, 2015
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@smithfarm smithfarm

Labels
bug-fix core
Projects
None yet
Milestone
firefly
Development

Successfully merging this pull request may close these issues.
3 participants
@smithfarm @loic-bot @athanatos