removes use of public ip addresses from perf tests (backport #19184) (#20238)

* removes use of public ip addresses from system tests

Using global IPs causes outbound traffic which costs money:
https://github.com/solana-labs/solana/pull/18728#issuecomment-884290209

(cherry picked from commit bd8f793809)

* removes redundant allow-private-addr from system tests

Following https://github.com/solana-labs/solana/pull/19130
if gce.sh creat is invoked without -P then --allow-private-addr is
implied:
https://github.com/solana-labs/solana/blob/4cc1b1504/net/common.sh#L68-L73

Therefore tests only need to specify:
  USE_PUBLIC_IP_ADDRESSES: "false"

(cherry picked from commit 18463aa846)

# Conflicts:
#	system-test/partition-testcases/gce-5-node-3-partition.yml
#	system-test/partition-testcases/gce-partition-once-then-stabilize.yml
#	system-test/partition-testcases/gce-partition-with-offline.yml

* removes backport merge conflicts

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
This commit is contained in:
mergify[bot]
2021-09-27 01:23:02 +00:00
committed by GitHub
parent d68377e927
commit 2975dc5c1a
20 changed files with 45 additions and 19 deletions

View File

@ -13,7 +13,7 @@ steps:
CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
ALLOW_BOOT_FAILURES: "true" ALLOW_BOOT_FAILURES: "true"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -11,7 +11,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
APPLY_PARTITIONS: "true" APPLY_PARTITIONS: "true"
NETEM_CONFIG_FILE: "system-test/netem-configs/partial-loss-three-partitions" NETEM_CONFIG_FILE: "system-test/netem-configs/partial-loss-three-partitions"

View File

@ -11,7 +11,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
APPLY_PARTITIONS: "true" APPLY_PARTITIONS: "true"
NETEM_CONFIG_FILE: "system-test/netem-configs/partial-loss-three-partitions" NETEM_CONFIG_FILE: "system-test/netem-configs/partial-loss-three-partitions"

View File

@ -0,0 +1,27 @@
steps:
- command: "system-test/testnet-automation.sh"
label: "GCE - CPU Only 5 Node - 20% network offline with 2 partitions"
env:
UPLOAD_RESULTS_TO_SLACK: "true"
CLOUD_PROVIDER: "gce"
TESTNET_TAG: "gce-perf-cpu-only"
NUMBER_OF_VALIDATOR_NODES: 4
ENABLE_GPU: "false"
VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated"
APPLY_PARTITIONS: "true"
NETEM_CONFIG_FILE: "system-test/netem-configs/complete-loss-two-partitions"
PARTITION_ACTIVE_DURATION: 30
PARTITION_INACTIVE_DURATION: 30
PARTITION_ITERATION_COUNT: 5
TEST_TYPE: "partition"
EXTRA_PRIMORDIAL_STAKES: 4
WAIT_FOR_EQUAL_STAKE: "true"
WARMUP_SLOTS_BEFORE_TEST: 400
NUMBER_OF_OFFLINE_NODES: 1
agents:
- "queue=gce-deploy"

View File

@ -13,7 +13,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west-1a,us-west-1c,us-east-1a,eu-west-1a" TESTNET_ZONES: "us-west-1a,us-west-1c,us-east-1a,eu-west-1a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "" ADDITIONAL_FLAGS: ""
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -13,7 +13,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west-1a,us-west-1c,us-east-1a,eu-west-1a" TESTNET_ZONES: "us-west-1a,us-west-1c,us-east-1a,eu-west-1a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "" ADDITIONAL_FLAGS: ""
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "westus" TESTNET_ZONES: "westus"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "" ADDITIONAL_FLAGS: ""
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -12,7 +12,7 @@ steps:
NUMBER_OF_CLIENT_NODES: 1 NUMBER_OF_CLIENT_NODES: 1
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -13,7 +13,7 @@ steps:
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a" TESTNET_ZONES: "us-west1-a"
ALLOW_BOOT_FAILURES: "true" ALLOW_BOOT_FAILURES: "true"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -13,7 +13,7 @@ steps:
CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250" CLIENT_OPTIONS: "bench-tps=1=--tx_count 10000 --thread-batch-sleep-ms 250"
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
ALLOW_BOOT_FAILURES: "true" ALLOW_BOOT_FAILURES: "true"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents:

View File

@ -15,6 +15,5 @@ steps:
USE_PUBLIC_IP_ADDRESSES: "false" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
ALLOW_PRIVATE_ADDR: "true"
agents: agents:
- "queue=gce-deploy" - "queue=gce-deploy"

View File

@ -11,7 +11,7 @@ steps:
VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16" VALIDATOR_NODE_MACHINE_TYPE: "--machine-type n1-standard-16"
NUMBER_OF_CLIENT_NODES: 0 NUMBER_OF_CLIENT_NODES: 0
TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a" TESTNET_ZONES: "us-west1-a,us-west1-b,us-central1-a,europe-west4-a"
USE_PUBLIC_IP_ADDRESSES: "true" USE_PUBLIC_IP_ADDRESSES: "false"
ADDITIONAL_FLAGS: "--dedicated" ADDITIONAL_FLAGS: "--dedicated"
TEST_TYPE: "fixed_duration" TEST_TYPE: "fixed_duration"
agents: agents: