[WPB-15037] fix flaky test for migration to new index (#4382)

wireapp · Dec 19, 2024 · 3d700f9 · 3d700f9
1 parent 682bdd2
commit 3d700f9
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 149 deletions.
diff --git a/changelog.d/5-internal/stabilize-es-migration-test b/changelog.d/5-internal/stabilize-es-migration-test
@@ -0,0 +1 @@
+Stabilize `index migration` tests by fixing a race on index names.
diff --git a/services/brig/src/Brig/API/Internal.hs b/services/brig/src/Brig/API/Internal.hs
@@ -428,7 +428,7 @@ getVerificationCode uid action = runMaybeT do
 
 internalSearchIndexAPI :: forall r. ServerT BrigIRoutes.ISearchIndexAPI (Handler r)
 internalSearchIndexAPI =
-  Named @"indexRefresh" (NoContent <$ lift (wrapClient Search.refreshIndex))
+  Named @"indexRefresh" (NoContent <$ lift (wrapClient Search.refreshIndexes))
 
 enterpriseLoginApi :: (Member EnterpriseLoginSubsystem r) => ServerT BrigIRoutes.EnterpriseLoginApi (Handler r)
 enterpriseLoginApi =

diff --git a/services/brig/src/Brig/User/Search/Index.hs b/services/brig/src/Brig/User/Search/Index.hs
@@ -31,7 +31,7 @@ module Brig.User.Search.Index
     createIndex,
     createIndexIfNotPresent,
     resetIndex,
-    refreshIndex,
+    refreshIndexes,
     updateMapping,
 
     -- * Re-exports
@@ -122,10 +122,14 @@ instance MonadHttp IndexIO where
 --------------------------------------------------------------------------------
 -- Administrative
 
-refreshIndex :: (MonadIndexIO m) => m ()
-refreshIndex = liftIndexIO $ do
+-- | Refresh ElasticSearch index and the additional one if it's configured
+-- Only used in tests. In production, the addtional index is used write-only.
+refreshIndexes :: (MonadIndexIO m) => m ()
+refreshIndexes = liftIndexIO $ do
   idx <- asks idxName
   void $ ES.refreshIndex idx
+  mbAddIdx <- asks idxAdditionalName
+  mapM_ ES.refreshIndex mbAddIdx
 
 createIndexIfNotPresent ::
   (MonadIndexIO m) =>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Stabilize `index migration` tests by fixing a race on index names.