Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge code freeze changes #530

Merged
merged 2 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions docker-compose/ci-cadence-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,16 @@ services:
- "2181:2181"
networks:
- testing-network
healthcheck:
test: [ "CMD-SHELL", "echo ruok | nc -w 2 zookeeper 2181" ]
interval: 5s
timeout: 10s
retries: 3
kafka:
image: wurstmeister/kafka:2.12-2.1.1
depends_on:
- zookeeper
zookeeper:
condition: service_healthy
ports:
- "9092:9092"
environment:
Expand All @@ -41,6 +47,12 @@ services:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
networks:
- testing-network
healthcheck:
test:
[ "CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181" ]
interval: 1s
timeout: 60s
retries: 60
cadence:
image: ubercadence/server:0.24.0-auto-setup
ports:
Expand All @@ -61,9 +73,12 @@ services:
- "ES_VERSION=v7"
- "KAFKA_SEEDS=kafka"
depends_on:
- cassandra
- kafka
- elasticsearch
cassandra:
condition: service_started
kafka:
condition: service_healthy
elasticsearch:
condition: service_started
networks:
- testing-network
cadence-admin-tools:
Expand Down
23 changes: 19 additions & 4 deletions docker-compose/ci-cadence-temporal-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,16 @@ services:
- "2181:2181"
networks:
- testing-network
healthcheck:
test: [ "CMD-SHELL", "echo ruok | nc -w 2 zookeeper 2181" ]
interval: 5s
timeout: 10s
retries: 3
kafka:
image: wurstmeister/kafka:2.12-2.1.1
depends_on:
- zookeeper
zookeeper:
condition: service_healthy
ports:
- "9092:9092"
environment:
Expand All @@ -90,6 +96,12 @@ services:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
networks:
- testing-network
healthcheck:
test:
[ "CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181" ]
interval: 1s
timeout: 60s
retries: 60
cadence:
image: ubercadence/server:0.24.0-auto-setup
ports:
Expand All @@ -110,9 +122,12 @@ services:
- "ES_VERSION=v7"
- "KAFKA_SEEDS=kafka"
depends_on:
- cassandra
- kafka
- elasticsearch
cassandra:
condition: service_started
kafka:
condition: service_healthy
elasticsearch:
condition: service_started
networks:
- testing-network
cadence-admin-tools:
Expand Down
23 changes: 19 additions & 4 deletions docker-compose/integ-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,16 @@ services:
- "2181:2181"
networks:
- testing-network
healthcheck:
test: [ "CMD-SHELL", "echo ruok | nc -w 2 zookeeper 2181" ]
interval: 5s
timeout: 10s
retries: 3
kafka:
image: wurstmeister/kafka:2.12-2.1.1
depends_on:
- zookeeper
zookeeper:
condition: service_healthy
ports:
- "9092:9092"
environment:
Expand All @@ -90,6 +96,12 @@ services:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
networks:
- testing-network
healthcheck:
test:
[ "CMD", "kafka-topics.sh", "--list", "--zookeeper", "zookeeper:2181" ]
interval: 1s
timeout: 60s
retries: 60
cadence:
image: ubercadence/server:0.24.0-auto-setup
ports:
Expand All @@ -110,9 +122,12 @@ services:
- "ES_VERSION=v7"
- "KAFKA_SEEDS=kafka"
depends_on:
- cassandra
- kafka
- elasticsearch
cassandra:
condition: service_started
kafka:
condition: service_healthy
elasticsearch:
condition: service_started
networks:
- testing-network
cadence-admin-tools:
Expand Down
17 changes: 17 additions & 0 deletions service/interpreter/globalVersioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,30 @@ import (

const globalChangeId = "global"

// StartingVersionUsingGlobalVersioning First global version
const StartingVersionUsingGlobalVersioning = 1

// StartingVersionOptimizedUpsertSearchAttribute Optimized upserting SAs
const StartingVersionOptimizedUpsertSearchAttribute = 2

// StartingVersionRenamedStateApi Renamed state API
// see: https://github.com/indeedeng/iwf/pull/242/files
const StartingVersionRenamedStateApi = 3

// StartingVersionContinueAsNewOnNoStates Fix ContinueAsNew bug
const StartingVersionContinueAsNewOnNoStates = 4

// StartingVersionTemporal26SDK Upgraded Temporal SDK version which brought changes to update handler
// see: https://github.com/indeedeng/iwf/releases/tag/v1.11.0
const StartingVersionTemporal26SDK = 5

// StartingVersionExecutingStateIdMode Changed default rule of upserting SAs
const StartingVersionExecutingStateIdMode = 6

// StartingVersionNoIwfGlobalVersionSearchAttribute Removed upserting IwfGlobalWorkflowVersion SA
const StartingVersionNoIwfGlobalVersionSearchAttribute = 7

// StartingVersionYieldOnConditionalComplete Bug fix to where published messages could be lost
const StartingVersionYieldOnConditionalComplete = 8
const MaxOfAllVersions = StartingVersionYieldOnConditionalComplete

Expand Down
Loading