Delta xds #255

slonka · 2021-05-18T11:35:08Z

This PR enables support for delta-xds (also known as incremental xds) in Envoy.

We're trying to optimize CPU usage in services that use '*' in outgoing dependencies. Based on our tests this should decrease Envoy's CPU usage between 50% and 75%.

Will change JCP snapshot to release when it's merged.

…pe checking fails

…xds-hash-bytes

Automaat · 2021-05-19T07:45:38Z

...-control-core/src/test/java/pl/allegro/tech/servicemesh/envoycontrol/v2/SimpleCacheTest.java

-import io.envoyproxy.controlplane.cache.StatusInfo;
-import io.envoyproxy.controlplane.cache.Watch;
-import io.envoyproxy.controlplane.cache.XdsRequest;
+import io.envoyproxy.controlplane.cache.*;


wildcard imports, here and in few other files

lukidzi · 2021-05-19T08:27:03Z

...ore/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadataValidator.kt

+
+    override fun onV3StreamDeltaRequest(
+        streamId: Long,
+        request: io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest?


Let's make alias for import import io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest? as DeltaDiscoveryRequestV3

I will change all imports to DiscoveryRV2/3.

lukidzi · 2021-05-19T08:29:01Z

.../allegro/tech/servicemesh/envoycontrol/server/callbacks/CompositeDiscoveryServerCallbacks.kt

+
+    override fun onV3StreamDeltaRequest(
+        streamId: Long,
+        request: io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest?


We can do also alias import

…ol into delta-xds-hash-bytes

lukidzi · 2021-05-19T08:34:01Z

...pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/LoggingDiscoveryServerCallbacks.kt

+
+    override fun onV3StreamDeltaRequest(
+        streamId: Long,
+        request: io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest?


lukidzi · 2021-05-19T08:35:12Z

...main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/config/EnvoyControlTestConfiguration.kt

@@ -38,6 +38,13 @@ val AdsCustomHealthCheck = EnvoyConfig("envoy/config_ads_custom_health_check.yam
 val AdsDynamicForwardProxy = EnvoyConfig("envoy/config_ads_dynamic_forward_proxy.yaml")
 val FaultyConfig = EnvoyConfig("envoy/bad_config.yaml")
 val Ads = EnvoyConfig("envoy/config_ads.yaml")
+val DeltaAds = Ads.copy(


Do we have any tests checking in egress works/propagation changes?

We can switch to delta-xds for RandomConfigFile or just everywhere since it's going to be the default. WDYT?

EDIT: Also those things are tested in jcp.

lukidzi · 2021-05-19T08:40:03Z

...re/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt

@@ -217,8 +217,9 @@ class EnvoySnapshotFactory(
        globalSnapshot: GlobalSnapshot,
        egressRouteSpecifications: Collection<RouteSpecification>
    ): List<ClusterLoadAssignment> {
+        val resources = globalSnapshot.endpoints


Why just endpoints are called resources?

Old refactoring, I can call it endpoints.

lukidzi · 2021-05-19T08:42:05Z

...pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt

@@ -59,11 +60,24 @@ class MetricsDiscoveryServerCallbacks(private val meterRegistry: MeterRegistry)
            .increment()
    }

+    override fun onV3StreamDeltaRequest(
+        streamId: Long,
+        request: io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest


# Conflicts: # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt

slonka · 2022-06-02T15:59:13Z

This PR is 1 year old 🎂 🥳

Automaat · 2022-06-03T00:20:11Z

This PR is 1 year old 🎂 🥳

Nice @slonka, and congratulations on such a big and long PR since it is still your pull request :) We are unable to merge this PR before we merge the JCP pull request. Which we are unable to merge because JCP community is almost dead, we are unable to publish JCP package, and because of that we cannot test this changes on any of our environments:(

# Conflicts: # .github/workflows/changelog.yaml # CHANGELOG.md # build.gradle # docs/changelog_symlink.md # docs/configuration.md # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/NodeMetadataValidator.kt # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/CachedProtoResourcesSerializer.kt # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/CompositeDiscoveryServerCallbacks.kt # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/LoggingDiscoveryServerCallbacks.kt # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/callbacks/MetricsDiscoveryServerCallbacks.kt # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/GlobalSnapshot.kt # envoy-control-core/src/test/java/pl/allegro/tech/servicemesh/envoycontrol/v2/SimpleCacheTest.java # envoy-control-core/src/test/java/pl/allegro/tech/servicemesh/envoycontrol/v2/SimpleCacheWithMissingEndpointsTest.java

# Conflicts: # envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoySnapshotFactoryTest.kt

...-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotsVersions.kt

slonka added 15 commits April 7, 2021 11:48

Use jcp version with delta xds

2a94849

Switch JCP version to hash byte array

6927a2c

Convert snapshots to strings to do the comparision, otherwise some ty…

a40d466

…pe checking fails

tmp

3687797

Since using delta mode, cache single messages not whole collections

abb187f

Make ktlint pass

af3089d

Do not call resources on every loop invocation. Enable cache metrics

a716b2e

Hold resuling resources in the global snapshot instead of calling it

587add5

Merge branch 'master' of github.com:allegro/envoy-control into delta-…

e2d3060

…xds-hash-bytes

Revert application-local port

30ef1db

Revert cache metrics

dbac672

Add delta test for metered connections and requests

4c47b8a

Add delta requests in metrics docs

7757905

Reused ADS config instead of making another one

b5aa6bd

Merge branch 'master' into delta-xds-hash-bytes

658090e

slonka changed the title ~~Delta xds hash bytes~~ Delta xds May 18, 2021

Automaat reviewed May 19, 2021

View reviewed changes

lukidzi reviewed May 19, 2021

View reviewed changes

Replace star imports with single line imports

0762443

lukidzi reviewed May 19, 2021

View reviewed changes

Merge branch 'delta-xds-hash-bytes' of github.com:allegro/envoy-contr…

842e3a4

…ol into delta-xds-hash-bytes

lukidzi reviewed May 19, 2021

View reviewed changes

slonka mentioned this pull request May 19, 2021

Delta XDS - improved envoyproxy/java-control-plane#166

Merged

slonka added 4 commits May 19, 2021 11:16

Fix imports

1f93c5e

Use DeltaAds as random

b104288

Add DeltaAds to random config list

93847e7

Fix ktlint

5595897

fix ktLint

2f2cab4

Ferdudas97 temporarily deployed to ci February 14, 2022 08:20 Inactive

Ferdudas97 force-pushed the delta-xds-hash-bytes branch 2 times, most recently from 822ac21 to 3c91147 Compare February 14, 2022 14:58

add delta to ads

3d099e8

Ferdudas97 force-pushed the delta-xds-hash-bytes branch from 3c91147 to 3d099e8 Compare February 15, 2022 08:09

Ferdudas97 added 2 commits February 16, 2022 07:42

change config for DeltaAdsEnvoyControlSmokeTest

2210be2

Merge remote-tracking branch 'origin/master' into delta-xds-hash-bytes

78afb7f

Ferdudas97 temporarily deployed to ci February 18, 2022 11:22 Inactive

change java-control-plane snapshot version

95df981

Ferdudas97 temporarily deployed to ci February 22, 2022 10:04 Inactive

Ferdudas97 temporarily deployed to ci February 23, 2022 14:11 Inactive

changelog added

dd7c6a9

Ferdudas97 temporarily deployed to ci February 28, 2022 12:49 Inactive

Merge remote-tracking branch 'origin/master' into delta-xds-hash-bytes

c8a65bf

# Conflicts: # envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt

Ferdudas97 temporarily deployed to ci March 8, 2022 09:55 Inactive

Ferdudas97 added 3 commits July 25, 2022 15:17

update java-control-plane

898f3d9

revert singe serialization

ccd59a5

Ferdudas97 temporarily deployed to ci July 26, 2022 08:41 Inactive

Ferdudas97 added 3 commits September 9, 2022 09:09

Merge remote-tracking branch 'origin/master' into delta-xds-hash-bytes

be03a6f

# Conflicts: # envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoySnapshotFactoryTest.kt

resolve conflicts

bbbdd01

configure netty event loops

dbfefc9

Ferdudas97 force-pushed the delta-xds-hash-bytes branch from c26b71b to dbfefc9 Compare September 9, 2022 09:45

KSmigielski approved these changes Sep 9, 2022

View reviewed changes

Ferdudas97 reviewed Sep 21, 2022

View reviewed changes

...-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotsVersions.kt Show resolved Hide resolved

gawarz approved these changes Sep 23, 2022

View reviewed changes

Ferdudas97 merged commit 912799d into master Sep 26, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Delta xds #255

Delta xds #255

slonka commented May 18, 2021

Automaat May 19, 2021

lukidzi May 19, 2021

slonka May 19, 2021

lukidzi May 19, 2021

lukidzi May 19, 2021

lukidzi May 19, 2021 •

edited

Loading

slonka May 19, 2021 •

edited

Loading

lukidzi May 19, 2021

slonka May 19, 2021

lukidzi May 19, 2021

slonka commented Jun 2, 2022

Automaat commented Jun 3, 2022 •

edited

Loading

Delta xds #255

Delta xds #255

Conversation

slonka commented May 18, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lukidzi May 19, 2021 • edited Loading

Choose a reason for hiding this comment

slonka May 19, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

slonka commented Jun 2, 2022

Automaat commented Jun 3, 2022 • edited Loading

lukidzi May 19, 2021 •

edited

Loading

slonka May 19, 2021 •

edited

Loading

Automaat commented Jun 3, 2022 •

edited

Loading