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 #5159

Merged
merged 6 commits into from Jul 16, 2015

Conversation

Projects
None yet
3 participants
@theanalyst
Member

theanalyst commented Jul 7, 2015

@theanalyst theanalyst self-assigned this Jul 7, 2015

@theanalyst theanalyst added this to the hammer milestone Jul 7, 2015

@ghost

This comment has been minimized.

ghost commented Jul 8, 2015

could you please amend a1f895d to state how the conflict was resolved ?

@athanatos

This comment has been minimized.

Contributor

athanatos commented Jul 15, 2015

@theanalyst

This comment has been minimized.

Member

theanalyst commented Jul 15, 2015

@athantos.. sorry that was a case of me wrongly picking the option during a merge conflict.. fixing...

athanatos added some commits May 6, 2015

OSD: add op_wq suicide timeout
Signed-off-by: Samuel Just <sjust@redhat.com>
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

There was a merge conflict due to introduction of `osd_recovery_sleep`
which was introduced in #3829
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
Trivial merge conflict
OSD: add snap_trim_wq suicide timeout
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit e1073a4)
OSD: add scrub_wq suicide timeout
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 547a704)
OSD: add remove_wq suicide timeout
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f2fbfa3)
@theanalyst

This comment has been minimized.

Member

theanalyst commented Jul 15, 2015

@athanatos / @dachary updated..

@athanatos

This comment has been minimized.

Contributor

athanatos commented Jul 15, 2015

Looks right to me.

ghost pushed a commit that referenced this pull request Jul 15, 2015

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

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

ghost pushed a commit that referenced this pull request Jul 15, 2015

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

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

ghost pushed a commit that referenced this pull request Jul 16, 2015

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

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

athanatos pushed a commit that referenced this pull request Jul 16, 2015

Samuel Just
Merge pull request #5159 from theanalyst/wip-11701-hammer
make the all osd/filestore thread pool suicide timeouts separately configurable

Reviewed-by: Samuel Just <sjust@redhat.com>

@athanatos athanatos merged commit 5e399b0 into ceph:hammer Jul 16, 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 Aug 4, 2015

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