Skip to content

Commit b4f3969

Browse files
illuusiogrooverdan
authored andcommitted
MDEV-28121: Add new compression plugins as autopkg dependencies
Add compression plugins: * bzip2 * lz4 * lzma * lzo * snappy To Autopkg's basic smoke-test dependencies. Also make sure that MariaDB service is reloaded when smoke-test is executed.
1 parent db655e1 commit b4f3969

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

debian/tests/control

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ Tests: smoke
33
# for its existence (see the list in debian/control), install it if available
44
# and check in the test if it's functional when it should be.
55
# The plugin package also already depends on the other one.
6-
Depends: mariadb-plugin-rocksdb | mariadb-server-10.7
6+
Depends: mariadb-plugin-rocksdb | mariadb-server-10.7,
7+
mariadb-plugin-provider-bzip2,
8+
mariadb-plugin-provider-lz4,
9+
mariadb-plugin-provider-lzma,
10+
mariadb-plugin-provider-lzo,
11+
mariadb-plugin-provider-snappy
712
Restrictions: allow-stderr needs-root isolation-container
813

914
Tests: upstream

debian/tests/smoke

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ else
3838
# If systemd (and systemctl) is available, but the service did not start, then
3939
# this smoke test is supposed to fail if next commands don't work.
4040
echo "Found systemctl, continuing smoke test.."
41+
# Compression plugins are separated from main server package
42+
# to own packages (for example LZ4 package mariadb-plugin-provider-lz4)
43+
# and they are installed after mariadb-server.
44+
# which means that they don't exist if MariaDB is not restarted
45+
systemctl restart mariadb
4146
fi
4247

4348
mysql <<EOT
@@ -71,10 +76,10 @@ EOT
7176
# but disabled with '#' the options that are not available in this binary build
7277
mariadb <<EOT
7378
SET GLOBAL innodb_compression_algorithm=lz4;
74-
#SET GLOBAL innodb_compression_algorithm=lzo;
75-
#SET GLOBAL innodb_compression_algorithm=lzma;
76-
#SET GLOBAL innodb_compression_algorithm=bzip2;
77-
#SET GLOBAL innodb_compression_algorithm=snappy;
79+
SET GLOBAL innodb_compression_algorithm=lzo;
80+
SET GLOBAL innodb_compression_algorithm=lzma;
81+
SET GLOBAL innodb_compression_algorithm=bzip2;
82+
SET GLOBAL innodb_compression_algorithm=snappy;
7883
SET GLOBAL innodb_compression_algorithm=zlib;
7984
SET GLOBAL innodb_compression_algorithm=none;
8085
EOT

0 commit comments

Comments
 (0)