From 98ef7e65b46b123db6e94e74cf68229751274406 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 3 Sep 2025 10:20:31 +0200 Subject: [PATCH 1/5] teztcloud/layer1: remove useless metrics recording --- tezt/tests/cloud/layer1.ml | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/tezt/tests/cloud/layer1.ml b/tezt/tests/cloud/layer1.ml index 416e69eafa70..ff1b7a7fc5ac 100644 --- a/tezt/tests/cloud/layer1.ml +++ b/tezt/tests/cloud/layer1.ml @@ -880,39 +880,6 @@ let init ~(configuration : Scenarios_configuration.LAYER1.t) cloud = in Lwt.return {cloud; configuration; bootstrap; bakers; producers; stresstesters} -let on_new_level = - let push_level t level = - Cloud.push_metric - t.cloud - ~help:"Level of (HEAD - 1)" - ~typ:`Counter - ~name:"level" - (float_of_int level) - in - let push_nb_ops t nb = - Cloud.push_metric - t.cloud - ~help:"Level of (HEAD - 1)" - ~typ:`Counter - ~name:"nb_ops" - (float_of_int nb) - in - fun t level -> - let* _ = Node.wait_for_level t.bootstrap.node level in - let level = level - 2 in - toplog "Processing metrics for level %d" level ; - let* json = - Client.(rpc GET) - ["chains"; "main"; "blocks"; string_of_int level] - t.bootstrap.client - in - let level = JSON.(json |-> "header" |-> "level" |> as_int) in - let nops = JSON.(json |-> "operations" |> as_list |> List.length) in - push_level t level ; - push_nb_ops t nops ; - toplog "Done processing metrics for level %d" level ; - Lwt.return_unit - type docker_image = Agent.Configuration.docker_image = | Gcp of {alias : string} | Octez_release of {tag : string} @@ -1268,7 +1235,6 @@ let register (module Cli : Scenarios_cli.Layer1) = (let rec loop level = let level = succ level in let* () = produce_slot t level in - let* () = on_new_level t level in loop level in loop) -- GitLab From e257dcbc242293e20a772b6530f59fd6ddcf6d6f Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 3 Sep 2025 15:48:12 +0200 Subject: [PATCH 2/5] tezt/cloud: dal use local rpc endpoint if on the same runner --- tezt/tests/cloud/tezos.ml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tezt/tests/cloud/tezos.ml b/tezt/tests/cloud/tezos.ml index dd2884a9520e..811d60bbe050 100644 --- a/tezt/tests/cloud/tezos.ml +++ b/tezt/tests/cloud/tezos.ml @@ -637,14 +637,18 @@ module Dal_node = struct Lwt.return node let create ?net_port ?path ~name ?disable_shard_validation ?ignore_pkhs - ~node agent = + ~node cloud agent = create_from_endpoint ?net_port ?path ~name ?disable_shard_validation ?ignore_pkhs - ~l1_node_endpoint:(Node.as_rpc_endpoint node) + ~l1_node_endpoint: + (Node.as_rpc_endpoint + ~local:(Node.runner node = Agent.runner agent) + node) + cloud agent let run ?prometheus ?otel ?(memtrace = false) ?event_level -- GitLab From 70f32a1ea67364b4fb9f825e0c3cefa0f4323ce1 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 3 Sep 2025 15:49:04 +0200 Subject: [PATCH 3/5] tezt/layer1: fix agent kind name usage --- tezt/tests/cloud/layer1.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tezt/tests/cloud/layer1.ml b/tezt/tests/cloud/layer1.ml index ff1b7a7fc5ac..553ed945e752 100644 --- a/tezt/tests/cloud/layer1.ml +++ b/tezt/tests/cloud/layer1.ml @@ -48,7 +48,7 @@ let agent_name_stresstest : rex = rex "stresstest-(\\d+)" let agent_name_baker : rex = rex "baker-(\\d+)" -let agent_name_dal_producer : rex = rex "dal-node-producer-(\\d+)" +let agent_name_dal_producer : rex = rex "dal-producer-(\\d+)" let extract_agent_index (r : rex) agent = match Agent.name agent =~* r with @@ -1144,7 +1144,7 @@ let register (module Cli : Scenarios_cli.Layer1) = | {bakers = Some bakers; _} -> List.nth_opt bakers i | {bakers = None; _} -> None) | Producer i -> - make_vm_conf ~name:(name_of_daemon (Producer_dal_node i)) + make_vm_conf ~name:(name_of (Producer i)) @@ Option.bind vms_conf (function | {producers = Some producers; _} -> List.nth_opt producers i -- GitLab From 6c95e9ccc22defb8406afa1adde895cc6b43a4e6 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 3 Sep 2025 15:51:32 +0200 Subject: [PATCH 4/5] teztcloud/layer1: rename init_baker_node in init_node_with_wallet --- tezt/tests/cloud/layer1.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tezt/tests/cloud/layer1.ml b/tezt/tests/cloud/layer1.ml index 553ed945e752..a4f993511273 100644 --- a/tezt/tests/cloud/layer1.ml +++ b/tezt/tests/cloud/layer1.ml @@ -264,9 +264,9 @@ module Node = struct create the associated client, create the yes-wallet. *) - let init_baker_node ?(delay = 0) ~accounts ~peers ~ppx_profiling_verbosity - ~ppx_profiling_backends ~snapshot ~network ~migration_offset - (agent, node, name) = + let init_node_with_wallet ?(delay = 0) ~accounts ~peers + ~ppx_profiling_verbosity ~ppx_profiling_backends ~snapshot ~network + ~migration_offset (agent, node, name) = toplog "Initializing an L1 node (public network): %s" name ; let* () = init_node_from_snapshot @@ -362,7 +362,7 @@ let init_baker_i i (configuration : Scenarios_configuration.LAYER1.t) cloud let* client = toplog "init_baker: Initialize node" ; let name = name ^ "-node" in - Node.init_baker_node + Node.init_node_with_wallet ~accounts ~delay ~peers @@ -450,7 +450,7 @@ let init_producer_i i (configuration : Scenarios_configuration.LAYER1.t) let () = toplog "Initializing the DAL producer %s" name in let* client = let name = name ^ "-node" in - Node.init_baker_node + Node.init_node_with_wallet ~accounts:[] ~delay ~peers -- GitLab From d0e5f06d5b3b1cfcdd96dc1bab9fb91ea594e2b6 Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 3 Sep 2025 15:52:12 +0200 Subject: [PATCH 5/5] teztcloud/layer1: add local option to client --- tezt/tests/cloud/layer1.ml | 17 ++++++++++++----- tezt/tests/cloud/tezos.ml | 8 ++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tezt/tests/cloud/layer1.ml b/tezt/tests/cloud/layer1.ml index a4f993511273..aa6f5196e444 100644 --- a/tezt/tests/cloud/layer1.ml +++ b/tezt/tests/cloud/layer1.ml @@ -180,9 +180,13 @@ module Node = struct your bakers start to bake. *) synchronisation_waiter - let client ~node agent = + let client ~local ~node agent = let name = Tezt_cloud.Agent.name agent ^ "-client" in - Client.Agent.create ~name ~endpoint:(Client.Node node) agent + let endpoint = + if local then Client.Foreign_endpoint (Node.as_rpc_endpoint ~local node) + else Client.Node node + in + Client.Agent.create ~name ~endpoint agent (** Initialize the node, create the associated client, @@ -202,7 +206,7 @@ module Node = struct network migration_offset in - let* client = client ~node agent in + let* client = client ~local:true ~node agent in let* yes_wallet = Node_helpers.yes_wallet agent in let* _filename = Yes_wallet.create_from_context @@ -279,7 +283,10 @@ module Node = struct ~migration_offset (agent, node, name) in - let* client = client ~node agent in + let* client = + (* [~local] is set to false since the client might be called from the localhost/orchestrator *) + client ~local:false ~node agent + in let* yes_wallet = Node_helpers.yes_wallet agent in let* () = Lwt_list.iter_s @@ -308,7 +315,7 @@ module Node = struct ~migration_offset (agent, node, name) in - let* client = client ~node agent in + let* client = client ~local:true ~node agent in let* yes_wallet = Node_helpers.yes_wallet agent in let* () = Client.forget_all_keys client in let* () = Client.import_public_key ~alias:pkh ~public_key:pk client in diff --git a/tezt/tests/cloud/tezos.ml b/tezt/tests/cloud/tezos.ml index 811d60bbe050..63b89d1bba59 100644 --- a/tezt/tests/cloud/tezos.ml +++ b/tezt/tests/cloud/tezos.ml @@ -638,16 +638,16 @@ module Dal_node = struct let create ?net_port ?path ~name ?disable_shard_validation ?ignore_pkhs ~node cloud agent = + let l1_node_endpoint = + Node.as_rpc_endpoint ~local:(Node.runner node = Agent.runner agent) node + in create_from_endpoint ?net_port ?path ~name ?disable_shard_validation ?ignore_pkhs - ~l1_node_endpoint: - (Node.as_rpc_endpoint - ~local:(Node.runner node = Agent.runner agent) - node) + ~l1_node_endpoint cloud agent -- GitLab