--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package glance
There's a few changes that have accumulated in this package during the
freeze. Hopefully, that's still fine to accept them all. Let me know.
The changelog goes like this:
1* Add variables: DEB_BUILD_OPTIONS: nocheck DEB_BUILD_PROFILES: nocheck in
debian/salsa-ci.yml.
2* Do not delete /etc/glance/rootwrap.conf, owned by python3-glance-store.
(Closes: #987193).
3* mv /etc/glance/policy.json /etc/glance/disabled.policy.json.old instead of
deleting /etc/glance/policy.json.
4* Tune glance-api-uwsgi.ini for performance.
Let me describe all of the above.
The main goal of this unblock bug is to fix #987193 (ie: 2*) which is
an RC bug. The other changes are more polishing of the package. Let me
explain. Point 1* is only relevant to Salsa, I don't think it's a problem.
3* avoids that Debian users loose customization in their policy.json (which
now uses the folder in /etc/glance/policy.d instead) during upgrade. 4* is
just a tweak in the default number of threads/processes which IMO works
bettter.
Note that this version of the package has been tested in production.
Please unblock glance/21.0.0-2.
Cheers,
Thomas Goirand (zigo)
diff -Nru glance-21.0.0/debian/changelog glance-21.0.0/debian/changelog
--- glance-21.0.0/debian/changelog 2020-10-17 15:56:31.000000000 +0200
+++ glance-21.0.0/debian/changelog 2020-12-15 11:41:16.000000000 +0100
@@ -1,3 +1,15 @@
+glance (2:21.0.0-2) unstable; urgency=medium
+
+ * Add variables: DEB_BUILD_OPTIONS: nocheck DEB_BUILD_PROFILES: nocheck in
+ debian/salsa-ci.yml.
+ * Do not delete /etc/glance/rootwrap.conf, owned by python3-glance-store.
+ (Closes: #987193).
+ * mv /etc/glance/policy.json /etc/glance/disabled.policy.json.old instead of
+ deleting /etc/glance/policy.json.
+ * Tune glance-api-uwsgi.ini for performance.
+
+ -- Thomas Goirand <zigo@debian.org> Tue, 15 Dec 2020 11:41:16 +0100
+
glance (2:21.0.0-1) unstable; urgency=medium
* Add a debian/salsa-ci.yml and fix debian/watch file.
diff -Nru glance-21.0.0/debian/glance-api-uwsgi.ini glance-21.0.0/debian/glance-api-uwsgi.ini
--- glance-21.0.0/debian/glance-api-uwsgi.ini 2020-10-17 15:56:31.000000000 +0200
+++ glance-21.0.0/debian/glance-api-uwsgi.ini 2020-12-15 11:41:16.000000000 +0100
@@ -12,11 +12,6 @@
# This is running standalone
master = true
-# Threads and processes
-enable-threads = true
-
-processes = 4
-
# uwsgi recommends this to prevent thundering herd on accept.
thunder-lock = true
@@ -34,6 +29,23 @@
# exit instead of brutal reload on SIGTERM
die-on-term = true
+##########################
+### Performance tuning ###
+##########################
+# Threads and processes
+enable-threads = true
+
+# For max perf, set this to number of core*2
+processes = 8
+
+# This was benchmarked as a good value
+threads = 32
+
+# This is the number of sockets in the queue.
+# It improves a lot performances. This is comparable
+# to the Apache ServerLimit/MaxClients option.
+listen = 100
+
##################################
### OpenStack service specific ###
##################################
diff -Nru glance-21.0.0/debian/glance-common.postinst.in glance-21.0.0/debian/glance-common.postinst.in
--- glance-21.0.0/debian/glance-common.postinst.in 2020-10-17 15:56:31.000000000 +0200
+++ glance-21.0.0/debian/glance-common.postinst.in 2020-12-15 11:41:16.000000000 +0100
@@ -19,7 +19,9 @@
pkgos_write_new_conf glance glance-manage.conf
pkgos_write_new_conf glance glance-scrubber.conf
pkgos_write_new_conf glance glance-api-paste.ini
- rm -f /etc/glance/policy.json
+ if [ -r /etc/glance/policy.json ] ; then
+ mv /etc/glance/policy.json /etc/glance/disabled.policy.json.old
+ fi
pkgos_write_new_conf glance schema-image.json
pkgos_write_new_conf glance property-protections-policies.conf
pkgos_write_new_conf glance property-protections-roles.conf
diff -Nru glance-21.0.0/debian/glance-common.postrm.in glance-21.0.0/debian/glance-common.postrm.in
--- glance-21.0.0/debian/glance-common.postrm.in 2020-10-17 15:56:31.000000000 +0200
+++ glance-21.0.0/debian/glance-common.postrm.in 2020-12-15 11:41:16.000000000 +0100
@@ -13,7 +13,7 @@
glance-manage.conf glance-scrubber.conf glance-api-paste.ini \
glance-registry-paste.ini policy.json schema-image.json \
property-protections-policies.conf property-protections-roles.conf \
- ovf-metadata.json rootwrap.conf glance-swift.conf ; do
+ ovf-metadata.json glance-swift.conf ; do
if [ -e "/etc/glance/${i}" ] ; then
rm /etc/glance/${i}
fi
diff -Nru glance-21.0.0/debian/salsa-ci.yml glance-21.0.0/debian/salsa-ci.yml
--- glance-21.0.0/debian/salsa-ci.yml 2020-10-17 15:56:31.000000000 +0200
+++ glance-21.0.0/debian/salsa-ci.yml 2020-12-15 11:41:16.000000000 +0100
@@ -1,3 +1,7 @@
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
\ No newline at end of file
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ DEB_BUILD_OPTIONS: nocheck
+ DEB_BUILD_PROFILES: nocheck
--- End Message ---