deb,rpm: python-cephfs should depend on python-rados

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 <kchai@redhat.com>
(cherry picked from commit b35823cbbc9e5bbd9af4c942016fa9cd8f13aeda)

diff --git a/ceph.spec.in b/ceph.spec.in
index aa3c47abec11a2d0f55aba2e2e36716fafaa4094..4ebea47b6cb12f02ada4b676850b4aa951f44333 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -655,9 +655,7 @@ Summary:    Python 2 libraries for Ceph distributed file system
 Group:         Development/Languages/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

diff --git a/debian/control b/debian/control
index 65c29ed0d532fa1e5b4a9749cda20f91f543cc41..212e64967329ac99aea6b14c1461f30dd6f35dd3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -886,6 +886,7 @@ Package: python-rgw
 Architecture: linux-any
 Section: python
 Depends: librgw2 (>= ${binary:Version}),
+         python-rados (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
@@ -920,6 +921,7 @@ Package: python3-rgw
 Architecture: linux-any
 Section: python
 Depends: librgw2 (>= ${binary:Version}),
+         python3-rados (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends},
@@ -952,6 +954,7 @@ Package: python-cephfs
 Architecture: linux-any
 Section: python
 Depends: libcephfs2 (= ${binary:Version}),
+         python-rados (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
@@ -986,6 +989,7 @@ Package: python3-cephfs
 Architecture: linux-any
 Section: python
 Depends: libcephfs2 (= ${binary:Version}),
+         python3-rados (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends},