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: make the all osd/filestore thread pool suicide timeouts separately configurable #5823

Merged
7 commits merged into from Oct 23, 2015

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Sep 5, 2015

athanatos added some commits May 6, 2015

OSD: add command_wq suicide timeout
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, ...)
OSD: add recovery_wq suicide timeout
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, ...)
OSD: add snap_trim_wq suicide timeout
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

athanatos and others added some commits May 6, 2015

OSD: add remove_wq suicide timeout
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
OSD: add op_wq suicide timeout
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
OSD: add scrub_wq suicide timeout
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 547a704)

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

This comment has been minimized.

Contributor

smithfarm commented Sep 6, 2015

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

@ghost

This comment has been minimized.

ghost commented Sep 6, 2015

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

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 6, 2015

@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

Merge pull request #5823: make the all osd/filestore thread pool suic…
…ide timeouts separately configurable

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

This comment has been minimized.

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

Merge pull request #5823: make the all osd/filestore thread pool suic…
…ide timeouts separately configurable

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

This comment has been minimized.

ghost commented Oct 23, 2015

@athanatos ping ?

@athanatos

This comment has been minimized.

Contributor

athanatos commented Oct 23, 2015

Yep, that looks fine.

ghost pushed a commit that referenced this pull request Oct 23, 2015

Loic Dachary
Merge pull request #5823 from SUSE/wip-11700-firefly
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 SUSE:wip-11700-firefly branch Oct 23, 2015

@ghost ghost changed the title from make the all osd/filestore thread pool suicide timeouts separately configurable to osd: make the all osd/filestore thread pool suicide timeouts separately configurable Oct 24, 2015

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment