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

systemd/ceph-disk: make it possible to customize timeout #13197

Merged
merged 1 commit into from Mar 24, 2017

Conversation

Projects
None yet
4 participants
@asheplyakov
Copy link

asheplyakov commented Jan 31, 2017

When booting a server with 20+ HDDs udev has to process a lot of
events (especially if dm-crypt is used), and 2 minutes might be not
enough for that. Make it possible to override the timeout (via systemd
drop-in files), and use a longer timeout (5 minutes) by default.

Fixes: http://tracker.ceph.com/issues/18740
Signed-off-by: Alexey Sheplyakov asheplyakov@mirantis.com

@liewegas liewegas added the build/ops label Feb 1, 2017

@@ -6,5 +6,6 @@ Wants=local-fs.target
[Service]
Type=oneshot
KillMode=none
ExecStart=/bin/sh -c 'timeout 120 flock /var/lock/ceph-disk-$(basename %f) /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'
Environment=CEPH_DISK_TIMEOUT=300
ExecStart=/bin/sh -c 'timeout $${CEPH_DISK_TIMEOUT} flock /var/lock/ceph-disk-$(basename %f) /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'

This comment has been minimized.

Copy link
@liewegas

liewegas Feb 1, 2017

Member

Is that double $$ correct?

This comment has been minimized.

Copy link
@asheplyakov

asheplyakov Feb 2, 2017

Author

Yes. '$$' passes a literal '$' to shell.

This comment has been minimized.

Copy link
@tchaikov

tchaikov Feb 6, 2017

Contributor

can we just put $CEPH_DISK_TIMEOUT here? to let systemd instead of sh to do the expansion.

This comment has been minimized.

Copy link
@asheplyakov

asheplyakov Feb 6, 2017

Author

@tchaikov

can we just put $CEPH_DISK_TIMEOUT here?

Done.

Alexey Sheplyakov
systemd/ceph-disk: make it possible to customize timeout
When booting a server with 20+ HDDs udev has to process a *lot* of
events (especially if dm-crypt is used), and 2 minutes might be not
enough for that. Make it possible to override the timeout (via systemd
drop-in files), and use a longer timeout (5 minutes) by default.

Fixes: http://tracker.ceph.com/issues/18740
Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>

@asheplyakov asheplyakov force-pushed the asheplyakov:master-18740 branch from adb7727 to 22332f6 Feb 6, 2017

@tchaikov tchaikov requested a review from Feb 6, 2017

@tchaikov
Copy link
Contributor

tchaikov left a comment

lgtm. @dachary what do you think? the timeout was introduced in bed1a5c as the fix of http://tracker.ceph.com/issues/16580.

@ghost

ghost approved these changes Feb 6, 2017

@ghost

This comment has been minimized.

Copy link

ghost commented Feb 6, 2017

good, after a ceph-disk suite run

@tchaikov tchaikov self-assigned this Feb 8, 2017

@ktdreyer

This comment has been minimized.

Copy link
Member

ktdreyer commented Feb 8, 2017

needs docs for this new CEPH_DISK_TIMEOUT parameter?

@tchaikov

This comment has been minimized.

@tchaikov tchaikov merged commit c52431b into ceph:master Mar 24, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
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.