-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed traffic splitting for endpoints with tag metadata
- Loading branch information
1 parent
7558272
commit 67a27cd
Showing
4 changed files
with
127 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
.../allegro/tech/servicemesh/envoycontrol/trafficsplitting/WeightedClustersTagRoutingTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package pl.allegro.tech.servicemesh.envoycontrol.trafficsplitting | ||
|
|
||
| import TrafficSplitting.serviceName | ||
| import TrafficSplitting.upstreamServiceName | ||
| import callUpstreamServiceRepeatedly | ||
| import org.junit.jupiter.api.Test | ||
| import org.junit.jupiter.api.extension.RegisterExtension | ||
| import pl.allegro.tech.servicemesh.envoycontrol.config.Xds | ||
| import pl.allegro.tech.servicemesh.envoycontrol.config.consul.ConsulMultiClusterExtension | ||
| import pl.allegro.tech.servicemesh.envoycontrol.config.envoy.EnvoyExtension | ||
| import pl.allegro.tech.servicemesh.envoycontrol.config.envoycontrol.EnvoyControlClusteredExtension | ||
| import pl.allegro.tech.servicemesh.envoycontrol.config.service.EchoServiceExtension | ||
| import verifyCallsCountCloseTo | ||
| import verifyCallsCountEquals | ||
| import verifyIsReachable | ||
| import java.time.Duration | ||
|
|
||
| class WeightedClustersTagRoutingTest { | ||
| companion object { | ||
| private const val forceTrafficZone = "dc2" | ||
|
|
||
| private val properties = mapOf( | ||
| "logging.level.pl.allegro.tech.servicemesh.envoycontrol.snapshot.EnvoySnapshotFactory" to "DEBUG", | ||
| "envoy-control.envoy.snapshot.stateSampleDuration" to Duration.ofSeconds(0), | ||
| "envoy-control.sync.enabled" to true, | ||
| "envoy-control.envoy.snapshot.loadBalancing.trafficSplitting.zoneName" to forceTrafficZone, | ||
| "envoy-control.envoy.snapshot.loadBalancing.trafficSplitting.serviceByWeightsProperties.$serviceName.main" to 50, | ||
| "envoy-control.envoy.snapshot.loadBalancing.trafficSplitting.serviceByWeightsProperties.$serviceName.secondary" to 50, | ||
| "envoy-control.envoy.snapshot.routing.service-tags.enabled" to true, | ||
| "envoy-control.envoy.snapshot.routing.service-tags.metadata-key" to "x-service-tag", | ||
| "envoy-control.envoy.snapshot.loadBalancing.priorities.zonePriorities" to mapOf( | ||
| "dc1" to mapOf( | ||
| "dc1" to 0, | ||
| "dc2" to 1 | ||
| ), | ||
| "dc2" to mapOf( | ||
| "dc1" to 1, | ||
| "dc2" to 0, | ||
| ), | ||
| ) | ||
| ) | ||
|
|
||
| private val echo2Config = """ | ||
| node: | ||
| metadata: | ||
| proxy_settings: | ||
| outgoing: | ||
| routingPolicy: | ||
| serviceTagPreference: ["tag"] | ||
| dependencies: | ||
| - service: "service-1" | ||
| """.trimIndent() | ||
|
|
||
| private val config = Xds.copy(configOverride = echo2Config, serviceName = "echo2") | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val consul = ConsulMultiClusterExtension() | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val envoyControl = | ||
| EnvoyControlClusteredExtension(consul.serverFirst, { properties }, listOf(consul)) | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val envoyControl2 = | ||
| EnvoyControlClusteredExtension(consul.serverSecond, { properties }, listOf(consul)) | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val echoServiceDC1 = EchoServiceExtension() | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val upstreamServiceDC1 = EchoServiceExtension() | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val upstreamServiceDC2 = EchoServiceExtension() | ||
|
|
||
| @JvmField | ||
| @RegisterExtension | ||
| val echoEnvoyDC1 = EnvoyExtension(envoyControl, localService = echoServiceDC1, config) | ||
| @JvmField | ||
| @RegisterExtension | ||
| val echoEnvoyDC2 = EnvoyExtension(envoyControl2) | ||
| } | ||
|
|
||
| @Test | ||
| fun `should route traffic according to weights with service tag`() { | ||
| consul.serverFirst.operations.registerServiceWithEnvoyOnEgress(echoEnvoyDC1, name = serviceName) | ||
|
|
||
| consul.serverFirst.operations.registerService(upstreamServiceDC1, name = upstreamServiceName, tags = listOf("tag")) | ||
| echoEnvoyDC1.verifyIsReachable(upstreamServiceDC1, upstreamServiceName) | ||
|
|
||
| consul.serverSecond.operations.registerService(upstreamServiceDC2, name = upstreamServiceName, tags = listOf("tag")) | ||
| echoEnvoyDC1.verifyIsReachable(upstreamServiceDC2, upstreamServiceName) | ||
|
|
||
| echoEnvoyDC1.callUpstreamServiceRepeatedly(upstreamServiceDC1, upstreamServiceDC2, tag = "tag") | ||
| .verifyCallsCountCloseTo(upstreamServiceDC1, 50) | ||
| .verifyCallsCountCloseTo(upstreamServiceDC2, 50) | ||
| } | ||
|
|
||
| @Test | ||
| fun `should not split traffic with service tag if there are no endpoints in zone`() { | ||
| consul.serverFirst.operations.registerServiceWithEnvoyOnEgress(echoEnvoyDC1, name = serviceName) | ||
|
|
||
| consul.serverFirst.operations.registerService(upstreamServiceDC1, name = upstreamServiceName, tags = listOf("tag")) | ||
| echoEnvoyDC1.verifyIsReachable(upstreamServiceDC1, upstreamServiceName) | ||
|
|
||
| consul.serverSecond.operations.registerService(upstreamServiceDC2, name = upstreamServiceName, tags = listOf()) | ||
| echoEnvoyDC2.verifyIsReachable(upstreamServiceDC2, upstreamServiceName) | ||
|
|
||
| echoEnvoyDC1.callUpstreamServiceRepeatedly(upstreamServiceDC1, upstreamServiceDC2, tag = "tag") | ||
| .verifyCallsCountCloseTo(upstreamServiceDC1, 100) | ||
| .verifyCallsCountEquals(upstreamServiceDC2, 0) | ||
| } | ||
| } |