From a638cc1d74abec88cb2a13b76808db580bad11c6 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 22 Feb 2023 13:54:02 +0100
Subject: [PATCH] docs: add change logs

---
 bin/emqx                   | 2 +-
 changes/ce/fix-10015.en.md | 7 +++++++
 changes/ce/fix-10015.zh.md | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 changes/ce/fix-10015.en.md
 create mode 100644 changes/ce/fix-10015.zh.md

diff --git a/bin/emqx b/bin/emqx
index 4fdf24186..f0366c09d 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -550,7 +550,7 @@ else
                 die "Node $EMQX_NODE__NAME is not running?"
             fi
         fi
-        ## We have no choiece but to read the bootstrap config (with environment overrides available in the current shell)
+        ## We have no choice but to read the bootstrap config (with environment overrides available in the current shell)
         [ -f "$EMQX_ETC_DIR"/emqx.conf ] || die "emqx.conf is not found in $EMQX_ETC_DIR" 1
         maybe_use_portable_dynlibs
         EMQX_BOOT_CONFIGS="$(call_hocon -s "$SCHEMA_MOD" -c "$EMQX_ETC_DIR"/emqx.conf multi_get "${CONF_KEYS[@]}")"
diff --git a/changes/ce/fix-10015.en.md b/changes/ce/fix-10015.en.md
new file mode 100644
index 000000000..5727a52cd
--- /dev/null
+++ b/changes/ce/fix-10015.en.md
@@ -0,0 +1,7 @@
+To prevent errors caused by an incorrect EMQX node cookie provided from an environment variable,
+we have implemented a fail-fast mechanism.
+Previously, when an incorrect cookie was provided, the command would still attempt to ping the node,
+leading to the error message 'Node xxx not responding to pings'.
+With the new implementation, if a mismatched cookie is detected,
+a message will be logged to indicate that the cookie is incorrect,
+and the command will terminate with an error code of 1 without trying to ping the node.
diff --git a/changes/ce/fix-10015.zh.md b/changes/ce/fix-10015.zh.md
new file mode 100644
index 000000000..0f58fa99c
--- /dev/null
+++ b/changes/ce/fix-10015.zh.md
@@ -0,0 +1,4 @@
+在 cookie 给错时，快速失败。
+在此修复前，即使 cookie 配置错误，emqx 命令仍然会尝试去 ping EMQX 节点，
+并得到一个 "Node xxx not responding to pings" 的错误。
+修复后，如果发现 cookie 不一致，立即打印不一致的错误信息并退出。