From 323a66b7970bfe2f936f7627542e6d5e22ecc495 Mon Sep 17 00:00:00 2001
From: Dennis Felsing <dennis@felsing.org>
Date: Tue, 2 Jan 2024 11:22:07 +0000
Subject: [PATCH] Address reviewer comments

---
 test/cluster/blue-green-deployment/deploy.td |  6 +++++-
 test/cluster/blue-green-deployment/setup.td  | 16 ++++++++++------
 test/cluster/mzcompose.py                    |  3 ++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/test/cluster/blue-green-deployment/deploy.td b/test/cluster/blue-green-deployment/deploy.td
index 90fee75399c2..3e7572640a17 100644
--- a/test/cluster/blue-green-deployment/deploy.td
+++ b/test/cluster/blue-green-deployment/deploy.td
@@ -28,7 +28,8 @@
     avg(l_quantity) AS avg_qty,
     avg(l_extendedprice) AS avg_price,
     avg(l_discount) AS avg_disc,
-    count(*) AS count_order
+    count(*) AS count_order,
+    'new' as state
   FROM
     prod_deploy.lineitem
   WHERE
@@ -86,3 +87,6 @@
 
 > DROP CLUSTER prod_deploy CASCADE
 > DROP SCHEMA prod_deploy CASCADE
+
+> SELECT state FROM prod.tpch_mv LIMIT 1
+new
diff --git a/test/cluster/blue-green-deployment/setup.td b/test/cluster/blue-green-deployment/setup.td
index 76f348f319d5..e86dd86dd1cb 100644
--- a/test/cluster/blue-green-deployment/setup.td
+++ b/test/cluster/blue-green-deployment/setup.td
@@ -19,11 +19,11 @@ ALTER SYSTEM SET enable_unmanaged_cluster_replicas = true;
   COMPUTE ADDRESSES ['clusterd1:2102'],
   WORKERS 1))
 > CREATE CLUSTER prod_deploy REPLICAS (replica1 (
-  STORAGECTL ADDRESSES ['clusterd2:2100'],
-  STORAGE ADDRESSES ['clusterd2:2103'],
-  COMPUTECTL ADDRESSES ['clusterd2:2101'],
-  COMPUTE ADDRESSES ['clusterd2:2102'],
-  WORKERS 1))
+  STORAGECTL ADDRESSES ['clusterd2:2100', 'clusterd3:2100'],
+  STORAGE ADDRESSES ['clusterd2:2103', 'clusterd3:2103'],
+  COMPUTECTL ADDRESSES ['clusterd2:2101', 'clusterd3:2101'],
+  COMPUTE ADDRESSES ['clusterd2:2102', 'clusterd3:2102'],
+  WORKERS 2))
 > DROP SCHEMA IF EXISTS prod CASCADE
 > DROP SCHEMA IF EXISTS prod_deploy CASCADE
 
@@ -47,7 +47,8 @@ ALTER SYSTEM SET enable_unmanaged_cluster_replicas = true;
     avg(l_quantity) AS avg_qty,
     avg(l_extendedprice) AS avg_price,
     avg(l_discount) AS avg_disc,
-    count(*) AS count_order
+    count(*) AS count_order,
+    'old' as state
   FROM
     prod.lineitem
   WHERE
@@ -93,3 +94,6 @@ ALTER SYSTEM SET enable_unmanaged_cluster_replicas = true;
         SELECT id FROM ready_dataflows
     )
   SELECT * FROM pending_dataflows
+
+> SELECT state FROM prod.tpch_mv LIMIT 1
+old
diff --git a/test/cluster/mzcompose.py b/test/cluster/mzcompose.py
index c7d6b04ff7fb..e451e24a1eff 100644
--- a/test/cluster/mzcompose.py
+++ b/test/cluster/mzcompose.py
@@ -3022,12 +3022,13 @@ def subscribe():
         c.up("materialized")
         c.up("clusterd1")
         c.up("clusterd2")
+        c.up("clusterd3")
         c.run("testdrive", "blue-green-deployment/setup.td")
 
         threads = [PropagatingThread(target=fn) for fn in (selects, subscribe)]
         for thread in threads:
             thread.start()
-        time.sleep(3)  # some time to make sure the queries run fine
+        time.sleep(10)  # some time to make sure the queries run fine
         try:
             c.run("testdrive", "blue-green-deployment/deploy.td")
         finally: