Skip to content

Commit fd224eb

Browse files
authored
Remove default taskListActivitiesPerSecond limit (#578)
1 parent c876ac1 commit fd224eb

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed

.buildkite/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ steps:
99
queue: "workers"
1010
docker: "*"
1111
command: "./gradlew --no-daemon test"
12-
timeout_in_minutes: 30
12+
timeout_in_minutes: 15
1313
retry:
1414
automatic:
1515
- exit_status: "*"
@@ -24,7 +24,7 @@ steps:
2424
queue: "workers"
2525
docker: "*"
2626
command: "./gradlew --no-daemon test"
27-
timeout_in_minutes: 30
27+
timeout_in_minutes: 15
2828
retry:
2929
automatic:
3030
- exit_status: "*"
@@ -39,7 +39,7 @@ steps:
3939
queue: "workers"
4040
docker: "*"
4141
command: "./gradlew --no-daemon test"
42-
timeout_in_minutes: 30
42+
timeout_in_minutes: 15
4343
retry:
4444
automatic:
4545
- exit_status: "*"

docker/buildkite/docker-compose.yaml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,21 @@ version: '3.5'
33
services:
44
cassandra:
55
image: cassandra:3.11
6-
logging:
7-
driver: none
6+
deploy:
7+
resources:
8+
limits:
9+
cpus: '4'
10+
memory: 12000M
811
ports:
912
- "9042:9042"
1013

1114
statsd:
1215
image: hopsoft/graphite-statsd
13-
logging:
14-
driver: none
16+
deploy:
17+
resources:
18+
limits:
19+
cpus: '0.50'
20+
memory: 1024M
1521
ports:
1622
- "8080:80"
1723
- "2003:2003"
@@ -20,8 +26,11 @@ services:
2026

2127
cadence:
2228
image: ubercadence/server:latestRelease-auto-setup
23-
logging:
24-
driver: none
29+
deploy:
30+
resources:
31+
limits:
32+
cpus: '2'
33+
memory: 8192M
2534
ports:
2635
- "7933:7933"
2736
- "7934:7934"
@@ -39,6 +48,11 @@ services:
3948
context: ../../
4049
dockerfile: ./docker/buildkite/Dockerfile
4150
command: "./gradlew --no-daemon test"
51+
deploy:
52+
resources:
53+
limits:
54+
cpus: '2'
55+
memory: 8192M
4256
environment:
4357
- "USER=unittest"
4458
- "CADENCE_SEEDS=cadence"
@@ -54,6 +68,11 @@ services:
5468
context: ../../
5569
dockerfile: ./docker/buildkite/Dockerfile
5670
command: "./gradlew --no-daemon test"
71+
deploy:
72+
resources:
73+
limits:
74+
cpus: '2'
75+
memory: 8192M
5776
environment:
5877
- "USER=unittest"
5978
- "CADENCE_SEEDS=cadence"

src/main/java/com/uber/cadence/internal/replay/ReplayDecider.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,13 @@ public HistoryEvent next() {
685685
if (!current.hasNext()) {
686686
log.error(
687687
"GetWorkflowExecutionHistory returns an empty history, maybe a bug in server, workflowID:"
688-
+ request.execution.workflowId+", runID:"+request.execution.runId+", domain:"+request.domain
689-
+" token:" + Arrays.toString(request.getNextPageToken()));
688+
+ request.execution.workflowId
689+
+ ", runID:"
690+
+ request.execution.runId
691+
+ ", domain:"
692+
+ request.domain
693+
+ " token:"
694+
+ Arrays.toString(request.getNextPageToken()));
690695
throw new Error(
691696
"GetWorkflowExecutionHistory return empty history, maybe a bug in server");
692697
}

src/main/java/com/uber/cadence/worker/WorkerOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static final class Builder {
4747
private int maxConcurrentActivityExecutionSize = 100;
4848
private int maxConcurrentWorkflowExecutionSize = 50;
4949
private int maxConcurrentLocalActivityExecutionSize = 100;
50-
private double taskListActivitiesPerSecond = 100000;
50+
private double taskListActivitiesPerSecond;
5151
private PollerOptions activityPollerOptions;
5252
private PollerOptions workflowPollerOptions;
5353
private Function<WorkflowInterceptor, WorkflowInterceptor> interceptorFactory = (n) -> n;
@@ -128,7 +128,7 @@ public Builder setInterceptorFactory(
128128
* Notice that the number is represented in double, so that you can set it to less than 1 if
129129
* needed. For example, set the number to 0.1 means you want your activity to be executed once
130130
* every 10 seconds. This can be used to protect down stream services from flooding. The zero
131-
* value of this uses the default value. Default: 100k
131+
* value means there's no limit.
132132
*/
133133
public Builder setTaskListActivitiesPerSecond(double taskListActivitiesPerSecond) {
134134
this.taskListActivitiesPerSecond = taskListActivitiesPerSecond;

0 commit comments

Comments
 (0)