diff options
| author | Yuri Weinstein <yuri.weinstein@gmail.com> | 2016-08-05 17:22:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 17:22:39 +0200 |
| commit | 8175ce07b804afd40bbefe8ed20efff8d3266ca2 (patch) | |
| tree | a3909b32d6127a445f6b08d4f85892b35de34d6c /systemd | |
| parent | Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28 (diff) | |
| parent | ceph-disk: timeout ceph-disk to avoid blocking forever (diff) | |
| download | ceph-8175ce07b804afd40bbefe8ed20efff8d3266ca2.tar.xz ceph-8175ce07b804afd40bbefe8ed20efff8d3266ca2.zip | |
Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout
ceph-disk: timeout ceph-disk to avoid blocking forever
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/ceph-disk@.service | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/systemd/ceph-disk@.service b/systemd/ceph-disk@.service index 8b18ba4349d..f13c30beb10 100644 --- a/systemd/ceph-disk@.service +++ b/systemd/ceph-disk@.service @@ -4,5 +4,5 @@ Description=Ceph disk activation: %f [Service] Type=oneshot KillMode=none -ExecStart=/bin/sh -c 'flock /var/lock/ceph-disk /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f' +ExecStart=/bin/sh -c 'timeout 120 flock /var/lock/ceph-disk /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f' TimeoutSec=0 |