From 3d5d4c944f9d9bb1336462bca65685fbdea5c8d8 Mon Sep 17 00:00:00 2001
From: Pavel Perminov <pavel.perminov.23@gmail.com>
Date: Sun, 22 Sep 2024 06:41:56 +0300
Subject: [PATCH] examples/compose/  - docker-compose.beginners.yml: fixed
 depends_on declarations for vtctld and vtgate services  - README.md: added '
 -a' for 'docker-compose ps' for it to match the example output  -
 vttablet-up.sh: added 's' as units for
 '--queryserver-config-schema-reload-time 60'

Signed-off-by: Pavel Perminov <pavel.perminov.23@gmail.com>
---
 examples/compose/README.md                    |  2 +-
 examples/compose/docker-compose.beginners.yml | 14 ++++++++------
 examples/compose/vttablet-up.sh               |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/compose/README.md b/examples/compose/README.md
index 8d20f360620..91ec8708de5 100644
--- a/examples/compose/README.md
+++ b/examples/compose/README.md
@@ -67,7 +67,7 @@ vitess/examples/compose$ docker-compose up -d
 ### Check cluster status
 Check the status of the cluster.
 ```
-vitess/examples/compose$ docker-compose ps
+vitess/examples/compose$ docker-compose ps -a
            Name                         Command                  State                                                                     Ports
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 compose_consul1_1                          docker-entrypoint.sh agent ...   Up             8300/tcp, 8301/tcp, 8301/udp, 8302/tcp, 8302/udp,
diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml
index d647d9fdc4d..bb364846df1 100644
--- a/examples/compose/docker-compose.beginners.yml
+++ b/examples/compose/docker-compose.beginners.yml
@@ -73,10 +73,12 @@ services:
         --grpc_port $GRPC_PORT
         "]
     depends_on:
-      - consul1
-      - consul2
-      - consul3
-    depends_on:
+      consul1:
+        condition: service_started
+      consul2:
+        condition: service_started
+      consul3:
+        condition: service_started
       external_db_host:
         condition: service_healthy
 
@@ -105,8 +107,8 @@ services:
       - KEYSPACE
       - DB
     depends_on:
-      - vtctld
-    depends_on:
+      vtctld:
+        condition: service_started
       vttablet101:
         condition: service_healthy
 
diff --git a/examples/compose/vttablet-up.sh b/examples/compose/vttablet-up.sh
index 8d02a7a528e..9e16869b1af 100755
--- a/examples/compose/vttablet-up.sh
+++ b/examples/compose/vttablet-up.sh
@@ -158,5 +158,5 @@ exec $VTROOT/bin/vttablet \
   --init_shard $shard \
   --backup_storage_implementation file \
   --file_backup_storage_root $VTDATAROOT/backups \
-  --queryserver-config-schema-reload-time 60 \
+  --queryserver-config-schema-reload-time 60s \
   $external_db_args