diff --git a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy index f96bd35b8253..bd4b97c07e59 100644 --- a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy +++ b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder import CronJobBuilder import InfluxDBCredentialsHelper -// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved. - def loadTestConfigurations = { mode, isStreaming -> [ [ @@ -49,7 +47,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1 } """.trim().replaceAll("\\s", ""), @@ -58,7 +55,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -90,7 +86,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 5 } """.trim().replaceAll("\\s", ""), @@ -99,7 +94,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -132,7 +126,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 200000 } """.trim().replaceAll("\\s", ""), @@ -141,7 +134,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -174,7 +166,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -183,7 +174,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), diff --git a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy index 72646fab8bee..0978753f40e6 100644 --- a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy +++ b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder import CronJobBuilder import InfluxDBCredentialsHelper -// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved. - def loadTestConfigurations = { mode, isStreaming -> [ [ @@ -49,7 +47,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1 } """.trim().replaceAll("\\s", ""), @@ -58,7 +55,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -90,7 +86,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 5 } """.trim().replaceAll("\\s", ""), @@ -99,7 +94,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -132,7 +126,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 200000 } """.trim().replaceAll("\\s", ""), @@ -141,7 +134,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -174,7 +166,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), @@ -183,7 +174,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 2000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 1000 } """.trim().replaceAll("\\s", ""), diff --git a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy index 246ed4f0eaf7..30c9dda37634 100644 --- a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy +++ b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder import CronJobBuilder import InfluxDBCredentialsHelper -// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved. - def loadTestConfigurations = { mode, isStreaming -> [ [ @@ -48,8 +46,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 200000000, "keySizeBytes": 1, - "valueSizeBytes": 9, - "forceNumInitialBundles": 1 + "valueSizeBytes": 9 } """.trim().replaceAll("\\s", ""), fanout : 1, @@ -80,8 +77,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), fanout : 1, @@ -113,8 +109,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 20000, "keySizeBytes": 10000, - "valueSizeBytes": 90000, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90000 } """.trim().replaceAll("\\s", ""), fanout : 1, @@ -146,8 +141,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 5000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), fanout : 4, @@ -178,8 +172,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 2500000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), fanout : 8, @@ -211,7 +204,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 200, "hotKeyFraction": 1 } @@ -245,7 +237,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 10, "hotKeyFraction": 1 } diff --git a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy index f015d828870c..ca897e7eec10 100644 --- a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy +++ b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder import CronJobBuilder import InfluxDBCredentialsHelper -// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved. - def loadTestConfigurations = { mode, isStreaming -> [ [ @@ -48,8 +46,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 200000000, "keySizeBytes": 1, - "valueSizeBytes": 9, - "forceNumInitialBundles": 1 + "valueSizeBytes": 9 } """.trim().replaceAll("\\s", ""), fanout : 1, @@ -80,8 +77,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), fanout : 1, @@ -113,8 +109,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 20000, "keySizeBytes": 10000, - "valueSizeBytes": 90000, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90000 } """.trim().replaceAll("\\s", ""), fanout : 1, @@ -146,8 +141,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 5000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), fanout : 4, @@ -178,8 +172,7 @@ def loadTestConfigurations = { mode, isStreaming -> { "numRecords": 2500000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), fanout : 8, @@ -211,7 +204,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 200, "hotKeyFraction": 1 } @@ -245,7 +237,6 @@ def loadTestConfigurations = { mode, isStreaming -> "numRecords": 20000000, "keySizeBytes": 10, "valueSizeBytes": 90, - "forceNumInitialBundles": 1, "numHotKeys": 10, "hotKeyFraction": 1 } diff --git a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy index 86f5e6fe732b..0a1cf8cfde53 100644 --- a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy +++ b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder import CronJobBuilder import InfluxDBCredentialsHelper -// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved. - def commonLoadTestConfig = { jobType, isStreaming -> [ [ @@ -48,8 +46,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 10, @@ -81,8 +78,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 200, @@ -115,8 +111,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 1, @@ -149,8 +144,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 1, diff --git a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy index ac40f39e62cb..f09787225b96 100644 --- a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy +++ b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder import CronJobBuilder import InfluxDBCredentialsHelper -// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved. - def commonLoadTestConfig = { jobType, isStreaming -> [ [ @@ -48,8 +46,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 10, @@ -81,8 +78,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 200, @@ -115,8 +111,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 1, @@ -149,8 +144,7 @@ def commonLoadTestConfig = { jobType, isStreaming -> { "numRecords": 20000000, "keySizeBytes": 10, - "valueSizeBytes": 90, - "forceNumInitialBundles": 1 + "valueSizeBytes": 90 } """.trim().replaceAll("\\s", ""), iterations : 1,