summarylogtreecommitdiffstats
path: root/downgrade-duplicate-peer-error-to-dvlog.patch
blob: 62d553e08c3f0505328325ff18f2c6635c0cc9b0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From 00604ca8ed6d669fb6cb3ae8bacd6028d5ef10ac Mon Sep 17 00:00:00 2001
From: Stephen Roettger <sroettger@google.com>
Date: Thu, 20 Jan 2022 10:04:04 +0000
Subject: [PATCH] Downgrade duplicate peer error to dvlog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Downgrading since this case can happen in non-error situations. There can be
duplicate introductions in flight in which case we simply drop the second one.

Change-Id: I2c51b177913ccd9634e9bb6343d468101d9735ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3398794
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Stephen Röttger <sroettger@google.com>
Cr-Commit-Position: refs/heads/main@{#961389}
---
 mojo/core/node_controller.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mojo/core/node_controller.cc b/mojo/core/node_controller.cc
index 7cde7719687..81712676733 100644
--- a/mojo/core/node_controller.cc
+++ b/mojo/core/node_controller.cc
@@ -594,7 +594,7 @@ void NodeController::AddPeer(const ports::NodeName& name,
     }
 
     if (dropped_peers_.Contains(name)) {
-      LOG(ERROR) << "Trying to re-add dropped peer " << name;
+      DVLOG(1) << "Trying to re-add dropped peer " << name;
       return;
     }