]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
cephadm: Aquire lock, if fsid != None
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 09:51:49 +0000 (11:51 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 24 Apr 2020 16:13:37 +0000 (18:13 +0200)
commit207cffbe4569ab5af18bb4945d99c78d7a41c11a
tree0cdae447a21bfa1904aa7eec422d7138c91b59ec
parent23d7b61dc0fff2afcd7602964174668a2951c7ad
cephadm: Aquire lock, if fsid != None

Fixes:

```
Traceback (most recent call last):
  File "./cephadm", line 4494, in <module>
    r = args.func()
  File "./cephadm", line 1077, in _infer_fsid
    return func()
  File "./cephadm", line 1103, in _infer_image
    return func()
  File "./cephadm", line 2813, in command_ceph_volume
    l = FileLock(args.fsid)
  File "./cephadm", line 560, in __init__
    self._lock_file = os.path.join(LOCK_DIR, name + '.lock')
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2107649ffaf3d598a2d33cf94f40df1f91dff3c8)
src/cephadm/cephadm