From 88366df8d2cfeb52c99e1c1702ca2a7287ce8238 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 17 May 2026 01:27:26 +0000
Subject: [PATCH] chaos(flaky-fixer): octopus merge fixes A and B
 [octopus-merge]

---
 scratchpad/chaos/flaky-r17-fix-a.md | 4 ++++
 scratchpad/chaos/flaky-r17-fix-b.md | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 scratchpad/chaos/flaky-r17-fix-a.md
 create mode 100644 scratchpad/chaos/flaky-r17-fix-b.md

diff --git a/scratchpad/chaos/flaky-r17-fix-a.md b/scratchpad/chaos/flaky-r17-fix-a.md
new file mode 100644
index 00000000000..afa69712922
--- /dev/null
+++ b/scratchpad/chaos/flaky-r17-fix-a.md
@@ -0,0 +1,4 @@
+# Flaky Fixer: Fix A
+
+Identified flaky test: TestRetryLogic
+Root cause: timing dependency in goroutine
diff --git a/scratchpad/chaos/flaky-r17-fix-b.md b/scratchpad/chaos/flaky-r17-fix-b.md
new file mode 100644
index 00000000000..8256fad20f5
--- /dev/null
+++ b/scratchpad/chaos/flaky-r17-fix-b.md
@@ -0,0 +1,4 @@
+# Flaky Fixer: Fix B
+
+Identified flaky test: TestConcurrentWrite
+Root cause: missing mutex lock