merge: master <--- feature/v17.2.5-5

* HEAD | \ | * 51829c2 <github@luxolus.com> pkgbuild: pkgrel=5 | * 50b8266 <github@luxolus.com> pkgbuild: package_ceph backup /etc/ conf | * fe1e3d3 <github@luxolus.com> pkgbuild: add logrotate-ignore-dups.patch | * 82a7efa <github@luxolus.com> pkgbuild: add mgr-sqlite-pragmas.patch | / | master Signed-off-by: Bazaah <github@luxolus.com>
bazaah · Dec 23, 2022 · 418a8f6 · 418a8f6
2 parents c793d9d + 51829c2
commit 418a8f6
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 9 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ceph
 	pkgdesc = Distributed, fault-tolerant storage platform delivering object, block, and file system
 	pkgver = 17.2.5
-	pkgrel = 4
+	pkgrel = 5
 	url = https://ceph.com/
 	arch = x86_64
 	license = GPL
@@ -152,6 +152,7 @@ pkgbase = ceph
 	source = ceph.sudoers
 	source = ceph-13.2.2-dont-install-sysvinit-script.patch
 	source = disable-empty-readable.sh-test.patch
+	source = ceph-17.2.5-logrotate-ignore-dups.patch
 	source = disable-test-cls-fifo.patch
 	source = ceph-16.2.7-delete-test-librados-asio.patch
 	source = ceph-17.2.4-tox-flake8-git-ls-files.patch
@@ -160,11 +161,13 @@ pkgbase = ceph
 	source = ceph-17.2.4-test-bluefs-split.patch
 	source = ceph-17.2.4-pybind-unmock-cythonize.patch
 	source = ceph-17.2.5-fix-iterator-depreciations.patch
+	source = ceph-18.0.0-mgr-sqlite-pragmas.patch
 	sha512sums = 10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020
 	sha512sums = 4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049
 	sha512sums = 41dbc1c395cdf9b3edf5c5d91bbc90f416b4338ad964fa3471f26a4312d3ec2a5dcebbc351a1640dc4b047b4f71aa134ac7486747e5f62980092b0176e7567f5
 	sha512sums = ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
 	sha512sums = 2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222
+	sha512sums = b12cabda7184721c494edd22250fd05019694d2bc445722d100cdefab5385bd25c2267a029d2f6053932fa6717e38c4314385afd986969ee2744d745b53c8b58
 	sha512sums = 3774cbc1a979ee8bf7138b96defcf69499444afe0b7186b21feac3453a3a5ec93741f5942d256d93999e9bc306c8d018206893e04e1a3eb9e03593105d9f5791
 	sha512sums = 66770a80ba4e05ea72d4809cb5819cce7499ea7523b85b1a57370df68de1d7f6f94b1c10d0f9f9a3c8e6a86d0419434c70778c568cd06a0dd2e6126631a3355c
 	sha512sums = 31e578b240ceaaf1216b56cdce654661eed6529ef642ecad164a02669e850100a49a85dc70f3d744671e2c5dad10aee64be7d091fa33007cb8fc6788a4336799
@@ -173,9 +176,10 @@ pkgbase = ceph
 	sha512sums = 81f540c8312972887a7cb43b8a4e29bfc6f24d5774787a4a8edfe65cca7d3b08faa08ecd09066d7ea67111769a5aec7385fe9a969546626f58874dd8aff5b664
 	sha512sums = 781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf
 	sha512sums = 2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36
+	sha512sums = b2e1f495b57f3ed65b466719faded1713d8155e10b6432b704c632501313b6a98a56461164942cf303427770be0d5efe4798572fe8490ee977bf652906166bde
 
 pkgname = ceph
-	depends = ceph-libs=17.2.5-4
+	depends = ceph-libs=17.2.5-5
 	depends = boost-libs
 	depends = curl
 	depends = fuse3
@@ -200,8 +204,12 @@ pkgname = ceph
 	depends = gawk
 	optdepends = smartmontools: disk monitoring via S.M.A.R.T
 	optdepends = nvme-cli: disk monitoring for NVMe drives
-	provides = ceph=17.2.5-4
+	provides = ceph=17.2.5-5
 	conflicts = ceph-bin
+	backup = etc/logrotate.d/ceph
+	backup = etc/udev/rules.d/50-ceph-rbd.rules
+	backup = etc/sysctl.d/90-ceph-osd.conf
+	backup = etc/sudoers.d/90-ceph
 
 pkgname = ceph-libs
 	depends = boost-libs
@@ -226,12 +234,12 @@ pkgname = ceph-libs
 	depends = python-prettytable
 	depends = python-yaml
 	depends = python-setuptools
-	provides = ceph-libs=17.2.5-4
+	provides = ceph-libs=17.2.5-5
 	conflicts = ceph-libs-bin
 
 pkgname = ceph-mgr
-	depends = ceph=17.2.5-4
-	depends = ceph-libs=17.2.5-4
+	depends = ceph=17.2.5-5
+	depends = ceph-libs=17.2.5-5
 	depends = bash
 	depends = boost-libs
 	depends = curl
@@ -260,6 +268,6 @@ pkgname = ceph-mgr
 	optdepends = python-kubernetes: rook module
 	optdepends = python-prometheus_client: prometheus module
 	optdepends = python-remoto: ssh module
-	provides = ceph-mgr=17.2.5-4
+	provides = ceph-mgr=17.2.5-5
 	conflicts = ceph<16.2.1-1
 	conflicts = ceph-mgr-bin
diff --git a/PKGBUILD b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase='ceph'
 pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
 pkgver=17.2.5
-pkgrel=4
+pkgrel=5
 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
 arch=('x86_64')
 url='https://ceph.com/'
@@ -51,6 +51,10 @@ source=(
   'ceph-13.2.2-dont-install-sysvinit-script.patch'
   'disable-empty-readable.sh-test.patch'
 
+  # Avoid spurious failures in logrotate when duplicate rule files exist,
+  # typically around cephadm auto-generated rotate rules
+  'ceph-17.2.5-logrotate-ignore-dups.patch'
+
   # Test breaks due to ambigous template in src/common/async/bind_like.h when called
   # in src/test/cls/fifo/bench_* and test_*. Not sure how to fix this so disabled for now
   'disable-test-cls-fifo.patch'
@@ -83,20 +87,26 @@ source=(
   # fixes the few usages of std::iterator which has been deprecated in c++17, quieting
   # a lot of _GLIBCXX17_DEPRECATED line noise during builds
   'ceph-17.2.5-fix-iterator-depreciations.patch'
+
+  # fixes an issue with mgr usage of libradossqlite and temp tables,
+  # backported from the upstream
+  'ceph-18.0.0-mgr-sqlite-pragmas.patch'
 )
 sha512sums=('10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
             '41dbc1c395cdf9b3edf5c5d91bbc90f416b4338ad964fa3471f26a4312d3ec2a5dcebbc351a1640dc4b047b4f71aa134ac7486747e5f62980092b0176e7567f5'
             'ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e'
             '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
+            'b12cabda7184721c494edd22250fd05019694d2bc445722d100cdefab5385bd25c2267a029d2f6053932fa6717e38c4314385afd986969ee2744d745b53c8b58'
             '3774cbc1a979ee8bf7138b96defcf69499444afe0b7186b21feac3453a3a5ec93741f5942d256d93999e9bc306c8d018206893e04e1a3eb9e03593105d9f5791'
             '66770a80ba4e05ea72d4809cb5819cce7499ea7523b85b1a57370df68de1d7f6f94b1c10d0f9f9a3c8e6a86d0419434c70778c568cd06a0dd2e6126631a3355c'
             '31e578b240ceaaf1216b56cdce654661eed6529ef642ecad164a02669e850100a49a85dc70f3d744671e2c5dad10aee64be7d091fa33007cb8fc6788a4336799'
             'e59cc0ec58d85369ed9f2b8969e2280609fe98828ea66b5bb80a423f4a0aa547da52c6ba9d9610cece442c515e123d1af169e11ec106aff8cd3dadaea35cad90'
             '6b53e3a2b1941f8dfdb4b83cafc4c500e818dd3a0736d7061f0ebcdfb514094b217e4688384c5b428288181ef6fff0ca73895c65a046e2d6ae2b834375164216'
             '81f540c8312972887a7cb43b8a4e29bfc6f24d5774787a4a8edfe65cca7d3b08faa08ecd09066d7ea67111769a5aec7385fe9a969546626f58874dd8aff5b664'
             '781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf'
-            '2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36')
+            '2a6f33791760e14543c90077bfc6bf1b6b82ee2996e80b4762eadb887a0d9a67c221b6f10832ddf780dc6abaed246a1e2ee7680c9c861c4ff70e61b752a37b36'
+            'b2e1f495b57f3ed65b466719faded1713d8155e10b6432b704c632501313b6a98a56461164942cf303427770be0d5efe4798572fe8490ee977bf652906166bde')
 
 # -fno-plt causes linker errors (undefined reference to internal methods)
 # similar issue: https://bugs.archlinux.org/task/54845
@@ -241,6 +251,10 @@ package_ceph() {
            'ncurses'
            'nss' 'oath-toolkit' 'python'
            'snappy' 'sudo' 'systemd-libs' 'lua' 'gawk')
+  backup=('etc/logrotate.d/ceph'
+          'etc/udev/rules.d/50-ceph-rbd.rules'
+          'etc/sysctl.d/90-ceph-osd.conf'
+          'etc/sudoers.d/90-ceph')
   optdepends=('smartmontools: disk monitoring via S.M.A.R.T'
               'nvme-cli: disk monitoring for NVMe drives')
   provides=("ceph=${pkgver}-${pkgrel}")

diff --git a/ceph-17.2.5-logrotate-ignore-dups.patch b/ceph-17.2.5-logrotate-ignore-dups.patch
@@ -0,0 +1,11 @@
+diff --git a/src/logrotate.conf b/src/logrotate.conf
+index a9a452dd656..7949bebf49b 100644
+--- a/src/logrotate.conf
++++ b/src/logrotate.conf
+@@ -8,5 +8,6 @@
+     endscript
+     missingok
+     notifempty
++    ignoreduplicates
+     su root ceph
+ }
diff --git a/ceph-18.0.0-mgr-sqlite-pragmas.patch b/ceph-18.0.0-mgr-sqlite-pragmas.patch
@@ -0,0 +1,39 @@
+From 8d853cc4990dc4dbccdc916115b0b30e0ac9dc19 Mon Sep 17 00:00:00 2001
+From: Patrick Donnelly <pdonnell@redhat.com>
+Date: Tue, 11 Oct 2022 13:43:03 -0400
+Subject: [PATCH] pybind/mgr: use memory temp_store for sqlite3 db
+
+It appears some situations require sqlite3 to open a temporary database
+to execute the old database dump.
+
+Fixes: https://tracker.ceph.com/issues/57851
+Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
+---
+ src/pybind/mgr/mgr_module.py                       | 1 +
+ src/pybind/mgr/snap_schedule/fs/schedule_client.py | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
+index 146901b1578ef..746413fa04e0e 100644
+--- a/src/pybind/mgr/mgr_module.py
++++ b/src/pybind/mgr/mgr_module.py
+@@ -1202,6 +1202,7 @@ def configure_db(self, db: sqlite3.Connection) -> None:
+         db.execute('PRAGMA JOURNAL_MODE = PERSIST')
+         db.execute('PRAGMA PAGE_SIZE = 65536')
+         db.execute('PRAGMA CACHE_SIZE = 64')
++        db.execute('PRAGMA TEMP_STORE = memory')
+         db.row_factory = sqlite3.Row
+         self.load_schema(db)
+
+diff --git a/src/pybind/mgr/snap_schedule/fs/schedule_client.py b/src/pybind/mgr/snap_schedule/fs/schedule_client.py
+index 486582074767e..1fc3217ec7d26 100644
+--- a/src/pybind/mgr/snap_schedule/fs/schedule_client.py
++++ b/src/pybind/mgr/snap_schedule/fs/schedule_client.py
+@@ -193,6 +193,7 @@ def get_schedule_db(self, fs: str) -> DBConnectionManager:
+             db.execute('PRAGMA JOURNAL_MODE = PERSIST')
+             db.execute('PRAGMA PAGE_SIZE = 65536')
+             db.execute('PRAGMA CACHE_SIZE = 256')
++            db.execute('PRAGMA TEMP_STORE = memory')
+             db.row_factory = sqlite3.Row
+             # check for legacy dump store
+             pool_param = cast(Union[int, str], poolid)