Make the sharding group a cli parameter

It will be different for every pod.

Author: supersven

charts/integration/templates/configmap.yaml

@@ -306,5 +306,4 @@ data:
     integrationTestHostName: integration-headless.{{ .Release.Namespace }}.svc.cluster.local
     cellsEventQueue: cells_events
     shardingGroupCount: {{ .Values.config.shardingGroupCount }}
-    shardingGroup: {{ .Values.config.shardingGroup }}
     maxUserNo: {{ .Values.config.maxUserNo }}

charts/integration/templates/integration-integration.yaml

@@ -183,7 +183,7 @@ spec:
     - |
       set -euo pipefail
 
-      if TEST_INCLUDE=testBench integration --config /etc/wire/integration/integration.yaml; then
+      if TEST_INCLUDE=testBench integration --config /etc/wire/integration/integration.yaml --sharding-group {{ .Values.config.shardingGroup }}; then
         exit_code=$?
       else
         exit_code=$?

integration/test/Testlib/Env.hs

@@ -45,8 +45,8 @@ serviceHostPort m Stern = m.stern
 serviceHostPort m FederatorInternal = m.federatorInternal
 serviceHostPort m WireServerEnterprise = m.wireServerEnterprise
 
-mkGlobalEnv :: FilePath -> Codensity IO GlobalEnv
-mkGlobalEnv cfgFile = do
+mkGlobalEnv :: FilePath -> Word -> Codensity IO GlobalEnv
+mkGlobalEnv cfgFile shardingGroup = do
   eith <- liftIO $ Yaml.decodeFileEither cfgFile
   intConfig <- liftIO $ case eith of
     Left err -> do
@@ -130,7 +130,7 @@ mkGlobalEnv cfgFile = do
         gCellsEventWatchersLock,
         gCellsEventWatchers,
         gShardingGroupCount = intConfig.shardingGroupCount,
-        gShardingGroup = intConfig.shardingGroup,
+        gShardingGroup = shardingGroup,
         gMaxUserNo = intConfig.maxUserNo
       }
   where

integration/test/Testlib/Options.hs

@@ -10,7 +10,8 @@ data TestOptions = TestOptions
     excludeTests :: [String],
     listTests :: Bool,
     xmlReport :: Maybe FilePath,
-    configFile :: String
+    configFile :: String,
+    shardingGroup :: Word
   }
 
 parser :: Parser TestOptions
@@ -47,6 +48,13 @@ parser =
           <> help "Use configuration FILE"
           <> value "services/integration.yaml"
       )
+    <*> option
+      auto
+      ( long "sharding-group"
+          <> short 's'
+          <> help "The sharding group of this instance"
+          <> value 0
+      )
 
 optInfo :: ParserInfo TestOptions
 optInfo =

integration/test/Testlib/Run.hs

@@ -106,6 +106,7 @@ main = do
   opts <- getOptions
   let f = testFilter opts
       cfg = opts.configFile
+      shardingGroup = opts.shardingGroup
 
   allTests <- mkAllTests
   let tests =
@@ -115,10 +116,10 @@ main = do
             let qualifiedName = fromMaybe module_ (stripPrefix "Test." module_) <> "." <> name
              in (qualifiedName, summary, full, action)
 
-  if opts.listTests then doListTests tests else runTests tests opts.xmlReport cfg
+  if opts.listTests then doListTests tests else runTests tests opts.xmlReport cfg shardingGroup
 
-runTests :: [(String, x, y, App ())] -> Maybe FilePath -> FilePath -> IO ()
-runTests tests mXMLOutput cfg = do
+runTests :: [(String, x, y, App ())] -> Maybe FilePath -> FilePath -> Word -> IO ()
+runTests tests mXMLOutput cfg shardingGroup = do
   output <- newChan
   let displayOutput =
         readChan output >>= \case
@@ -163,7 +164,7 @@ runTests tests mXMLOutput cfg = do
   where
     mkEnvs :: FilePath -> Codensity IO (GlobalEnv, Env)
     mkEnvs fp = do
-      g <- mkGlobalEnv fp
+      g <- mkGlobalEnv fp shardingGroup
       e <- mkEnv Nothing g
       pure (g, e)
 

integration/test/Testlib/RunServices.hs

@@ -71,8 +71,10 @@ main = do
           let cp = proc "sh" (["-c", "exec \"$@\"", "--"] <> opts.runSubprocess)
           (_, _, _, ph) <- createProcess cp
           exitWith =<< waitForProcess ph
+      -- The shardingGroup only matters for the testBench test; probably not here.
+      shardingGroup = 0
 
-  runCodensity (mkGlobalEnv cfg >>= mkEnv Nothing) $ \env ->
+  runCodensity (mkGlobalEnv cfg shardingGroup >>= mkEnv Nothing) $ \env ->
     runAppWithEnv env
       $ lowerCodensity
       $ do

integration/test/Testlib/Types.hs

@@ -148,7 +148,6 @@ data IntegrationConfig = IntegrationConfig
     dnsMockServer :: DNSMockServerConfig,
     cellsEventQueue :: String,
     shardingGroupCount :: Word,
-    shardingGroup :: Word,
     maxUserNo :: Word
   }
   deriving (Show, Generic)
@@ -171,7 +170,6 @@ instance FromJSON IntegrationConfig where
         <*> o .: fromString "dnsMockServer"
         <*> o .: fromString "cellsEventQueue"
         <*> o .: fromString "shardingGroupCount"
-        <*> o .: fromString "shardingGroup"
         <*> o .: fromString "maxUserNo"
 
 data ServiceMap = ServiceMap

services/integration.yaml

@@ -332,5 +332,4 @@ additionalElasticSearch: https://localhost:9201
 cellsEventQueue: cells_events
 
 shardingGroupCount: 1
-shardingGroup: 0
 maxUserNo: 1000