diff options
| author | Alexey Sheplyakov <asheplyakov@mirantis.com> | 2017-01-31 10:54:38 +0100 |
|---|---|---|
| committer | Alexey Sheplyakov <asheplyakov@mirantis.com> | 2017-02-06 11:17:20 +0100 |
| commit | 22332f6bae57a6975a99523a115eb70608f26331 (patch) | |
| tree | 4411bb58af6690fc1768a1304e567b651d728ab7 | |
| parent | Merge pull request #13237 from smithfarm/wip-18799 (diff) | |
| download | ceph-22332f6bae57a6975a99523a115eb70608f26331.tar.xz ceph-22332f6bae57a6975a99523a115eb70608f26331.zip | |
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>
| -rw-r--r-- | systemd/ceph-disk@.service | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/systemd/ceph-disk@.service b/systemd/ceph-disk@.service index e85f0dfb908..57a35ce5f61 100644 --- a/systemd/ceph-disk@.service +++ b/systemd/ceph-disk@.service @@ -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' TimeoutSec=0 |