Run with default wal_sync_method

...which is `datasync`

RA never pre-allocates the WAL anymore unless explicitly configured to.
This commit is contained in:
David Ansari 2024-08-22 16:24:07 +00:00
parent 39679f58d9
commit ffefefba0f
3 changed files with 5 additions and 15 deletions

View File

@ -115,7 +115,7 @@ RABBITMQ_STREAM_DIR="$(call node_stream_dir,$(2))" \
RABBITMQ_FEATURE_FLAGS_FILE="$(call node_feature_flags_file,$(2))" \ RABBITMQ_FEATURE_FLAGS_FILE="$(call node_feature_flags_file,$(2))" \
RABBITMQ_PLUGINS_DIR="$(call node_plugins_dir)" \ RABBITMQ_PLUGINS_DIR="$(call node_plugins_dir)" \
RABBITMQ_PLUGINS_EXPAND_DIR="$(call node_plugins_expand_dir,$(2))" \ RABBITMQ_PLUGINS_EXPAND_DIR="$(call node_plugins_expand_dir,$(2))" \
RABBITMQ_SERVER_START_ARGS="-ra wal_sync_method sync $(RABBITMQ_SERVER_START_ARGS)" \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \
RABBITMQ_ENABLED_PLUGINS="$(RABBITMQ_ENABLED_PLUGINS)" RABBITMQ_ENABLED_PLUGINS="$(RABBITMQ_ENABLED_PLUGINS)"
endef endef
@ -189,8 +189,7 @@ $(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((5552
$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15692 + $(RABBITMQ_NODE_PORT) - 5672))")}]},) $(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15692 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
]}, ]},
{ra, [ {ra, [
{data_dir, "$(RABBITMQ_QUORUM_DIR)"}, {data_dir, "$(RABBITMQ_QUORUM_DIR)"}
{wal_sync_method, sync}
]}, ]},
{osiris, [ {osiris, [
{data_dir, "$(RABBITMQ_STREAM_DIR)"} {data_dir, "$(RABBITMQ_STREAM_DIR)"}
@ -227,8 +226,7 @@ define test_rabbitmq_config_with_tls
]} ]}
]}, ]},
{ra, [ {ra, [
{data_dir, "$(RABBITMQ_QUORUM_DIR)"}, {data_dir, "$(RABBITMQ_QUORUM_DIR)"}
{wal_sync_method, sync}
]}, ]},
{osiris, [ {osiris, [
{data_dir, "$(RABBITMQ_STREAM_DIR)"} {data_dir, "$(RABBITMQ_STREAM_DIR)"}

View File

@ -81,10 +81,6 @@ set RABBITMQ_PLUGINS_EXPAND_DIR=%NODE_TMPDIR%\plugins
set RABBITMQ_FEATURE_FLAGS_FILE=%NODE_TMPDIR%\feature_flags set RABBITMQ_FEATURE_FLAGS_FILE=%NODE_TMPDIR%\feature_flags
set RABBITMQ_ENABLED_PLUGINS_FILE=%NODE_TMPDIR%\enabled_plugins set RABBITMQ_ENABLED_PLUGINS_FILE=%NODE_TMPDIR%\enabled_plugins
if not defined RABBITMQ_SERVER_START_ARGS (
set RABBITMQ_SERVER_START_ARGS=-ra wal_sync_method sync
)
if not defined RABBITMQ_LOG ( if not defined RABBITMQ_LOG (
set RABBITMQ_LOG=debug,+color set RABBITMQ_LOG=debug,+color
) )
@ -115,8 +111,7 @@ if "%CMD%" == "run-broker" (
@echo {rabbitmq_mqtt, []}, @echo {rabbitmq_mqtt, []},
@echo {rabbitmq_stomp, []}, @echo {rabbitmq_stomp, []},
@echo {ra, [ @echo {ra, [
@echo {data_dir, "!RABBITMQ_QUORUM_DIR:\=\\!"}, @echo {data_dir, "!RABBITMQ_QUORUM_DIR:\=\\!"}
@echo {wal_sync_method, sync}
@echo ]}, @echo ]},
@echo {osiris, [ @echo {osiris, [
@echo {data_dir, "!RABBITMQ_STREAM_DIR:\=\\!"} @echo {data_dir, "!RABBITMQ_STREAM_DIR:\=\\!"}

View File

@ -78,8 +78,7 @@ write_config_file() {
${rabbitmq_prometheus_fragment} ${rabbitmq_prometheus_fragment}
]}, ]},
{ra, [ {ra, [
{data_dir, "${RABBITMQ_QUORUM_DIR}"}, {data_dir, "${RABBITMQ_QUORUM_DIR}"}
{wal_sync_method, sync}
]}, ]},
{osiris, [ {osiris, [
{data_dir, "${RABBITMQ_STREAM_DIR}"} {data_dir, "${RABBITMQ_STREAM_DIR}"}
@ -195,8 +194,6 @@ fi
RABBITMQ_PLUGINS_DIR=${RABBITMQ_PLUGINS_DIR:=${DEFAULT_PLUGINS_DIR}} RABBITMQ_PLUGINS_DIR=${RABBITMQ_PLUGINS_DIR:=${DEFAULT_PLUGINS_DIR}}
export RABBITMQ_PLUGINS_DIR export RABBITMQ_PLUGINS_DIR
RABBITMQ_SERVER_START_ARGS="${RABBITMQ_SERVER_START_ARGS:=-ra wal_sync_method sync}"
export RABBITMQ_SERVER_START_ARGS
# Enable colourful debug logging by default # Enable colourful debug logging by default
# To change this, set RABBITMQ_LOG to info, notice, warning etc. # To change this, set RABBITMQ_LOG to info, notice, warning etc.