Merge ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-revert-impish into ubuntu/+source/apache2:ubuntu/devel

[Bryce Harrington]

This reverts an SRU fix that was reported to have a performance impact reported by focal users when supporting large numbers of vhosts. We reverted this in focal a few weeks ago and there's been no feedback regarding problems, so it's probably worth doing the same revert to the other releases.

After that, the plan will be to focus on a fix just for jammy, and then also get it accepted into Debian. After that we can evaluate whether or not to try SRUing again.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1832182-graceful-revert

[Christian Ehrhardt  (paelzer)]

Also filed against ubuntu/devel instead of impish, but by chance they still match so LP view is ok.
I checked git to be sure, just as I said in the Hirsute MP I can confirm that this is the exact revert of that old change.

Also I agree with taking it back given what the discussion in the bug revealed.

+1

review: Approve

[Bryce Harrington (bryce)]

Thanks, uploading:

$ dput ubuntu ../apache2_2.4.48-3.1ubuntu3.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../apache2_2.4.48-3.1ubuntu3.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../apache2_2.4.48-3.1ubuntu3.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.48-3.1ubuntu3.1.dsc: done.
  Uploading apache2_2.4.48-3.1ubuntu3.1.debian.tar.xz: done.
  Uploading apache2_2.4.48-3.1ubuntu3.1_source.buildinfo: done.
  Uploading apache2_2.4.48-3.1ubuntu3.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/apache2ctl b/debian/apache2ctl
index 02f3bca..404b9f9 100755
--- a/debian/apache2ctl
+++ b/debian/apache2ctl
@@ -143,21 +143,6 @@ mkdir_chown () {
     fi
 }
 
-need_systemd () {
-    # Detect if systemd is in use and should be used for managing
-    # the Apache2 httpd service.  Returns 0 if so, 1 otherwise.
-    if [ -z "${APACHE_STARTED_BY_SYSTEMD}" ]; then
-	case "$(readlink -f /proc/1/exe)" in
-	    *systemd*)
-		return 0
-		;;
-	esac
-	# With Docker, /proc/1 is not necessarily an init system,
-	# so fallback to checking in /run.
-        [ -d /run/systemd/system ]
-    fi
-    return 1
-}
 
 [ ! -d ${APACHE_RUN_DIR:-/var/run/apache2} ] && mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
 [ ! -d ${APACHE_LOCK_DIR:-/var/lock/apache2} ] && mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
@@ -168,38 +153,38 @@ start)
     # (this is bad if there are several apache2 instances running)
     rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
 
-    if need_systemd; then
+    need_systemd=false
+    if [ -z "$APACHE_STARTED_BY_SYSTEMD" ] ; then
+        case "$(readlink -f /proc/1/exe)" in
+        *systemd*)
+            need_systemd=true
+            ;;
+        *)
+            ;;
+        esac
+    fi
+    if $need_systemd ; then
         # If running on systemd we should not start httpd without systemd
         # or systemd will get confused about the status of httpd.
-        echo "Invoking 'systemctl start ${APACHE_SYSTEMD_SERVICE}'."
-        echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
-        systemctl start "${APACHE_SYSTEMD_SERVICE}"
+        echo "Invoking 'systemctl start $APACHE_SYSTEMD_SERVICE'."
+        echo "Use 'systemctl status $APACHE_SYSTEMD_SERVICE' for more info."
+        systemctl start "$APACHE_SYSTEMD_SERVICE"
     else
         unset APACHE_STARTED_BY_SYSTEMD
-        ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
+        $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
     fi
 
     ERROR=$?
     ;;
 stop|graceful-stop)
-    ${HTTPD} ${APACHE_ARGUMENTS} -k "$ARGV"
+    $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
     ERROR=$?
     ;;
 restart|graceful)
     if $HTTPD ${APACHE_ARGUMENTS} -t 2> /dev/null ; then
-        if need_systemd; then
-            # If running on systemd we should not directly restart httpd since
-            # systemd would be confused about httpd's status.
-            # (See LP: #1832182)
-            echo "Invoking 'systemctl restart ${APACHE_SYSTEMD_SERVICE}'."
-            echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
-            systemctl restart "${APACHE_SYSTEMD_SERVICE}"
-        else
-            unset APACHE_STARTED_BY_SYSTEMD
-            ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
-        fi
+        $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
     else
-        ${HTTPD} ${APACHE_ARGUMENTS} -t
+        $HTTPD ${APACHE_ARGUMENTS} -t
     fi
     ERROR=$?
     ;;
diff --git a/debian/changelog b/debian/changelog
index 0dbb7c5..7a81cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.48-3.1ubuntu3.1) impish; urgency=medium
+
+  * Revert fix from 2.4.46-1ubuntu2, due to performance regression.
+    (LP 1832182)
+
+ -- Bryce Harrington <[e-mail]>  Sun, 14 Nov 2021 23:49:31 +0000
+
 apache2 (2.4.48-3.1ubuntu3) impish; urgency=medium
 
   * SECURITY REGRESSION: Issues in UDS URIs (LP: #1945311)