Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[BEAM-14429] Force java load test on dataflow runner v2 forceNumIniti…" #17609

Merged
merged 1 commit into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder
import CronJobBuilder
import InfluxDBCredentialsHelper

// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved.

def loadTestConfigurations = { mode, isStreaming ->
[
[
Expand All @@ -49,7 +47,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -58,7 +55,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down Expand Up @@ -90,7 +86,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 5
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -99,7 +94,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down Expand Up @@ -132,7 +126,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 200000
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -141,7 +134,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down Expand Up @@ -174,7 +166,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -183,7 +174,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down
10 changes: 0 additions & 10 deletions .test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder
import CronJobBuilder
import InfluxDBCredentialsHelper

// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved.

def loadTestConfigurations = { mode, isStreaming ->
[
[
Expand All @@ -49,7 +47,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -58,7 +55,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down Expand Up @@ -90,7 +86,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 5
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -99,7 +94,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down Expand Up @@ -132,7 +126,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 200000
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -141,7 +134,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down Expand Up @@ -174,7 +166,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand All @@ -183,7 +174,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 2000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 1000
}
""".trim().replaceAll("\\s", ""),
Expand Down
19 changes: 5 additions & 14 deletions .test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder
import CronJobBuilder
import InfluxDBCredentialsHelper

// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved.

def loadTestConfigurations = { mode, isStreaming ->
[
[
Expand All @@ -48,8 +46,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 200000000,
"keySizeBytes": 1,
"valueSizeBytes": 9,
"forceNumInitialBundles": 1
"valueSizeBytes": 9
}
""".trim().replaceAll("\\s", ""),
fanout : 1,
Expand Down Expand Up @@ -80,8 +77,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
fanout : 1,
Expand Down Expand Up @@ -113,8 +109,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 20000,
"keySizeBytes": 10000,
"valueSizeBytes": 90000,
"forceNumInitialBundles": 1
"valueSizeBytes": 90000
}
""".trim().replaceAll("\\s", ""),
fanout : 1,
Expand Down Expand Up @@ -146,8 +141,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 5000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
fanout : 4,
Expand Down Expand Up @@ -178,8 +172,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 2500000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
fanout : 8,
Expand Down Expand Up @@ -211,7 +204,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 200,
"hotKeyFraction": 1
}
Expand Down Expand Up @@ -245,7 +237,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 10,
"hotKeyFraction": 1
}
Expand Down
19 changes: 5 additions & 14 deletions .test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder
import CronJobBuilder
import InfluxDBCredentialsHelper

// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved.

def loadTestConfigurations = { mode, isStreaming ->
[
[
Expand All @@ -48,8 +46,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 200000000,
"keySizeBytes": 1,
"valueSizeBytes": 9,
"forceNumInitialBundles": 1
"valueSizeBytes": 9
}
""".trim().replaceAll("\\s", ""),
fanout : 1,
Expand Down Expand Up @@ -80,8 +77,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
fanout : 1,
Expand Down Expand Up @@ -113,8 +109,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 20000,
"keySizeBytes": 10000,
"valueSizeBytes": 90000,
"forceNumInitialBundles": 1
"valueSizeBytes": 90000
}
""".trim().replaceAll("\\s", ""),
fanout : 1,
Expand Down Expand Up @@ -146,8 +141,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 5000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
fanout : 4,
Expand Down Expand Up @@ -178,8 +172,7 @@ def loadTestConfigurations = { mode, isStreaming ->
{
"numRecords": 2500000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
fanout : 8,
Expand Down Expand Up @@ -211,7 +204,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 200,
"hotKeyFraction": 1
}
Expand Down Expand Up @@ -245,7 +237,6 @@ def loadTestConfigurations = { mode, isStreaming ->
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1,
"numHotKeys": 10,
"hotKeyFraction": 1
}
Expand Down
14 changes: 4 additions & 10 deletions .test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder
import CronJobBuilder
import InfluxDBCredentialsHelper

// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved.

def commonLoadTestConfig = { jobType, isStreaming ->
[
[
Expand All @@ -48,8 +46,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 10,
Expand Down Expand Up @@ -81,8 +78,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 200,
Expand Down Expand Up @@ -115,8 +111,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 1,
Expand Down Expand Up @@ -149,8 +144,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 1,
Expand Down
14 changes: 4 additions & 10 deletions .test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import PhraseTriggeringPostCommitBuilder
import CronJobBuilder
import InfluxDBCredentialsHelper

// TODO(BEAM-14229): remove forceNumInitialBundles once source issue resolved.

def commonLoadTestConfig = { jobType, isStreaming ->
[
[
Expand All @@ -48,8 +46,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 10,
Expand Down Expand Up @@ -81,8 +78,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 200,
Expand Down Expand Up @@ -115,8 +111,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 1,
Expand Down Expand Up @@ -149,8 +144,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
{
"numRecords": 20000000,
"keySizeBytes": 10,
"valueSizeBytes": 90,
"forceNumInitialBundles": 1
"valueSizeBytes": 90
}
""".trim().replaceAll("\\s", ""),
iterations : 1,
Expand Down