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.

Sign up for GitHub

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

Add throttling logic for createDoc, getDeltas, and connectDoc to provide per-cluster rate-limiting at the HTTP route level #13896

Merged
merged 17 commits into from
Feb 9, 2023
Merged

Add throttling logic for createDoc, getDeltas, and connectDoc to provide per-cluster rate-limiting at the HTTP route level #13896

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b92dffe
Add throttling logic for creating documents to provide per-cluster ra…
tianzhu007 Jan 30, 2023
7e07ef2
rename the throttling method
tianzhu007 Jan 31, 2023
a096866
Introduce a cluster throttler
tianzhu007 Jan 31, 2023
49b4990
Correct the parameter names
tianzhu007 Feb 1, 2023
4ca4016
Add more endpoints
tianzhu007 Feb 3, 2023
3bc90b8
Update fluid-configmap.yaml
tianzhu007 Feb 3, 2023
7bd6293
Add restCallsGetDeltas to values.yaml
tianzhu007 Feb 3, 2023
5d22787
Add new throttler
tianzhu007 Feb 3, 2023
69f0435
Merge branch 'microsoft:main' into Add-commonThrottleOptionsCreateDoc
tianzhu007 Feb 3, 2023
62dd1ae
Update the unit tests
tianzhu007 Feb 4, 2023
5a4c0d6
Add the unit test for connect document
tianzhu007 Feb 4, 2023
1b51ee7
Update the throttling config
tianzhu007 Feb 6, 2023
e58ccc6
Merge branch 'main' into Add-commonThrottleOptionsCreateDoc
tianzhu007 Feb 7, 2023
9705b87
Adjust the config format
tianzhu007 Feb 7, 2023
5bf69bc
Merge branch 'main' into Add-commonThrottleOptionsCreateDoc
tianzhu007 Feb 8, 2023
e7a0dd1
Merge branch 'microsoft:main' into Add-commonThrottleOptionsCreateDoc
tianzhu007 Feb 8, 2023
901a56c
Merge branch 'microsoft:main' into Add-commonThrottleOptionsCreateDoc
tianzhu007 Feb 9, 2023
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
8 changes: 5 additions & 3 deletions server/BREAKING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export class AlfredResources implements core.IResources {
public webSocketLibrary: string,
public orderManager: core.IOrdererManager,
public tenantManager: core.ITenantManager,
public restThrottler: core.IThrottler,
public restTenantThrottler: core.IThrottler,
public restClusterThrottlers: Map<string, core.IThrottler>,
public socketConnectThrottler: core.IThrottler,
public socketSubmitOpThrottler: core.IThrottler,
public socketSubmitSignalThrottler: core.IThrottler,
Expand All @@ -35,7 +36,7 @@ export class AlfredResources implements core.IResources {
public metricClientConfig: any,
public documentsCollection: core.ICollection<core.IDocument>,
public throttleAndUsageStorageManager?: core.IThrottleAndUsageStorageManager,
)
)
....

export class AlfredResourcesFactory implements core.IResourcesFactory<AlfredResources> {
Expand All @@ -49,7 +50,8 @@ export class AlfredResourcesFactory implements core.IResourcesFactory<AlfredReso
webSocketLibrary,
orderManager,
tenantManager,
restThrottler,
restTenantThrottler,
restClusterThrottler,
socketConnectThrottler,
socketSubmitOpThrottler,
socketSubmitSignalThrottler,
Expand Down
59 changes: 43 additions & 16 deletions server/routerlicious/kubernetes/routerlicious/templates/fluid-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,50 @@ data:
"numberOfMessagesPerTrace": {{ .Values.alfred.numberOfMessagesPerTrace }},
"sessionStickinessDurationMs": {{ .Values.alfred.sessionStickinessDurationMs }},
"throttling": {
"restCalls": {
"maxPerMs": {{ .Values.alfred.throttling.restCalls.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.restCalls.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.restCalls.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.restCalls.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.restCalls.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.restCalls.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.restCalls.enableEnhancedTelemetry }}
"restCallsPerTenant": {
"maxPerMs": {{ .Values.alfred.throttling.restCallsPerTenant.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.restCallsPerTenant.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.restCallsPerTenant.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.restCallsPerTenant.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.restCallsPerTenant.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.restCallsPerTenant.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.restCallsPerTenant.enableEnhancedTelemetry }}
},
"socketConnections": {
"maxPerMs": {{ .Values.alfred.throttling.socketConnections.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.socketConnections.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.socketConnections.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.socketConnections.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.socketConnections.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.socketConnections.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.socketConnections.enableEnhancedTelemetry }}
"restCallsCreateDoc": {
"maxPerMs": {{ .Values.alfred.throttling.restCallsCreateDoc.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.restCallsCreateDoc.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.restCallsCreateDoc.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.restCallsCreateDoc.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.restCallsCreateDoc.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.restCallsCreateDoc.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.restCallsCreateDoc.enableEnhancedTelemetry }}
},
"restCallsGetDeltas": {
"maxPerMs": {{ .Values.alfred.throttling.restCallsGetDeltas.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.restCallsGetDeltas.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.restCallsGetDeltas.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.restCallsGetDeltas.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.restCallsGetDeltas.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.restCallsGetDeltas.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.restCallsGetDeltas.enableEnhancedTelemetry }}
},
"socketConnectionsPerTenant": {
"maxPerMs": {{ .Values.alfred.throttling.socketConnectionsPerTenant.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.socketConnectionsPerTenant.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.socketConnectionsPerTenant.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.socketConnectionsPerTenant.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.socketConnectionsPerTenant.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.socketConnectionsPerTenant.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.socketConnectionsPerTenant.enableEnhancedTelemetry }}
},
"socketConnectionsPerCluster": {
"maxPerMs": {{ .Values.alfred.throttling.socketConnectionsPerCluster.maxPerMs }},
"maxBurst": {{ .Values.alfred.throttling.socketConnectionsPerCluster.maxBurst }},
"minCooldownIntervalInMs": {{ .Values.alfred.throttling.socketConnectionsPerCluster.minCooldownIntervalInMs }},
"minThrottleIntervalInMs": {{ .Values.alfred.throttling.socketConnectionsPerCluster.minThrottleIntervalInMs }},
"maxInMemoryCacheSize": {{ .Values.alfred.throttling.socketConnectionsPerCluster.maxInMemoryCacheSize }},
"maxInMemoryCacheAgeInMs": {{ .Values.alfred.throttling.socketConnectionsPerCluster.maxInMemoryCacheAgeInMs }},
"enableEnhancedTelemetry": {{ .Values.alfred.throttling.socketConnectionsPerCluster.enableEnhancedTelemetry }}
},
"submitOps": {
"maxPerMs": {{ .Values.alfred.throttling.submitOps.maxPerMs }},
Expand Down
28 changes: 26 additions & 2 deletions server/routerlicious/kubernetes/routerlicious/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,39 @@ alfred:
numberOfMessagesPerTrace: 100
sessionStickinessDurationMs: 3600000
throttling:
restCalls:
restCallsPerTenant:
maxPerMs: 1000000
maxBurst: 1000000
minCooldownIntervalInMs: 1000000
minThrottleIntervalInMs: 1000000
maxInMemoryCacheSize: 1000
maxInMemoryCacheAgeInMs: 60000
enableEnhancedTelemetry: false
socketConnections:
restCallsCreateDoc:
tianzhu007 marked this conversation as resolved.
Show resolved Hide resolved
maxPerMs: 1000000
maxBurst: 1000000
minCooldownIntervalInMs: 1000000
minThrottleIntervalInMs: 1000000
maxInMemoryCacheSize: 1000
maxInMemoryCacheAgeInMs: 60000
enableEnhancedTelemetry: false
restCallsGetDeltas:
maxPerMs: 1000000
maxBurst: 1000000
minCooldownIntervalInMs: 1000000
minThrottleIntervalInMs: 1000000
maxInMemoryCacheSize: 1000
maxInMemoryCacheAgeInMs: 60000
enableEnhancedTelemetry: false
socketConnectionsPerTenant:
maxPerMs: 1000000
maxBurst: 1000000
minCooldownIntervalInMs: 1000000
minThrottleIntervalInMs: 1000000
maxInMemoryCacheSize: 1000
maxInMemoryCacheAgeInMs: 60000
enableEnhancedTelemetry: false
socketConnectionsPerCluster:
maxPerMs: 1000000
maxBurst: 1000000
minCooldownIntervalInMs: 1000000
Expand Down
Loading