allegro-internal/flex-roadmap#804 Added/removed logs

allegro · Sep 9, 2024 · ac24712 · ac24712
1 parent 51c3967
commit ac24712
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/envoy-control-core/src/main/java/pl/allegro/tech/servicemesh/envoycontrol/SimpleCache.java b/envoy-control-core/src/main/java/pl/allegro/tech/servicemesh/envoycontrol/SimpleCache.java
@@ -72,7 +72,7 @@ public boolean clearSnapshot(T group) {
         // we take a writeLock to prevent watches from being created
         writeLock.lock();
         try {
-
+            LOGGER.debug("Clearing snapshot for group {}", group);
             // If we don't know about this group, do nothing.
             if (statuses.hasStatuses(group)) {
                 LOGGER.warn("tried to clear snapshot for group with existing watches, group={}", group);
@@ -268,7 +268,10 @@ public DeltaWatch createDeltaWatch(
                                                            String version) {
         long watchId = watchCount.incrementAndGet();
         status.setWatch(watchId, watch);
-        watch.setStop(() -> status.removeWatch(watchId));
+        watch.setStop(() -> {
+            status.removeWatch(watchId);
+
+        });
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug("open watch {} for {}[{}] from node {} for version {}",
                 watchId,
@@ -371,12 +374,6 @@ protected void respondWithSpecificOrder(T group,
                     String version = snapshot.version(watch.request().getResourceType(), watch.request().getResourceNamesList());
 
                     if (!watch.request().getVersionInfo().equals(version)) {
-                        if (LOGGER.isDebugEnabled()) {
-                            LOGGER.debug("responding to open watch {}[{}] with new version {}",
-                                id,
-                                String.join(", ", watch.request().getResourceNamesList()),
-                                version);
-                        }
 
                         respond(watch, snapshot, group);
 
@@ -413,12 +410,6 @@ protected void respondWithSpecificOrder(T group,
                     String version = snapshot.version(watch.request().getResourceType(), Collections.emptyList());
 
                     if (!watch.version().equals(version)) {
-                        if (LOGGER.isDebugEnabled()) {
-                            LOGGER.debug("responding to open watch {}[{}] with new version {}",
-                                id,
-                                String.join(", ", watch.trackedResources().keySet()),
-                                version);
-                        }
 
                     List<String> removedResources = snapshotRemovedResources.stream()
                         .filter(s -> watch.trackedResources().get(s) != null)

diff --git a/...ntrol-core/src/test/java/pl/allegro/tech/servicemesh/envoycontrol/v3/SimpleCacheTest.java b/...ntrol-core/src/test/java/pl/allegro/tech/servicemesh/envoycontrol/v3/SimpleCacheTest.java
@@ -47,7 +47,7 @@ public class SimpleCacheTest {
     private static final String VERSION1 = UUID.randomUUID().toString();
     protected static final String VERSION2 = UUID.randomUUID().toString();
 
-    private static final Snapshot SNAPSHOT1 = Snapshot.create(
+    public static final Snapshot SNAPSHOT1 = Snapshot.create(
             ImmutableList.of(Cluster.newBuilder().setName(CLUSTER_NAME).build()),
             ImmutableList.of(ClusterLoadAssignment.getDefaultInstance()),
             ImmutableList.of(Listener.newBuilder().setName(LISTENER_NAME).build()),
@@ -95,7 +95,6 @@ public void invalidNamesListShouldReturnWatcherWithNoResponseInAdsMode() {
                 false,
                 false
             );
-
         assertThatWatchIsOpenWithNoResponses(new WatchAndTracker(watch, responseTracker));
     }
 

diff --git a/.../src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdaterTest.kt b/.../src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotUpdaterTest.kt
@@ -59,6 +59,7 @@ import pl.allegro.tech.servicemesh.envoycontrol.utils.DirectScheduler
 import pl.allegro.tech.servicemesh.envoycontrol.utils.ParallelScheduler
 import pl.allegro.tech.servicemesh.envoycontrol.utils.ParallelizableScheduler
 import pl.allegro.tech.servicemesh.envoycontrol.utils.any
+import pl.allegro.tech.servicemesh.envoycontrol.v3.SimpleCacheTest
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
 import reactor.core.scheduler.Schedulers
@@ -160,6 +161,7 @@ class SnapshotUpdaterTest {
         )
 
         updater.startWithServices("existingService1", "existingService2")
+        println("snapshot1: " + SimpleCacheTest.SNAPSHOT1)
 
         hasSnapshot(cache, allServicesGroup)
             .hasOnlyClustersFor("existingService1", "existingService2")