Skip to content

Commit

Permalink
deb,rpm: python-cephfs should depend on python-rados
Browse files Browse the repository at this point in the history
in `cephfs.pyx` we `cimport rados`, and in
LibCephFs.create_with_rados(), Rados.cluster is accesssed without GIL,
so we need to import the rados module for cephfs to ensure that it's
safe to access this attribute without GIL.

dh_python2 and dh_python3 cannot fill ${python:Depends} and
${python3:Depends} with this dependency, so we need to set it
explicitly.

Fixes: http://tracker.ceph.com/issues/24918
Signed-off-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov committed Jul 25, 2018
1 parent b8f079a commit b35823c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 1 addition & 3 deletions ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,7 @@ Summary: Python 2 libraries for Ceph distributed file system
Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
%endif
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-cephfs
This package contains Python 2 libraries for interacting with Cephs distributed
Expand Down
4 changes: 4 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@ Package: python-rgw
Architecture: linux-any
Section: python
Depends: librgw2 (>= ${binary:Version}),
python-rados (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends},
Expand Down Expand Up @@ -925,6 +926,7 @@ Package: python3-rgw
Architecture: linux-any
Section: python
Depends: librgw2 (>= ${binary:Version}),
python3-rados (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
Expand Down Expand Up @@ -957,6 +959,7 @@ Package: python-cephfs
Architecture: linux-any
Section: python
Depends: libcephfs2 (= ${binary:Version}),
python-rados (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends},
Expand Down Expand Up @@ -991,6 +994,7 @@ Package: python3-cephfs
Architecture: linux-any
Section: python
Depends: libcephfs2 (= ${binary:Version}),
python3-rados (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
Expand Down

0 comments on commit b35823c

Please sign in to comment.