Revert "Merge branch 'main' into v4.1.x"

This reverts commit d3395b5, reversing changes made to 1af6c4d. To avoid having a tag on two branches.
rabbitmq · Feb 11, 2025 · 0c88f12 · 0c88f12
1 parent d3395b5
commit 0c88f12
Show file tree

Hide file tree

Showing 8 changed files with 335 additions and 338 deletions.
diff --git a/SERVER_RELEASES.md b/SERVER_RELEASES.md
@@ -1,3 +1,285 @@
-# RabbitMQ Server Releases
+# RabbitMQ server releases
 
-See [`rabbitmq/server-packages`](https://github.com/rabbitmq/server-packages/).
+This repository provides scripts and Makefiles we use to create RabbitMQ
+server releases. It is organized in the following way:
+* The top-level `Makefile` manages the source archive.
+* There is a subdirectory inside `packaging` for each type of package we
+ support.
+
+## TL;DR
+
+* To create a source archive and all supported packages:
+
+    ```
+    make packages
+    ```
+
+* To create a source archive and all supported packages, with a given version:
+
+    ```
+    make packages PROJECT_VERSION=3.13.0-rc.3
+    ```
+
+* To create all suported packages from an existing source archive:
+
+    ```
+    make -C packaging SOURCE_DIST_FILE=/path/to/rabbitmq-server-3.13.0-rc.3.tar.xz
+    ```
+
+The standalone package is different because it embeds the build
+platform's Erlang copy. Thus on Linux for instance, only the
+`linux-x86_64` standalone package will be built. To build the OS X
+standalone package, you need to run the following command on an OS X
+build host:
+
+```
+make package-standalone-macosx
+# or
+make -C packaging package-standalone-macosx SOURCE_DIST_FILE=/path/to/rabbitmq-server-3.13.0-rc.3.tar.xz
+```
+
+The instructions in the [`PKG_LINUX.md`](PKG_LINUX.md) document include a
+script to install the necessary pre-requisites for building package archives as
+well as `deb` and `rpm` packages.
+
+## Source archive
+
+### How to create it
+
+The source archive is created with the following command:
+```
+make source-dist
+```
+
+It uses Erlang.mk's `PROJECT_VERSION` variable to set the version of the
+source archive. If the variable is unset, Erlang.mk computes a value
+based on the last tag and the current HEAD.
+
+Here is an example with an explicit version:
+```
+make source-dist PROJECT_VERSION=3.13.0-rc.3
+```
+
+The version is automatically propagated to the broker and plugins so
+they all advertise the same version.
+
+The result is then available in the `PACKAGES` subdirectory. You can
+override the output directory with the `PACKAGES_DIR` variable:
+```
+make source-dist PROJDCT_VERSION=3.13.0-rc.3 \
+  PACKAGES_DIR=/tmp
+```
+
+By default, two archives are produced:
+* a `tar.xz` file;
+* a `zip` file.
+
+You can ask for more/different types by specifying the
+`SOURCE_DIST_SUFFIXES` variable:
+```
+make source-dist PROJECT_VERSION=3.13.0-rc.3 \
+  SOURCE_DIST_SUFFIXES='tar.xz tar.gz'
+```
+
+Supported archive types are:
+* `tar.bz2`;
+* `tar.gz`;
+* `tar.xz`;
+* `zip`.
+
+### What is included
+
+The source archive includes the broker and a set of plugins. The default
+list of plugins is in the `plugins.mk` file.
+
+You can override this list by setting the `PLUGINS` variable to the list
+you want:
+```
+make source-dist PROJECT_VERSION=3.13.0-rc.3 \
+  PLUGINS='rabbitmq_shovel rabbitmq_rabbitmq_shovel_management'
+```
+
+Dependencies are automatically included.
+
+## Packages
+
+Packages can be built with an existing source archive or create the
+source archive automatically.
+
+If you want to use an existing archive, use `packaging/Makefile`:
+```
+make -C packaging package-$type \
+  SOURCE_DIST_FILE=/path/to/rabbitmq-server-$version.tar.xz \
+  ...
+```
+
+This has the following rules:
+* The archive must be a `tar.xz` file.
+* It can automatically take the only archive available under `PACKAGES`.
+ However, if there is none or multiple archive, you must specify the
+ `SOURCE_DIST_FILE` variable.
+
+If you want the source archive to be created automatically, use the
+top-level `Makefile`:
+```
+make package-$type PROJECT_VERSION=3.13.0-rc.3 ...
+```
+
+Packages are written to `PACKAGES_DIR`, like the source archive.
+
+Each package type is further described separately because most of them
+have versioning specificities.
+
+### `generic-unix` package
+
+To create it:
+```
+make package-generic-unix
+```
+
+There is no package revision, only the project version and no
+restriction on it.
+
+`packaging/generic-unix/Makefile` tries to determine the version based
+on the source archive filename. If it fails, you can specify the version
+with the `VERSION` variable:
+```
+make -C packaging package-generic-unix \
+  SOURCE_DIST_FILE=rabbitmq-server.tar.xz \
+  VERSION=3.13.0-rc.3
+```
+
+### Debian package
+
+To create it:
+```
+make package-deb
+```
+
+The package may have a different versioning than the project and may
+include an additional package revision. In particular, the package
+version can't have any `-` characters.
+
+`packaging/debs/Debian/Makefile` tries to determine the version based
+on the source archive filename. If it fails, you can specify the version
+with the `VERSION` variable:
+```
+make -C packaging package-deb \
+  SOURCE_DIST_FILE=rabbitmq-server.tar.xz \
+  VERSION=3.13.0-rc.3
+```
+
+By default, the package version is converted from `VERSION` with
+all `-` characters replaced by `~` (eg. `3.13.0~rc.1` in the example
+above). If you want to override that conversion, you can specify the
+`DEBIAN_VERSION` variable:
+```
+make -C packaging package-deb \
+  SOURCE_DIST_FILE=rabbitmq-server.tar.xz \
+  VERSION=3.13.0-rc.3
+  DEBIAN_VERSION=3.13.0~rc.1
+```
+
+### RPM package
+
+We support RedHat and OpenSUSE RPM packages and both are created by default:
+
+To create them:
+```
+make package-rpm
+```
+
+You can create a single one with:
+```
+make package-rpm-fedora
+make package-rpm-suse
+```
+
+RPM packages have the same restrictions as Debian packages and use the
+same default version conversion. To override the converted version, use
+the `RPM_VERSION` variable. See the "Debian package" section above for
+more details.
+
+`packaging/RPMS/Fedora/Makefile`, which handles both RedHar and OpenSUSE
+flavors, accepts the `RPM_OS` variable to set the flavor. It can be:
+* `fedora`;
+* `suse`.
+
+### Windows package
+
+We create two artefacts:
+
+* a Zip archive, resembling the `generic-unix` package;
+* an installer.
+
+To create them:
+
+```
+make package-windows
+```
+
+To create them separately:
+
+```
+make -C packaging/windows     # the Zip archive
+make -C packaging/windows-exe # the installer
+```
+
+The Zip archive has no package revision, only the project version and no
+restriction on it. It supports the same `VERSION` as the `generic-unix`
+package.
+
+The installer requires a *product version* which must be 4 integers
+separated by `.` characters. Furthermore, unlike other packages, this
+one requires the Zip archive as its input, not the source archive.
+
+So you need to built the Zip archive first, then the installer. You can
+specify the path to the Zip archive using the `ZIP` variable:
+
+```
+make -C packaging/windows-exe ZIP=/path/to/rabbitmq-server-windows.zip
+```
+
+By default, the *product version* is the project version where
+everything following the third integer was replaced by `.0`. Thus it's
+only fine if the version is a semver-based version (eg. 3.13.0-pre.3 or
+3.8.2). If the version doesn't conform to that, you need to set the
+`PRODUCT_VERSION` variable:
+
+```
+make package-windows PROJECT_VERSION=3.13.0-rc.3 PRODUCT_VERSION=3.13.0.0
+```
+
+To build the Windows package using a Windows machine, follow the
+instructions in [`PKG_WINDOWS.md`](PKG_WINDOWS.md).
+
+### Building all packages in one go
+
+If you want to build all packages in one command, you can use the
+following helpers:
+```
+# Automatically creates the source archive.
+make packages
+
+# Use an existing archive.
+make -C packaging package SOURCE_DIST_FILE=...
+```
+
+However, be careful with the versioning! Because all package have
+incompatible requirements, you can only use a version with 3 integers
+(like a final semver-based version):
+```
+make packages PROJECT_VERSION=3.13.0
+make -C packaging packages SOURCE_DIST_FILE=rabbitmq-server-3.13.0.tar.xz
+```
+
+If you do not follow that rule, the build will fail one way or another;
+probably in the Windows package because of the *product version*
+restrictions.
+
+Another possibility is to specify the Windows *product version* and
+rely on automatic conversion for Debian and RPM packages (or use the
+`DEBIAN_VERSION` and `RPM_VERSION` variables), but this is untested:
+```
+make packages PROJECT_VERSION=3.13.0-rc.3 PRODUCT_VERSION=3.13.0.0
+```
diff --git a/deps/rabbit/docs/rabbitmqctl.8 b/deps/rabbit/docs/rabbitmqctl.8
@@ -346,7 +346,7 @@ next time it is started:
 .sp
 .Dl rabbitmqctl force_boot
 .\" ------------------------------------------------------------------
-.It Cm force_reset Em (deprecated)
+.It Cm force_reset
 .Pp
 Forcefully returns a RabbitMQ node to its virgin state.
 .Pp
@@ -359,13 +359,6 @@ management database state and cluster configuration.
 It should only be used as a last resort if the database or cluster
 configuration has been corrupted.
 .Pp
-The
-.Cm force_reset
-command is
-.Sy deprecated .
-It remains available when the Mnesia metadata store is used.
-It is unsupported with the Khepri metadata store.
-.Pp
 For
 .Cm reset
 and

diff --git a/deps/rabbit/src/rabbit_db.erl b/deps/rabbit/src/rabbit_db.erl
@@ -163,13 +163,11 @@ force_reset_using_mnesia() ->
       #{domain => ?RMQLOG_DOMAIN_DB}),
     rabbit_mnesia:force_reset().
 
--spec force_reset_using_khepri() -> no_return().
-
 force_reset_using_khepri() ->
-    ?LOG_ERROR(
-      "DB: resetting node forcefully is unsupported with Khepri",
+    ?LOG_DEBUG(
+      "DB: resetting node forcefully (using Khepri)",
       #{domain => ?RMQLOG_DOMAIN_DB}),
-    throw({error, "Forced reset is unsupported with Khepri"}).
+    rabbit_khepri:force_reset().
 
 -spec force_load_on_next_boot() -> Ret when
       Ret :: ok.

diff --git a/deps/rabbit/src/rabbit_khepri.erl b/deps/rabbit/src/rabbit_khepri.erl
@@ -168,7 +168,8 @@
 -export([check_cluster_consistency/0,
          check_cluster_consistency/2,
          node_info/0]).
--export([reset/0]).
+-export([reset/0,
+         force_reset/0]).
 -export([cluster_status_from_khepri/0,
          cli_cluster_status/0]).
 
@@ -600,6 +601,23 @@ reset() ->
 
 %% @private
 
+force_reset() ->
+    case rabbit:is_running() of
+        false ->
+            ok = khepri:stop(?RA_CLUSTER_NAME),
+            DataDir = maps:get(data_dir, ra_system:fetch(?RA_SYSTEM)),
+            ok = rabbit_ra_systems:ensure_ra_system_stopped(?RA_SYSTEM),
+            ok = rabbit_file:recursive_delete(
+                   filelib:wildcard(DataDir ++ "/*")),
+
+            _ = file:delete(rabbit_guid:filename()),
+            ok;
+        true ->
+            throw({error, rabbitmq_unexpectedly_running})
+    end.
+
+%% @private
+
 force_shrink_member_to_current_member() ->
     ok = ra_server_proc:force_shrink_members_to_current_member(
            {?RA_CLUSTER_NAME, node()}).

diff --git a/deps/rabbit/test/clustering_management_SUITE.erl b/deps/rabbit/test/clustering_management_SUITE.erl
@@ -953,11 +953,22 @@ force_reset_node_in_khepri(Config) ->
 
     stop_join_start(Config, Rabbit, Hare),
     stop_app(Config, Rabbit),
-    {error, 69, Msg} = force_reset(Config, Rabbit),
-    ?assertEqual(
-       match,
-       re:run(
-         Msg, "Forced reset is unsupported with Khepri", [{capture, none}])).
+    ok = force_reset(Config, Rabbit),
+    assert_cluster_status({[Rabbit, Hare], [Rabbit, Hare], [Hare]}, [Hare]),
+    %% Khepri is stopped, so it won't report anything.
+    assert_status({[Rabbit], [], [Rabbit], [Rabbit], []}, [Rabbit]),
+    %% Hare thinks that Rabbit is still clustered
+    assert_cluster_status({[Rabbit, Hare], [Rabbit, Hare], [Hare]},
+                          [Hare]),
+    ok = start_app(Config, Rabbit),
+    assert_not_clustered(Rabbit),
+    %% We can rejoin Rabbit and Hare. Unlike with Mnesia, we try to solve the
+    %% inconsistency instead of returning an error.
+    ok = stop_app(Config, Rabbit),
+    ?assertEqual(ok, join_cluster(Config, Rabbit, Hare, false)),
+    ok = start_app(Config, Rabbit),
+    assert_cluster_status({[Rabbit, Hare], [Rabbit, Hare], [Rabbit, Hare]},
+                          [Rabbit, Hare]).
 
 status_with_alarm(Config) ->
     [Rabbit, Hare] = rabbit_ct_broker_helpers:get_node_configs(Config,