]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cephadm: Aquire lock, if fsid != None 34674/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 09:51:49 +0000 (11:51 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 09:51:49 +0000 (11:51 +0200)
commit2107649ffaf3d598a2d33cf94f40df1f91dff3c8
tree378bb2237d0fc449f931459424205c13840fa8ff
parentcd94861e9648c2fb79aa95cf464f6fe7ae90a17f
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>
src/cephadm/cephadm