test: adjust cloudtest to changed process names

Orchestrator processes now have changed names, as a result of the
previous commit that made replica IDs into user/stytem enums.

Previously, process names had the form:
  * cluster-u{x}-replica-{y}-{i}
  * cluster-s{x}-replica-{y}-{i}
The new format is:
  * cluster-u{x}-replica-u{y}-{i}
  * cluster-s{x}-replica-s{y}-{i}

This commit adjusts cloudtests to work with the new format.

Author: teskje

doc/developer/cloudtest.md

@@ -153,7 +153,7 @@ is instantiated once per `pytest` invocation
 ```
 from materialize.cloudtest.util.wait import wait
 
-wait(condition="condition=Ready", resource="pod/compute-cluster-1-replica-1-0")
+wait(condition="condition=Ready", resource="pod/compute-cluster-u1-replica-u1-0")
 ```
 
 `wait` uses `kubectl wait` behind the scenes. Here is what the `kubectl wait`

doc/developer/guide-tokio-console.md

@@ -25,9 +25,9 @@ different processes, e.g.:
 
 ```text
 environmentd: [...]  INFO mz_ore::tracing: starting tokio console on http://127.0.0.1:6669
-compute-cluster-u1-replica-1: [...]  INFO mz_ore::tracing: starting tokio console on /var/folders/30/[...]3ee9
-compute-cluster-s1-replica-2: [...]  INFO mz_ore::tracing: starting tokio console on /var/folders/30/[...]f5b6
-compute-cluster-s2-replica-3: [...]  INFO mz_ore::tracing: starting tokio console on /var/folders/30/[...]7af2
+compute-cluster-u1-replica-u1: [...]  INFO mz_ore::tracing: starting tokio console on /var/folders/30/[...]3ee9
+compute-cluster-s1-replica-s1: [...]  INFO mz_ore::tracing: starting tokio console on /var/folders/30/[...]f5b6
+compute-cluster-s2-replica-s2: [...]  INFO mz_ore::tracing: starting tokio console on /var/folders/30/[...]7af2
 ```
 
 Then, in a different tmux pane/terminal, run the `tokio-console` command with the listen address of

misc/python/materialize/cloudtest/app/materialize_application.py

@@ -111,15 +111,15 @@ def start_metrics_server(self) -> None:
         )
 
     def wait_resource_creation_completed(self) -> None:
-        wait(condition="condition=Ready", resource="pod/cluster-u1-replica-1-0")
+        wait(condition="condition=Ready", resource="pod/cluster-u1-replica-u1-0")
 
     def wait_replicas(self) -> None:
         # NOTE[btv] - This will need to change if the order of
         # creating clusters/replicas changes, but it seemed fine to
         # assume this order, since we already assume it in `create`.
-        wait(condition="condition=Ready", resource="pod/cluster-u1-replica-1-0")
-        wait(condition="condition=Ready", resource="pod/cluster-s1-replica-2-0")
-        wait(condition="condition=Ready", resource="pod/cluster-s2-replica-3-0")
+        wait(condition="condition=Ready", resource="pod/cluster-u1-replica-u1-0")
+        wait(condition="condition=Ready", resource="pod/cluster-s1-replica-s1-0")
+        wait(condition="condition=Ready", resource="pod/cluster-s2-replica-s2-0")
 
     def wait_for_sql(self) -> None:
         """Wait until environmentd pod is ready and can accept SQL connections"""

misc/python/materialize/cloudtest/util/cluster.py

@@ -9,18 +9,8 @@
 
 
 def cluster_pod_name(cluster_id: str, replica_id: str, process: int = 0) -> str:
-    # Replica IDs now appear as `GlobalId`s in `mz_cluster_replicas`, while
-    # the pod names still contain only the numeric ID.
-    # TODO(teskje): Change pod names to contain the replica `GlobalId`.
-    replica_id = replica_id.lstrip("u")
-
     return f"pod/cluster-{cluster_id}-replica-{replica_id}-{process}"
 
 
 def cluster_service_name(cluster_id: str, replica_id: str) -> str:
-    # Replica IDs now appear as `GlobalId`s in `mz_cluster_replicas`, while
-    # the pod names still contain only the numeric ID.
-    # TODO(teskje): Change pod names to contain the replica `GlobalId`.
-    replica_id = replica_id.lstrip("u")
-
     return f"service/cluster-{cluster_id}-replica-{replica_id}"

test/cloudtest/test_crash.py

@@ -113,8 +113,8 @@ def restarts(p: V1Pod) -> int:
 
     def get_replica() -> Tuple[V1Pod, V1StatefulSet]:
         """Find the stateful set for the replica of the default cluster"""
-        compute_pod_name = "cluster-u1-replica-1-0"
-        ss_name = "cluster-u1-replica-1"
+        compute_pod_name = "cluster-u1-replica-u1-0"
+        ss_name = "cluster-u1-replica-u1"
         compute_pod = mz.environmentd.api().read_namespaced_pod(
             compute_pod_name, mz.environmentd.namespace()
         )

test/cloudtest/test_smoke.py

@@ -14,7 +14,7 @@
 
 
 def test_wait(mz: MaterializeApplication) -> None:
-    wait(condition="condition=Ready", resource="pod/cluster-u1-replica-1-0")
+    wait(condition="condition=Ready", resource="pod/cluster-u1-replica-u1-0")
 
 
 def test_sql(mz: MaterializeApplication) -> None:

test/cloudtest/test_system_clusters.py

@@ -28,5 +28,5 @@ def test_system_clusters(mz: MaterializeApplication) -> None:
     """Confirm that the system clusters have the expected labels and selectors"""
     mz.wait_replicas()
 
-    assert_pod_properties(mz, "cluster-s1-replica-2-0")
-    assert_pod_properties(mz, "cluster-s2-replica-3-0")
+    assert_pod_properties(mz, "cluster-s1-replica-s1-0")
+    assert_pod_properties(mz, "cluster-s2-replica-s2-0")

test/cloudtest/test_upgrade.py

@@ -56,7 +56,7 @@ def test_upgrade(
         log_filter=log_filter,
         release_mode=(not dev),
     )
-    wait(condition="condition=Ready", resource="pod/cluster-u1-replica-1-0")
+    wait(condition="condition=Ready", resource="pod/cluster-u1-replica-u1-0")
 
     executor = CloudtestExecutor(application=mz, version=LAST_RELEASED_VERSION)
     scenario = CloudtestUpgrade(checks=Check.__subclasses__(), executor=executor)