From 1d49f9c97454781faf6932fdd63a269082a8b72f Mon Sep 17 00:00:00 2001 From: AnieeG Date: Sun, 22 Oct 2023 12:59:55 -0700 Subject: [PATCH] only apply pod chaos --- integration-tests/ccip-tests/load-test.env | 14 +++++------ .../ccip-tests/load/ccip_test.go | 25 +------------------ 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/integration-tests/ccip-tests/load-test.env b/integration-tests/ccip-tests/load-test.env index 7f1f79c11c..ef22e0ec33 100644 --- a/integration-tests/ccip-tests/load-test.env +++ b/integration-tests/ccip-tests/load-test.env @@ -13,14 +13,14 @@ export CCIP_TESTS_ON_EXISTING_DEPLOYMENT=False export SELECTED_NETWORKS="SIMULATED,SIMULATED_1,SIMULATED_2" export CCIP_NETWORK_PAIRS="" -export CCIP_NO_OF_NETWORKS=18 -export CCIP_NO_OF_ROUTERS_PER_PAIR=2 +export CCIP_NO_OF_NETWORKS=2 +export CCIP_NO_OF_ROUTERS_PER_PAIR=1 # The load will be triggered as per # for . Example for following: 1 request per 10s for 1h export CCIP_LOAD_TEST_RATEUNIT=10s export CCIP_LOAD_TEST_RATE=1 -export CCIP_TEST_DURATION=2h +export CCIP_TEST_DURATION=15m # if CCIP_KEEP_ENV_ALIVE is set to true, the env will not be destroyed after the test. export CCIP_KEEP_ENV_ALIVE=True @@ -39,8 +39,8 @@ export CCIP_TRANSFER_AMOUNT_PER_TOKEN=1 export CCIP_DEPLOY_BLOCKSCOUT=False # if chaos is run with load -export CCIP_CHAOS_DURATION=20m -export CCIP_WAIT_BETWEEN_NEXT_CHAOS=5m +export CCIP_CHAOS_DURATION=5m +export CCIP_WAIT_BETWEEN_NEXT_CHAOS=30s # remote runner resource requirements export RR_MEM=16Gi @@ -50,8 +50,8 @@ export RR_CPU=4 export CCIP_DB_MEM=6Gi export CCIP_DB_CPU=2 export CCIP_DB_ARGS="shared_buffers=2GB,effective_cache_size=4GB,work_mem=128MB" -export CCIP_MAX_OPEN_CONNECTIONS=40 -export CCIP_MAX_IDLE_CONNECTIONS=20 +export CCIP_MAX_OPEN_CONNECTIONS=50 +export CCIP_MAX_IDLE_CONNECTIONS=50 # node resource requirements export CCIP_NODE_MEM=8Gi diff --git a/integration-tests/ccip-tests/load/ccip_test.go b/integration-tests/ccip-tests/load/ccip_test.go index 9a9481f9bc..bf28ff7879 100644 --- a/integration-tests/ccip-tests/load/ccip_test.go +++ b/integration-tests/ccip-tests/load/ccip_test.go @@ -102,7 +102,7 @@ func TestLoadCCIPStableRequestTriggeringWithNetworkChaos(t *testing.T) { // the pod chaos is applied at a regular interval throughout the test duration // this test needs to be run for a longer duration to see the effects of pod chaos // in this test commit and execution are set up to be on the same node -func TestLoadCCIPStableWithPodChaosAndNetworkChaos(t *testing.T) { +func TestLoadCCIPStableWithPodChaos(t *testing.T) { t.Parallel() inputs := []ChaosConfig{ @@ -154,30 +154,7 @@ func TestLoadCCIPStableWithPodChaosAndNetworkChaos(t *testing.T) { require.NotNil(t, testEnv) require.NotNil(t, testEnv.K8Env) - // apply network chaos so that chainlink's RPC calls are affected by some network delay for the duration of the test - var gethNetworksLabels []string - for _, net := range testArgs.TestCfg.SelectedNetworks { - gethNetworksLabels = append(gethNetworksLabels, actions.GethLabel(net.Name)) - } - testEnv.ChaosLabelForAllGeth(t, gethNetworksLabels) - chaosId, err := testEnv.K8Env.Chaos.Run( - chaos.NewNetworkLatency( - testEnv.K8Env.Cfg.Namespace, &chaos.Props{ - FromLabels: &map[string]*string{"geth": a.Str(actions.ChaosGroupCCIPGeth)}, - ToLabels: &map[string]*string{"app": a.Str("chainlink-0")}, - DurationStr: testArgs.TestCfg.TestDuration.String(), - Delay: "300ms", - })) - require.NoError(t, err) - - t.Cleanup(func() { - if chaosId != "" { - require.NoError(t, testEnv.K8Env.Chaos.Stop(chaosId)) - } - }) testArgs.TriggerLoad() - - // apply pod chaos to the CL nodes asynchronously and sequentially while the load is running testArgs.ApplyChaos() testArgs.Wait() }