From 8b893b8f6b2884bd6807e3eb0183ec9ea135d258 Mon Sep 17 00:00:00 2001
From: vamossagar12 <sagarrao@google.com>
Date: Thu, 25 Dec 2025 08:42:52 +0530
Subject: [PATCH 1/2] Clearing all test events after each test

---
 .../server/coordinator/event/watcher/TableChangeWatcherTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java
index bb9a25d1d2..fdf75e967b 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java
@@ -106,6 +106,7 @@ void after() {
         if (tableChangeWatcher != null) {
             tableChangeWatcher.stop();
         }
+        eventManager.clearEvents();
     }
 
     @Test

From 7861d36e67bc34f4373d10d1168763e670792f71 Mon Sep 17 00:00:00 2001
From: vamossagar12 <sagarrao@google.com>
Date: Tue, 6 Jan 2026 21:34:24 +0530
Subject: [PATCH 2/2] Clean up Zookeeper state before each test to not be
 impacted by changes from previous tests

---
 .../event/watcher/TableChangeWatcherTest.java          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java
index fdf75e967b..691f0d9ce3 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcherTest.java
@@ -91,11 +91,18 @@ static void beforeAll() {
                         zookeeperClient,
                         new Configuration(),
                         new LakeCatalogDynamicLoader(new Configuration(), null, true));
-        metadataManager.createDatabase(DEFAULT_DB, DatabaseDescriptor.builder().build(), false);
     }
 
     @BeforeEach
     void before() {
+        // Clean up ZK state from previous tests to prevent CuratorCache initial sync
+        // from picking up leftover data
+        try {
+            metadataManager.dropDatabase(DEFAULT_DB, true, true);
+        } catch (Exception ignored) {
+        }
+        metadataManager.createDatabase(DEFAULT_DB, DatabaseDescriptor.builder().build(), false);
+
         eventManager = new TestingEventManager();
         tableChangeWatcher = new TableChangeWatcher(zookeeperClient, eventManager);
         tableChangeWatcher.start();
@@ -106,7 +113,6 @@ void after() {
         if (tableChangeWatcher != null) {
             tableChangeWatcher.stop();
         }
-        eventManager.clearEvents();
     }
 
     @Test