From 1123c3870909af91b4cb022e2ecaf59ad44d5427 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 8 Oct 2024 22:16:45 +0000 Subject: [PATCH] Add support for instance based storge in nightly benchmark run (#522) Signed-off-by: Rishabh Singh (cherry picked from commit a84c88e626d7c48c5041b39019085de9c0e8f9ab) Signed-off-by: github-actions[bot] --- tests/jenkins/TestRunBenchmarkTestScript.groovy | 7 ++++--- .../TestRunBenchmarkTestScriptMultiNode.groovy | 7 ++++--- .../jenkins/TestRunBenchmarkTestScriptNoTags.groovy | 7 ++++--- .../jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile | 2 ++ .../jobs/BenchmarkTestMultinode_Jenkinsfile.txt | 8 ++++---- .../jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile | 2 ++ .../jobs/BenchmarkTestNoManifest_Jenkinsfile.txt | 8 ++++---- tests/jenkins/jobs/BenchmarkTest_Jenkinsfile | 2 ++ tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt | 8 ++++---- .../lib-testers/RunBenchmarkTestScriptLibTest.groovy | 12 ++++++++---- vars/runBenchmarkTestScript.groovy | 1 + 11 files changed, 39 insertions(+), 25 deletions(-) diff --git a/tests/jenkins/TestRunBenchmarkTestScript.groovy b/tests/jenkins/TestRunBenchmarkTestScript.groovy index e66a8cb1..8baede63 100644 --- a/tests/jenkins/TestRunBenchmarkTestScript.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScript.groovy @@ -42,7 +42,8 @@ class TestRunBenchmarkTestScript extends BuildPipelineTest { 'cluster.indices.replication.strategy:SEGMENT', 'false', 'true', - '' + '', + 'false' )) super.setUp() } @@ -88,10 +89,10 @@ class TestRunBenchmarkTestScript extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{\"key2\":\"value2\"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) } diff --git a/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy b/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy index 485d2a4d..175e1d18 100644 --- a/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy @@ -42,7 +42,8 @@ class TestRunBenchmarkTestScriptMultiNode extends BuildPipelineTest { 'cluster.indices.replication.strategy:SEGMENT', 'true', 'false', - '{"telemetry_setting":"value"}' + '{"telemetry_setting":"value"}', + 'false' )) super.setUp() } @@ -63,10 +64,10 @@ class TestRunBenchmarkTestScriptMultiNode extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() )) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() + "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString() )) } diff --git a/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy b/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy index 76545ffd..65d3b4ab 100644 --- a/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy +++ b/tests/jenkins/TestRunBenchmarkTestScriptNoTags.groovy @@ -42,7 +42,8 @@ class TestRunBenchmarkTestScriptNoManifest extends BuildPipelineTest { 'cluster.indices.replication.strategy:SEGMENT', 'false', 'true', - '' + '', + 'true' )) super.setUp() } @@ -62,10 +63,10 @@ class TestRunBenchmarkTestScriptNoManifest extends BuildPipelineTest { assertThat(testScriptCommands.size(), equalTo(2)) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --enable-instance-storage --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) assertThat(testScriptCommands, hasItem( - "set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" + "set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --enable-instance-storage --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200" )) } diff --git a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile index d0ce5838..c444898e 100644 --- a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile @@ -43,6 +43,7 @@ pipeline { additionalConfig: ADDITIONAL_CONFIG, dataStorageSize: DATA_NODE_STORAGE, mlStorageSize: ML_NODE_STORAGE, + enableInstanceStorage: ENABLE_INSTANCE_STORAGE, jvmSysProps: JVM_SYS_PROPS, captureNodeStat: CAPTURE_NODE_STAT, captureSegmentReplicationStat: CAPTURE_SEGMENT_REPLICATION_STAT, @@ -83,6 +84,7 @@ pipeline { additionalConfig: ADDITIONAL_CONFIG, dataStorageSize: DATA_NODE_STORAGE, mlStorageSize: ML_NODE_STORAGE, + enableInstanceStorage: ENABLE_INSTANCE_STORAGE, jvmSysProps: JVM_SYS_PROPS, captureNodeStat: CAPTURE_NODE_STAT, captureSegmentReplicationStat: CAPTURE_SEGMENT_REPLICATION_STAT, diff --git a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt index 6ec76a4f..2ed07368 100644 --- a/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt @@ -11,7 +11,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307-secure, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) + BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307-secure, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=false, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@7.0.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -30,7 +30,7 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307-secure --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') BenchmarkTestMultinode_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) BenchmarkTestMultinode_Jenkinsfile.script(groovy.lang.Closure) BenchmarkTestMultinode_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml}) @@ -41,7 +41,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) + BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=false, minDistribution=false, use50PercentHeap=true, enableRemoteStore=true, suffix=307, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, userTag=key1:value1,security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=false, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@7.0.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -60,4 +60,4 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security --use-50-percent-heap --enable-remote-store --capture-node-stat --suffix 307 --manager-node-count 3 --data-node-count 3 --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200 --telemetry-params '{"telemetry_setting":"value"}') diff --git a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile index 28533d4e..3f16904e 100644 --- a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile @@ -39,6 +39,7 @@ pipeline { additionalConfig: ADDITIONAL_CONFIG, dataStorageSize: DATA_NODE_STORAGE, mlStorageSize: ML_NODE_STORAGE, + enableInstanceStorage: ENABLE_INSTANCE_STORAGE, jvmSysProps: JVM_SYS_PROPS, captureNodeStat: CAPTURE_NODE_STAT, captureSegmentReplicationStat: CAPTURE_SEGMENT_REPLICATION_STAT, @@ -75,6 +76,7 @@ pipeline { additionalConfig: ADDITIONAL_CONFIG, dataStorageSize: DATA_NODE_STORAGE, mlStorageSize: ML_NODE_STORAGE, + enableInstanceStorage: ENABLE_INSTANCE_STORAGE, jvmSysProps: JVM_SYS_PROPS, captureNodeStat: CAPTURE_NODE_STAT, captureSegmentReplicationStat: CAPTURE_SEGMENT_REPLICATION_STAT, diff --git a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt index a9a8d6ad..b04f9cbc 100644 --- a/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt @@ -3,7 +3,7 @@ BenchmarkTestNoManifest_Jenkinsfile.echo(Executing on agent [label:none]) BenchmarkTestNoManifest_Jenkinsfile.stage(test-with-security, groovy.lang.Closure) BenchmarkTestNoManifest_Jenkinsfile.script(groovy.lang.Closure) - BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=true, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@7.0.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -17,10 +17,10 @@ runBenchmarkTestScript.withCredentials([DATASTORE_USER, DATASTORE_PASSWORD], groovy.lang.Closure) runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini}) runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=}) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true --single-node --use-50-percent-heap --enable-instance-storage --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) BenchmarkTestNoManifest_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) BenchmarkTestNoManifest_Jenkinsfile.script(groovy.lang.Closure) - BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=true, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@7.0.0, retriever=null}) runBenchmarkTestScript.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) @@ -34,4 +34,4 @@ runBenchmarkTestScript.withCredentials([DATASTORE_USER, DATASTORE_PASSWORD], groovy.lang.Closure) runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini}) runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=}) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --distribution-url https://www.example.com/example.tar.gz --distribution-version 3.0.0 --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security --single-node --use-50-percent-heap --enable-instance-storage --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --test-procedure custom-test-procedure --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) diff --git a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile index d0ce5838..797f8703 100644 --- a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile +++ b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile @@ -42,6 +42,7 @@ pipeline { includeTasks: INCLUDE_TASKS, additionalConfig: ADDITIONAL_CONFIG, dataStorageSize: DATA_NODE_STORAGE, + enableInstanceStorage: ENABLE_INSTANCE_STORAGE, mlStorageSize: ML_NODE_STORAGE, jvmSysProps: JVM_SYS_PROPS, captureNodeStat: CAPTURE_NODE_STAT, @@ -83,6 +84,7 @@ pipeline { additionalConfig: ADDITIONAL_CONFIG, dataStorageSize: DATA_NODE_STORAGE, mlStorageSize: ML_NODE_STORAGE, + enableInstanceStorage: ENABLE_INSTANCE_STORAGE, jvmSysProps: JVM_SYS_PROPS, captureNodeStat: CAPTURE_NODE_STAT, captureSegmentReplicationStat: CAPTURE_SEGMENT_REPLICATION_STAT, diff --git a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt index c002e059..29e04a40 100644 --- a/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BenchmarkTest_Jenkinsfile.txt @@ -11,7 +11,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307-secure, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, enableInstanceStorage=false, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@7.0.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -30,7 +30,7 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:true --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307-secure --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) BenchmarkTest_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) BenchmarkTest_Jenkinsfile.script(groovy.lang.Closure) BenchmarkTest_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml}) @@ -41,7 +41,7 @@ downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) BuildManifest.asBoolean() - BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) + BenchmarkTest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=true, singleNode=true, minDistribution=false, use50PercentHeap=true, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, userTag=security-enabled:false, workloadParams={"key2":"value2"}, testProcedure=, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=false, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=}) runBenchmarkTestScript.legacySCM(groovy.lang.Closure) runBenchmarkTestScript.library({identifier=jenkins@7.0.0, retriever=null}) runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) @@ -60,4 +60,4 @@ BuildManifest.getArtifactBuildId() BuildManifest.getArtifactArchitecture() BuildManifest.getCommitId(OpenSearch) - runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) + runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,security-enabled:false --without-security --single-node --use-50-percent-heap --capture-segment-replication-stat --suffix 307 --data-instance-type r5.8xlarge --workload-params '{"key2":"value2"}' --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200) diff --git a/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy b/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy index 8a1e22ec..c6080f88 100644 --- a/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy +++ b/tests/jenkins/lib-testers/RunBenchmarkTestScriptLibTest.groovy @@ -36,15 +36,17 @@ class RunBenchmarkTestScriptLibTester extends LibFunctionTester{ private String additionalConfig private String dataStorageSize = '200' private String mlStorageSize = '200' + private String enableInstanceStorage private String jvmSysProps = '' private String captureNodeStat private String captureSegmentReplicationStat private String telemetryParams - public RunBenchmarkTestScriptLibTester(command, bundleManifest, distributionUrl, distributionVersion, insecure, workload, - singleNode, minDistribution, use50PercentHeap, enableRemoteStore, managerNodeCount, - dataNodeCount, dataInstanceType, userTag, workloadParams, testProcedure, excludeTasks, - includeTasks, additionalConfig, captureNodeStat, captureSegmentReplicationStat, telemetryParams){ + public RunBenchmarkTestScriptLibTester(command, bundleManifest, distributionUrl, distributionVersion, insecure, workload, + singleNode, minDistribution, use50PercentHeap, enableRemoteStore, managerNodeCount, + dataNodeCount, dataInstanceType, userTag, workloadParams, testProcedure, excludeTasks, + includeTasks, additionalConfig, captureNodeStat, captureSegmentReplicationStat, telemetryParams, + enableInstanceStorage){ this.command = command this.bundleManifest = bundleManifest this.distributionUrl = distributionUrl @@ -67,6 +69,7 @@ class RunBenchmarkTestScriptLibTester extends LibFunctionTester{ this.captureNodeStat = captureNodeStat this.captureSegmentReplicationStat = captureSegmentReplicationStat this.telemetryParams = telemetryParams + this.enableInstanceStorage = enableInstanceStorage } @@ -164,5 +167,6 @@ class RunBenchmarkTestScriptLibTester extends LibFunctionTester{ binding.setVariable('TEST_WORKLOAD', workload) binding.setVariable('WEBHOOK_URL', 'test://artifact.url') binding.setVariable('TELEMETRY_PARAMS', telemetryParams) + binding.setVariable('ENABLE_INSTANCE_STORAGE', enableInstanceStorage) } } diff --git a/vars/runBenchmarkTestScript.groovy b/vars/runBenchmarkTestScript.groovy index 2f011a55..6883a1b4 100644 --- a/vars/runBenchmarkTestScript.groovy +++ b/vars/runBenchmarkTestScript.groovy @@ -106,6 +106,7 @@ void call(Map args = [:]) { args.use50PercentHeap?.toBoolean() ? "--use-50-percent-heap" : "", args.enableRemoteStore?.toBoolean() ? "--enable-remote-store" : "", args.captureNodeStat?.toBoolean() ? "--capture-node-stat" : "", + args.enableInstanceStorage?.toBoolean() ? "--enable-instance-storage" : "", args.captureSegmentReplicationStat?.toBoolean() ? "--capture-segment-replication-stat" : "", isNullOrEmpty(args.suffix) ? "" : "--suffix ${args.suffix}", isNullOrEmpty(args.managerNodeCount) ? "" : "--manager-node-count ${args.managerNodeCount}",