From 2b9820a167eadeb6b1ebf6e50de4d6a6629ade1c Mon Sep 17 00:00:00 2001
From: gary rong <garyrong0905@gmail.com>
Date: Tue, 12 May 2020 16:02:15 +0800
Subject: [PATCH] les: drop the message if the entire p2p connection is stuck
(#21033)
* les: drop the message if the entire p2p connection is stuck
* les: fix lint
# Conflicts:
# les/peer.go
# les/server_handler.go
---
to-merge.txt | 98 +---------------------------------------------------
1 file changed, 1 insertion(+), 97 deletions(-)
diff --git a/to-merge.txt b/to-merge.txt
index 7a9dd28c78..e45b30eeea 100644
--- a/to-merge.txt
+++ b/to-merge.txt
@@ -105,100 +105,4 @@ Date: Tue May 12 16:02:15 2020 +0800
* les: drop the message if the entire p2p connection is stuck
- * les: fix lint
-
-commit 7ace5a3a8b2a4591063096232a3a1264e3faf8fe
-Author: Martin Holst Swende <martin@swende.se>
-Date: Tue May 12 07:46:10 2020 +0200
-
- core: fixup blockchain tests (#21062)
-
- core: fixup blockchain tests
-
-commit 40859a2441a91b120ce33b5f5ede95c8f7e7fd97
-Merge: 453523005 126ac94f3
-Author: Péter Szilágyi <peterke@gmail.com>
-Date: Mon May 11 19:05:47 2020 +0300
-
- Merge pull request #21061 from karalabe/cht-1.9.14
-
- params: bump CHTs for the v1.9.14 release
-
-commit 45352300592cf68feb64d67aefa607eec2c9a1de
-Author: Martin Holst Swende <martin@swende.se>
-Date: Mon May 11 17:58:43 2020 +0200
-
- cmd, core, eth: background transaction indexing (#20302)
-
- * cmd, core, eth: init tx lookup in background
-
- * core/rawdb: tiny log fixes to make it clearer what's happening
-
- * core, eth: fix rebase errors
-
- * core/rawdb: make reindexing less generic, but more optimal
-
- * rlp: implement rlp list iterator
-
- * core/rawdb: new implementation of tx indexing/unindex using generic tx iterator and hashing rlp-data
-
- * core/rawdb, cmd/utils: fix review concerns
-
- * cmd/utils: fix merge issue
-
- * core/rawdb: add some log formatting polishes
-
- Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
- Co-authored-by: Péter Szilágyi <peterke@gmail.com>
-
-commit 126ac94f369e56a4da879aaa8914afef6a8a64b2
-Author: Péter Szilágyi <peterke@gmail.com>
-Date: Mon May 11 18:56:09 2020 +0300
-
- params: bump CHTs for the v1.9.14 release
-
-commit 6f54ae24cdeacd14519eac8b127e0e1fea03d66a
-Author: Felix Lange <fjl@twurst.com>
-Date: Mon May 11 17:11:17 2020 +0200
-
- p2p: add 0 port check in dialer (#21008)
-
- * p2p: add low port check in dialer
-
- We already have a check like this for UDP ports, add a similar one in
- the dialer. This prevents dials to port zero and it's also an extra
- layer of protection against spamming HTTP servers.
-
- * p2p/discover: use errLowPort in v4 code
-
- * p2p: change port check
-
- * p2p: add comment
-
- * p2p/simulations/adapters: ensure assigned port is in all node records
-
-commit 069a7e1f8abe4e06f7aba7bb1dbd5a49ce242a5a
-Author: AusIV <git@ausiv.com>
-Date: Mon May 11 07:11:17 2020 -0500
-
- core/rawdb: stop freezer process as part of freezer.Close() (#21010)
-
- * core/rawdb: Stop freezer process as part of freezer.Close()
-
- When you call db.Close(), it was closing the leveldb database first,
- then closing the freezer, but never stopping the freezer process.
- This could cause the freezer to attempt to write to leveldb after
- leveldb had been closed, leading to a crash with a non-zero exit code.
-
- This change adds a quit channel to the freezer, and freezer.Close()
- will not return until the freezer process has stopped.
-
- Additionally, when you call freezerdb.Close(), it will close the
- AncientStore before closing leveldb, to ensure that the freezer goroutine
- will be stopped before leveldb is closed.
-
- * core/rawdb: Fix formatting for golint
-
- * core/rawdb: Use backoff flag to avoid repeating select
-
- * core/rawdb: Include accidentally omitted backoff
\ No newline at end of file
+ * les: fix lint
\ No newline at end of file
--
GitLab