Use --env instead of --zone to start the server in development enviro…

…nment (#2878)
temporalio · May 20, 2022 · faa215f · faa215f
1 parent 98f4525
commit faa215f
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -416,25 +416,31 @@ stop-dependencies-cdc:
 	docker-compose $(DOCKER_COMPOSE_FILES) $(DOCKER_COMPOSE_CDC_FILES) down
 
 start: temporal-server
-	./temporal-server --zone cass start
+	./temporal-server --env development-cass start
 
 start-es: temporal-server
-	./temporal-server --zone cass-es start
+	./temporal-server --env development-cass-es start
 
 start-mysql: temporal-server
-	./temporal-server --zone mysql start
+	./temporal-server --env development-mysql start
 
 start-mysql-es: temporal-server
-	./temporal-server --zone mysql-es start
+	./temporal-server --env development-mysql-es start
+
+start-postgres: temporal-server
+	./temporal-server --env development-postgres start
+
+start-sqlite: temporal-server
+	./temporal-server --env development-sqlite start
 
 start-cdc-active: temporal-server
-	./temporal-server --zone active start
+	./temporal-server --env development-active start
 
 start-cdc-standby: temporal-server
-	./temporal-server --zone standby start
+	./temporal-server --env development-standby start
 
 start-cdc-other: temporal-server
-	./temporal-server --zone other start
+	./temporal-server --env development-other start
 
 ##### Mocks #####
 AWS_SDK_VERSION := $(lastword $(shell grep "github.com/aws/aws-sdk-go v1" go.mod))

diff --git a/config/base.yaml b/config/base.yaml
diff --git a/config/development_active.yaml → config/development-active.yaml b/config/development_active.yaml → config/development-active.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: cass-default
   visibilityStore:
@@ -117,5 +121,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_cass.yaml"
+  filepath: "config/dynamicconfig/development-cass.yaml"
   pollInterval: "10s"
diff --git a/config/development_cass-archival.yaml → config/development-cass-archival.yaml b/config/development_cass-archival.yaml → config/development-cass-archival.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: cass-default
   visibilityStore: cass-visibility
@@ -97,5 +101,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "./config/dynamicconfig/development_cass.yaml"
+  filepath: "./config/dynamicconfig/development-cass.yaml"
   pollInterval: "10s"
diff --git a/config/development_cass-es.yaml → config/development-cass-es.yaml b/config/development_cass-es.yaml → config/development-cass-es.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: cass-default
   visibilityStore:
@@ -105,5 +109,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_cass.yaml"
+  filepath: "config/dynamicconfig/development-cass.yaml"
   pollInterval: "10s"
diff --git a/config/development_cass.yaml → config/development-cass.yaml b/config/development_cass.yaml → config/development-cass.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: cass-default
   visibilityStore: cass-visibility
@@ -121,5 +125,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "./config/dynamicconfig/development_cass.yaml"
+  filepath: "./config/dynamicconfig/development-cass.yaml"
   pollInterval: "10s"
diff --git a/config/development_mysql-es.yaml → config/development-mysql-es.yaml b/config/development_mysql-es.yaml → config/development-mysql-es.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: mysql-default
   visibilityStore:
@@ -111,5 +115,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_sql.yaml"
+  filepath: "config/dynamicconfig/development-sql.yaml"
   pollInterval: "10s"
diff --git a/config/development_mysql.yaml → config/development-mysql.yaml b/config/development_mysql.yaml → config/development-mysql.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: mysql-default
   visibilityStore: mysql-visibility
@@ -112,5 +116,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_sql.yaml"
+  filepath: "config/dynamicconfig/development-sql.yaml"
   pollInterval: "10s"
diff --git a/config/development_other.yaml → config/development-other.yaml b/config/development_other.yaml → config/development-other.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: cass-default
   visibilityStore:
@@ -122,5 +126,5 @@ publicClient:
   hostPort: "localhost:9233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_cass.yaml"
+  filepath: "config/dynamicconfig/development-cass.yaml"
   pollInterval: "10s"
diff --git a/config/development_postgres.yaml → config/development-postgres.yaml b/config/development_postgres.yaml → config/development-postgres.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: postgres-default
   visibilityStore: postgres-visibility
@@ -112,5 +116,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_sql.yaml"
+  filepath: "config/dynamicconfig/development-sql.yaml"
   pollInterval: "10s"
diff --git a/config/development_sqlite.yaml → config/development-sqlite.yaml b/config/development_sqlite.yaml → config/development-sqlite.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: sqlite-default
   visibilityStore: sqlite-visibility
@@ -132,5 +136,5 @@ publicClient:
   hostPort: "localhost:7233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_sql.yaml"
+  filepath: "config/dynamicconfig/development-sql.yaml"
   pollInterval: "10s"
diff --git a/config/development_standby.yaml → config/development-standby.yaml b/config/development_standby.yaml → config/development-standby.yaml
@@ -1,3 +1,7 @@
+log:
+  stdout: true
+  level: info
+
 persistence:
   defaultStore: cass-default
   visibilityStore:
@@ -122,5 +126,5 @@ publicClient:
   hostPort: "localhost:8233"
 
 dynamicConfigClient:
-  filepath: "config/dynamicconfig/development_cass.yaml"
+  filepath: "config/dynamicconfig/development-cass.yaml"
   pollInterval: "10s"
diff --git a/config/development.yaml b/config/development.yaml
@@ -0,0 +1 @@
+development-cass.yaml
diff --git a/config/dynamicconfig/README.md b/config/dynamicconfig/README.md
@@ -1,4 +1,4 @@
-Use development_*.yaml file to override the default dynamic config value (they are specified
+Use `development-*.yaml` file to override the default dynamic config value (they are specified
 when creating the service config).
 
 Each key can have zero or more values and each value can have zero or more

diff --git a/config/dynamicconfig/development_cass.yaml → config/dynamicconfig/development-cass.yaml b/config/dynamicconfig/development_cass.yaml → config/dynamicconfig/development-cass.yaml
diff --git a/config/dynamicconfig/development_sql.yaml → config/dynamicconfig/development-sql.yaml b/config/dynamicconfig/development_sql.yaml → config/dynamicconfig/development-sql.yaml
diff --git a/service/worker/README.md b/service/worker/README.md
@@ -13,34 +13,34 @@ can be applied to local Temporal cluster.
 ### Quickstart for localhost development
 
 1. Start Temporal development server for active zone:
-    ```
-    ./temporal-server --zone active start
+    ```bash
+    make start-cdc-active
     ```
 
 2. Start Temporal development server for standby(passive) zone:
-    ```
-    ./temporal-server --zone standby start
+    ```bash
+    make start-cdc-standby
     ```
 
 3. Connect two Temporal clusters:
-   ```
+   ```bash
    tctl --ad 127.0.0.1:7233 adm cl upsert-remote-cluster --frontend_address "localhost:8233"
    tctl --ad 127.0.0.1:8233 adm cl upsert-remote-cluster --frontend_address "localhost:7233"
    ```
 
 4. Create global namespaces
-    ```
+    ```bash
     tctl --ns sample namespace register --gd true --ac active --cl active standby
     ```
 
 5. Failover between zones:
 
     Failover to standby:
-    ```
+    ```bash
     tctl --ns sample namespace update --ac standby
     ```
     Failback to active:
-    ```
+    ```bash
     tctl --ns sample namespace update --ac active
     ```