1 |
commit: c7b2b02c6ba86ca2e4d36ee847fa4cca88dc46c2 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Tue Sep 17 22:55:07 2019 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 17 22:55:52 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b2b02c |
7 |
|
8 |
sys-cluster/ceph: Version bump to 14.2.4, drop x86 (bug 687344) |
9 |
|
10 |
Dropped x86 keyword since it doesn't build (bug #687344) |
11 |
|
12 |
Upstream fix for bug #694140 included in release |
13 |
|
14 |
Closes: https://bugs.gentoo.org/687344 |
15 |
Closes: https://bugs.gentoo.org/694140 |
16 |
Copyright: Sony Interactive Entertainment Inc. |
17 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
18 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
19 |
|
20 |
sys-cluster/ceph/Manifest | 1 + |
21 |
sys-cluster/ceph/ceph-14.2.4.ebuild | 356 +++++++++++++++++++++ |
22 |
.../files/ceph-14.2.3-dpdk-compile-fix-1.patch | 111 +++++++ |
23 |
3 files changed, 468 insertions(+) |
24 |
|
25 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
26 |
index 0655ed2e6b6..b1f4c196936 100644 |
27 |
--- a/sys-cluster/ceph/Manifest |
28 |
+++ b/sys-cluster/ceph/Manifest |
29 |
@@ -4,3 +4,4 @@ DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da02482 |
30 |
DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8 |
31 |
DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c |
32 |
DIST ceph-14.2.3.tar.gz 118349530 BLAKE2B db73d6adeca84426eee1b47a8ee68c4f94ee7a61e60ef1127153d19e02472a658877ebb7adfad5b4725d2c8c38855636bad1c44e79a3d3c397b56f74bf4b53fa SHA512 3d02e766a1d53d39355ee88738dd0233dc02f8a3cb44935194cb538b888507de8f8acdd99bf7890895f68795a310f53e2a8652305d5f2be5212efbd9046bd3a9 |
33 |
+DIST ceph-14.2.4.tar.gz 116371380 BLAKE2B 2d2c78ec32a0749df16e9c527d2fd087a75daeb2ef26ac5f6aa641989eab62fa276eb320b873740e9eee3fd4f369da152c53c2389b1def1b6a45906ccc1bd1f1 SHA512 dc60321ed4dcaccacca711ab70c35011b5dfc6b8369016fb413a9976199ed4ba22c7dc87ba1ebaf1118513dee1a0c263c99ab137f27fc03c55e8a0625a3bdcc0 |
34 |
|
35 |
diff --git a/sys-cluster/ceph/ceph-14.2.4.ebuild b/sys-cluster/ceph/ceph-14.2.4.ebuild |
36 |
new file mode 100644 |
37 |
index 00000000000..82af9e6a844 |
38 |
--- /dev/null |
39 |
+++ b/sys-cluster/ceph/ceph-14.2.4.ebuild |
40 |
@@ -0,0 +1,356 @@ |
41 |
+# Copyright 1999-2019 Gentoo Authors |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+ |
44 |
+EAPI=7 |
45 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
46 |
+DISTUTILS_OPTIONAL=1 |
47 |
+ |
48 |
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ |
49 |
+ multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ |
50 |
+ systemd |
51 |
+ |
52 |
+if [[ ${PV} == *9999* ]]; then |
53 |
+ inherit git-r3 |
54 |
+ EGIT_REPO_URI="https://github.com/ceph/ceph.git" |
55 |
+ SRC_URI="" |
56 |
+else |
57 |
+ SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
58 |
+ KEYWORDS="~amd64 ~arm64" |
59 |
+fi |
60 |
+ |
61 |
+DESCRIPTION="Ceph distributed filesystem" |
62 |
+HOMEPAGE="https://ceph.com/" |
63 |
+ |
64 |
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" |
65 |
+SLOT="0" |
66 |
+ |
67 |
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
68 |
+ |
69 |
+IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" |
70 |
+IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" |
71 |
+IUSE+=" systemd +tcmalloc test xfs zfs" |
72 |
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
73 |
+ |
74 |
+COMMON_DEPEND=" |
75 |
+ virtual/libudev:= |
76 |
+ app-arch/bzip2:=[static-libs?] |
77 |
+ app-arch/lz4:=[static-libs?] |
78 |
+ app-arch/snappy:=[static-libs?] |
79 |
+ app-arch/zstd:=[static-libs?] |
80 |
+ app-misc/jq:=[static-libs?] |
81 |
+ dev-libs/crypto++:=[static-libs?] |
82 |
+ dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] |
83 |
+ dev-libs/libaio:=[static-libs?] |
84 |
+ dev-libs/libxml2:=[static-libs?] |
85 |
+ dev-libs/nss:= |
86 |
+ sys-auth/oath-toolkit:= |
87 |
+ sys-apps/keyutils:=[static-libs?] |
88 |
+ sys-apps/util-linux:=[static-libs?] |
89 |
+ sys-libs/ncurses:0=[static-libs?] |
90 |
+ sys-libs/zlib:=[static-libs?] |
91 |
+ babeltrace? ( dev-util/babeltrace ) |
92 |
+ ldap? ( net-nds/openldap:=[static-libs?] ) |
93 |
+ lttng? ( dev-util/lttng-ust:= ) |
94 |
+ fuse? ( sys-fs/fuse:0=[static-libs?] ) |
95 |
+ kerberos? ( virtual/krb5 ) |
96 |
+ rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) |
97 |
+ ssl? ( |
98 |
+ !libressl? ( dev-libs/openssl:=[static-libs?] ) |
99 |
+ libressl? ( dev-libs/libressl:=[static-libs?] ) |
100 |
+ ) |
101 |
+ xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
102 |
+ zfs? ( sys-fs/zfs:=[static-libs?] ) |
103 |
+ radosgw? ( |
104 |
+ dev-libs/expat:=[static-libs?] |
105 |
+ !libressl? ( |
106 |
+ dev-libs/openssl:=[static-libs?] |
107 |
+ net-misc/curl:=[curl_ssl_openssl,static-libs?] |
108 |
+ ) |
109 |
+ libressl? ( |
110 |
+ dev-libs/libressl:=[static-libs?] |
111 |
+ net-misc/curl:=[curl_ssl_libressl,static-libs?] |
112 |
+ ) |
113 |
+ ) |
114 |
+ system-boost? ( |
115 |
+ || ( |
116 |
+ ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
117 |
+ ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
118 |
+ ) |
119 |
+ dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
120 |
+ ) |
121 |
+ jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) |
122 |
+ !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) |
123 |
+ ${PYTHON_DEPS} |
124 |
+ " |
125 |
+DEPEND="${COMMON_DEPEND} |
126 |
+ amd64? ( dev-lang/yasm ) |
127 |
+ x86? ( dev-lang/yasm ) |
128 |
+ dev-python/cython[${PYTHON_USEDEP}] |
129 |
+ dev-python/sphinx |
130 |
+ dev-util/cunit |
131 |
+ test? ( |
132 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
133 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
134 |
+ sys-apps/grep[pcre] |
135 |
+ sys-fs/btrfs-progs |
136 |
+ ) |
137 |
+ " |
138 |
+BDEPEND=" app-arch/cpio |
139 |
+ >=dev-util/cmake-3.5.0 |
140 |
+ dev-util/gperf |
141 |
+ dev-util/valgrind |
142 |
+ sys-apps/which |
143 |
+ sys-devel/bc |
144 |
+ virtual/pkgconfig |
145 |
+ " |
146 |
+RDEPEND="${COMMON_DEPEND} |
147 |
+ net-misc/socat |
148 |
+ sys-apps/gptfdisk |
149 |
+ sys-block/parted |
150 |
+ sys-fs/cryptsetup |
151 |
+ sys-fs/lvm2[-device-mapper-only(-)] |
152 |
+ !<sys-apps/openrc-0.26.3 |
153 |
+ dev-python/bcrypt[${PYTHON_USEDEP}] |
154 |
+ dev-python/cherrypy[${PYTHON_USEDEP}] |
155 |
+ dev-python/flask[${PYTHON_USEDEP}] |
156 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
157 |
+ dev-python/pecan[${PYTHON_USEDEP}] |
158 |
+ dev-python/prettytable[${PYTHON_USEDEP}] |
159 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
160 |
+ dev-python/requests[${PYTHON_USEDEP}] |
161 |
+ dev-python/werkzeug[${PYTHON_USEDEP}] |
162 |
+ " |
163 |
+REQUIRED_USE=" |
164 |
+ ${PYTHON_REQUIRED_USE} |
165 |
+ || ( $(python_gen_useflags 'python3*') ) |
166 |
+ ?? ( jemalloc tcmalloc ) |
167 |
+ rabbitmq? ( radosgw ) |
168 |
+ " |
169 |
+ |
170 |
+# the tests need root access |
171 |
+RESTRICT="test? ( userpriv )" |
172 |
+ |
173 |
+# distribution tarball does not include everything needed for tests |
174 |
+RESTRICT+=" test" |
175 |
+ |
176 |
+# false positives unless all USE flags are on |
177 |
+CMAKE_WARN_UNUSED_CLI="no" |
178 |
+ |
179 |
+UNBUNDLE_LIBS=( |
180 |
+ src/erasure-code/jerasure/jerasure |
181 |
+ src/erasure-code/jerasure/gf-complete |
182 |
+) |
183 |
+ |
184 |
+PATCHES=( |
185 |
+ "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
186 |
+ "${FILESDIR}/ceph-14.2.0-cflags.patch" |
187 |
+ "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" |
188 |
+ "${FILESDIR}/ceph-13.2.0-cflags.patch" |
189 |
+ "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch" |
190 |
+ "${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch" |
191 |
+ "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
192 |
+ "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" |
193 |
+ "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch" |
194 |
+ "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
195 |
+ "${FILESDIR}/ceph-14.2.3-boost-1.70.patch" |
196 |
+ "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" |
197 |
+) |
198 |
+ |
199 |
+# dpdk and ninja don't get along |
200 |
+CMAKE_MAKEFILE_GENERATOR="emake" |
201 |
+ |
202 |
+check-reqs_export_vars() { |
203 |
+ if use amd64; then |
204 |
+ CHECKREQS_DISK_BUILD="12G" |
205 |
+ CHECKREQS_DISK_USR="460M" |
206 |
+ else |
207 |
+ CHECKREQS_DISK_BUILD="1400M" |
208 |
+ CHECKREQS_DISK_USR="450M" |
209 |
+ fi |
210 |
+ |
211 |
+ export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
212 |
+} |
213 |
+ |
214 |
+user_setup() { |
215 |
+ enewgroup ceph ${CEPH_GID} |
216 |
+ enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph |
217 |
+} |
218 |
+ |
219 |
+pkg_pretend() { |
220 |
+ check-reqs_export_vars |
221 |
+ check-reqs_pkg_pretend |
222 |
+} |
223 |
+ |
224 |
+pkg_setup() { |
225 |
+ python_setup 'python3*' |
226 |
+ check-reqs_export_vars |
227 |
+ check-reqs_pkg_setup |
228 |
+ user_setup |
229 |
+} |
230 |
+ |
231 |
+src_prepare() { |
232 |
+ cmake-utils_src_prepare |
233 |
+ |
234 |
+ if use system-boost; then |
235 |
+ eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch" |
236 |
+ |
237 |
+ has_version '>=dev-libs/boost-1.70.0' || \ |
238 |
+ eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch" |
239 |
+ fi |
240 |
+ |
241 |
+ sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ |
242 |
+ src/bash_completion/CMakeLists.txt || die |
243 |
+ |
244 |
+ # remove tests that need root access |
245 |
+ rm src/test/cli/ceph-authtool/cap*.t || die |
246 |
+} |
247 |
+ |
248 |
+ceph_src_configure() { |
249 |
+ local flag |
250 |
+ local mycmakeargs=( |
251 |
+ -DWITH_BABELTRACE=$(usex babeltrace) |
252 |
+ -DWITH_CEPHFS=$(usex cephfs) |
253 |
+ -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) |
254 |
+ -DWITH_DPDK=$(usex dpdk) |
255 |
+ -DWITH_FUSE=$(usex fuse) |
256 |
+ -DWITH_LTTNG=$(usex lttng) |
257 |
+ -DWITH_GSSAPI=$(usex kerberos) |
258 |
+ -DWITH_GRAFANA=$(usex grafana) |
259 |
+ -DWITH_MGR=$(usex mgr) |
260 |
+ -DWITH_MGR_DASHBOARD_FRONTEND=NO |
261 |
+ -DWITH_NUMA=$(usex numa) |
262 |
+ -DWITH_OPENLDAP=$(usex ldap) |
263 |
+ -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) |
264 |
+ -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) |
265 |
+ -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) |
266 |
+ -DWITH_RADOSGW=$(usex radosgw) |
267 |
+ -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) |
268 |
+ -DWITH_SSL=$(usex ssl) |
269 |
+ -DWITH_SYSTEMD=$(usex systemd) |
270 |
+ -DWITH_TESTS=$(usex test) |
271 |
+ -DWITH_XFS=$(usex xfs) |
272 |
+ -DWITH_ZFS=$(usex zfs) |
273 |
+ -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') |
274 |
+ -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") |
275 |
+ -DWITH_SYSTEM_BOOST=$(usex system-boost) |
276 |
+ -DBOOST_J=$(makeopts_jobs) |
277 |
+ -DWITH_RDMA=no |
278 |
+ -DWITH_TBB=no |
279 |
+ -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) |
280 |
+ -DEPYTHON_VERSION="${EPYTHON#python}" |
281 |
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
282 |
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" |
283 |
+ #-Wno-dev |
284 |
+ ) |
285 |
+ if use amd64 || use x86; then |
286 |
+ for flag in ${CPU_FLAGS_X86[@]}; do |
287 |
+ mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") |
288 |
+ done |
289 |
+ fi |
290 |
+ |
291 |
+ rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ |
292 |
+ || die "failed to remove cmake cache" |
293 |
+ |
294 |
+ cmake-utils_src_configure |
295 |
+ |
296 |
+ # bug #630232 |
297 |
+ sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
298 |
+ "${BUILD_DIR:-${S}}"/include/acconfig.h \ |
299 |
+ || die "sed failed" |
300 |
+} |
301 |
+ |
302 |
+src_configure() { |
303 |
+ ceph_src_configure |
304 |
+} |
305 |
+ |
306 |
+python_compile() { |
307 |
+ local CMAKE_USE_DIR="${S}" |
308 |
+ ceph_src_configure |
309 |
+ |
310 |
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
311 |
+ emake VERBOSE=1 clean |
312 |
+ emake VERBOSE=1 all |
313 |
+ |
314 |
+ # python modules are only compiled with "make install" so we need to do this to |
315 |
+ # prevent doing a bunch of compilation in src_install |
316 |
+ DESTDIR="${T}" emake VERBOSE=1 install |
317 |
+ popd >/dev/null || die |
318 |
+} |
319 |
+ |
320 |
+src_compile() { |
321 |
+ cmake-utils_src_make VERBOSE=1 all |
322 |
+ |
323 |
+ # we have to do this here to prevent from building everything multiple times |
324 |
+ python_copy_sources |
325 |
+ python_foreach_impl python_compile |
326 |
+} |
327 |
+ |
328 |
+src_test() { |
329 |
+ make check || die "make check failed" |
330 |
+} |
331 |
+ |
332 |
+python_install() { |
333 |
+ local CMAKE_USE_DIR="${S}" |
334 |
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
335 |
+ DESTDIR="${ED}" emake VERBOSE=1 install |
336 |
+ popd >/dev/null || die |
337 |
+} |
338 |
+ |
339 |
+src_install() { |
340 |
+ cmake-utils_src_install |
341 |
+ python_foreach_impl python_install |
342 |
+ |
343 |
+ find "${ED}" -name '*.la' -type f -delete || die |
344 |
+ |
345 |
+ exeinto /usr/$(get_libdir)/ceph |
346 |
+ newexe "${BUILD_DIR}/bin/init-ceph" init-ceph |
347 |
+ |
348 |
+ insinto /etc/logrotate.d/ |
349 |
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
350 |
+ |
351 |
+ keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
352 |
+ |
353 |
+ fowners -R ceph:ceph /var/lib/ceph /var/log/ceph |
354 |
+ |
355 |
+ newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
356 |
+ newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} |
357 |
+ newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
358 |
+ |
359 |
+ insinto /etc/sysctl.d |
360 |
+ newins "${FILESDIR}"/sysctld 90-${PN}.conf |
361 |
+ |
362 |
+ use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc |
363 |
+ |
364 |
+ # units aren't installed by the build system unless systemd is enabled |
365 |
+ # so no point installing these with the USE flag disabled |
366 |
+ if use systemd; then |
367 |
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ |
368 |
+ "ceph-mds@.service" |
369 |
+ |
370 |
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ |
371 |
+ "ceph-osd@.service" |
372 |
+ fi |
373 |
+ |
374 |
+ udev_dorules udev/*.rules |
375 |
+ |
376 |
+ readme.gentoo_create_doc |
377 |
+ |
378 |
+ python_setup 'python3*' |
379 |
+ |
380 |
+ # bug #630232 |
381 |
+ sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ |
382 |
+ || die "sed failed" |
383 |
+ |
384 |
+ python_fix_shebang "${ED}"/usr/{,s}bin/ |
385 |
+ |
386 |
+ # python_fix_shebang apparently is not idempotent |
387 |
+ sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ |
388 |
+ "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" |
389 |
+ |
390 |
+ local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) |
391 |
+ dostrip -x "${rados_classes[@]#${ED}}" |
392 |
+} |
393 |
+ |
394 |
+pkg_postinst() { |
395 |
+ readme.gentoo_print_elog |
396 |
+} |
397 |
|
398 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch b/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch |
399 |
new file mode 100644 |
400 |
index 00000000000..ef06758326e |
401 |
--- /dev/null |
402 |
+++ b/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch |
403 |
@@ -0,0 +1,111 @@ |
404 |
+diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc |
405 |
+index 3101ae57ac..1db97c289a 100644 |
406 |
+--- a/src/msg/async/dpdk/DPDKStack.cc |
407 |
++++ b/src/msg/async/dpdk/DPDKStack.cc |
408 |
+@@ -203,7 +203,9 @@ DPDKWorker::Impl::~Impl() |
409 |
+ _dev->unset_local_queue(id); |
410 |
+ } |
411 |
+ |
412 |
+-int DPDKWorker::listen(entity_addr_t &sa, const SocketOptions &opt, |
413 |
++int DPDKWorker::listen(entity_addr_t &sa, |
414 |
++ unsigned addr_slot, |
415 |
++ const SocketOptions &opt, |
416 |
+ ServerSocket *sock) |
417 |
+ { |
418 |
+ ceph_assert(sa.get_family() == AF_INET); |
419 |
+diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h |
420 |
+index a44ae38367..622ff8a3c6 100644 |
421 |
+--- a/src/msg/async/dpdk/DPDKStack.h |
422 |
++++ b/src/msg/async/dpdk/DPDKStack.h |
423 |
+@@ -37,7 +37,7 @@ class DPDKServerSocketImpl : public ServerSocketImpl { |
424 |
+ typename Protocol::listener _listener; |
425 |
+ public: |
426 |
+ DPDKServerSocketImpl(Protocol& proto, uint16_t port, const SocketOptions &opt, |
427 |
+- int type); |
428 |
++ int type, unsigned addr_slot); |
429 |
+ int listen() { |
430 |
+ return _listener.listen(); |
431 |
+ } |
432 |
+@@ -184,8 +184,9 @@ class NativeConnectedSocketImpl : public ConnectedSocketImpl { |
433 |
+ |
434 |
+ template <typename Protocol> |
435 |
+ DPDKServerSocketImpl<Protocol>::DPDKServerSocketImpl( |
436 |
+- Protocol& proto, uint16_t port, const SocketOptions &opt, int type) |
437 |
+- : ServerSocketImpl(type), _listener(proto.listen(port)) {} |
438 |
++ Protocol& proto, uint16_t port, const SocketOptions &opt, |
439 |
++ int type, unsigned addr_slot) |
440 |
++ : ServerSocketImpl(type, addr_slot), _listener(proto.listen(port)) {} |
441 |
+ |
442 |
+ template <typename Protocol> |
443 |
+ int DPDKServerSocketImpl<Protocol>::accept(ConnectedSocket *s, const SocketOptions &options, entity_addr_t *out, Worker *w) { |
444 |
+@@ -229,7 +230,8 @@ class DPDKWorker : public Worker { |
445 |
+ |
446 |
+ public: |
447 |
+ explicit DPDKWorker(CephContext *c, unsigned i): Worker(c, i) {} |
448 |
+- virtual int listen(entity_addr_t &addr, const SocketOptions &opts, ServerSocket *) override; |
449 |
++ virtual int listen(entity_addr_t &addr, unsigned addr_slot, |
450 |
++ const SocketOptions &opts, ServerSocket *) override; |
451 |
+ virtual int connect(const entity_addr_t &addr, const SocketOptions &opts, ConnectedSocket *socket) override; |
452 |
+ void arp_learn(ethernet_address l2, ipv4_address l3) { |
453 |
+ _impl->_inet.learn(l2, l3); |
454 |
+diff --git a/src/msg/async/dpdk/TCP.cc b/src/msg/async/dpdk/TCP.cc |
455 |
+index c6397709b1..26f29e10f7 100644 |
456 |
+--- a/src/msg/async/dpdk/TCP.cc |
457 |
++++ b/src/msg/async/dpdk/TCP.cc |
458 |
+@@ -153,9 +153,10 @@ bool ipv4_tcp::forward(forward_hash& out_hash_data, Packet& p, size_t off) |
459 |
+ } |
460 |
+ |
461 |
+ int tcpv4_listen(tcp<ipv4_traits>& tcpv4, uint16_t port, const SocketOptions &opts, |
462 |
+- int type, ServerSocket *sock) |
463 |
++ int type, unsigned addr_slot, ServerSocket *sock) |
464 |
+ { |
465 |
+- auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, type); |
466 |
++ auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, |
467 |
++ type, addr_slot); |
468 |
+ int r = p->listen(); |
469 |
+ if (r < 0) { |
470 |
+ delete p; |
471 |
+diff --git a/src/msg/async/dpdk/DPDK.h b/src/msg/async/dpdk/DPDK.h |
472 |
+index fa12af6b27..6bb52973e0 100644 |
473 |
+--- a/src/msg/async/dpdk/DPDK.h |
474 |
++++ b/src/msg/async/dpdk/DPDK.h |
475 |
+@@ -833,7 +833,7 @@ class DPDKDevice { |
476 |
+ subscription<Packet> receive(unsigned cpuid, std::function<int (Packet)> next_packet) { |
477 |
+ auto sub = _queues[cpuid]->_rx_stream.listen(std::move(next_packet)); |
478 |
+ _queues[cpuid]->rx_start(); |
479 |
+- return std::move(sub); |
480 |
++ return sub; |
481 |
+ } |
482 |
+ ethernet_address hw_address() { |
483 |
+ struct ether_addr mac; |
484 |
+@@ -849,7 +849,7 @@ class DPDKDevice { |
485 |
+ std::unique_ptr<DPDKQueuePair> init_local_queue(CephContext *c, EventCenter *center, string hugepages, uint16_t qid) { |
486 |
+ std::unique_ptr<DPDKQueuePair> qp; |
487 |
+ qp = std::unique_ptr<DPDKQueuePair>(new DPDKQueuePair(c, center, this, qid)); |
488 |
+- return std::move(qp); |
489 |
++ return qp; |
490 |
+ } |
491 |
+ unsigned hash2qid(uint32_t hash) { |
492 |
+ // return hash % hw_queues_count(); |
493 |
+diff --git a/src/msg/async/dpdk/Packet.h b/src/msg/async/dpdk/Packet.h |
494 |
+index db9cd2a764..f929da3178 100644 |
495 |
+--- a/src/msg/async/dpdk/Packet.h |
496 |
++++ b/src/msg/async/dpdk/Packet.h |
497 |
+@@ -125,7 +125,7 @@ class Packet { |
498 |
+ n->rss_hash.construct(old->rss_hash); |
499 |
+ std::copy(old->frags, old->frags + old->_nr_frags, n->frags); |
500 |
+ old->copy_internal_fragment_to(n.get()); |
501 |
+- return std::move(n); |
502 |
++ return n; |
503 |
+ } |
504 |
+ |
505 |
+ static std::unique_ptr<impl> copy(impl* old) { |
506 |
+@@ -134,7 +134,7 @@ class Packet { |
507 |
+ |
508 |
+ static std::unique_ptr<impl> allocate_if_needed(std::unique_ptr<impl> old, size_t extra_frags) { |
509 |
+ if (old->_allocated_frags >= old->_nr_frags + extra_frags) { |
510 |
+- return std::move(old); |
511 |
++ return old; |
512 |
+ } |
513 |
+ return copy(old.get(), std::max<size_t>(old->_nr_frags + extra_frags, 2 * old->_nr_frags)); |
514 |
+ } |