Skip to content

Run with default wal_sync_method (backport #12091) (backport #12096) #12098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Run with default wal_sync_method (backport #12091) (backport #12096) #12098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions deps/rabbit_common/mk/rabbitmq-run.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ RABBITMQ_STREAM_DIR="$(call node_stream_dir,$(2))" \
RABBITMQ_FEATURE_FLAGS_FILE="$(call node_feature_flags_file,$(2))" \
RABBITMQ_PLUGINS_DIR="$(call node_plugins_dir)" \
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)"
endef

Expand Down Expand Up @@ -202,8 +202,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))")}]},)
]},
{ra, [
{data_dir, "$(RABBITMQ_QUORUM_DIR)"},
{wal_sync_method, sync}
{data_dir, "$(RABBITMQ_QUORUM_DIR)"}
]},
{osiris, [
{data_dir, "$(RABBITMQ_STREAM_DIR)"}
Expand Down Expand Up @@ -240,8 +239,7 @@ define test_rabbitmq_config_with_tls
]}
]},
{ra, [
{data_dir, "$(RABBITMQ_QUORUM_DIR)"},
{wal_sync_method, sync}
{data_dir, "$(RABBITMQ_QUORUM_DIR)"}
]},
{osiris, [
{data_dir, "$(RABBITMQ_STREAM_DIR)"}
Expand Down
7 changes: 1 addition & 6 deletions scripts/bazel/rabbitmq-run.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ set RABBITMQ_PLUGINS_EXPAND_DIR=%NODE_TMPDIR%\plugins
set RABBITMQ_FEATURE_FLAGS_FILE=%NODE_TMPDIR%\feature_flags
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 (
set RABBITMQ_LOG=debug,+color
)
Expand Down Expand Up @@ -115,8 +111,7 @@ if "%CMD%" == "run-broker" (
@echo {rabbitmq_mqtt, []},
@echo {rabbitmq_stomp, []},
@echo {ra, [
@echo {data_dir, "!RABBITMQ_QUORUM_DIR:\=\\!"},
@echo {wal_sync_method, sync}
@echo {data_dir, "!RABBITMQ_QUORUM_DIR:\=\\!"}
@echo ]},
@echo {osiris, [
@echo {data_dir, "!RABBITMQ_STREAM_DIR:\=\\!"}
Expand Down
5 changes: 1 addition & 4 deletions scripts/bazel/rabbitmq-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ write_config_file() {
${rabbitmq_prometheus_fragment}
]},
{ra, [
{data_dir, "${RABBITMQ_QUORUM_DIR}"},
{wal_sync_method, sync}
{data_dir, "${RABBITMQ_QUORUM_DIR}"}
]},
{osiris, [
{data_dir, "${RABBITMQ_STREAM_DIR}"}
Expand Down Expand Up @@ -195,8 +194,6 @@ fi

RABBITMQ_PLUGINS_DIR=${RABBITMQ_PLUGINS_DIR:=${DEFAULT_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
# To change this, set RABBITMQ_LOG to info, notice, warning etc.
Expand Down
Loading