channeld: remove dead HTLCs from htable and free them (eventually) #5882
Conversation
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
The channel->htlcs map was exhibiting unbounded growth, as elements were never removed from it. This was causing lightning_channeld processes to consume ever-increasing amounts of memory, and iterating over the map was causing ever-increasing CPU utilization. There were FIXME comments suggesting that the intention was to remove HTLCs from the map upon their deaths. This commit implements that intention. Changelog-Fixed: channeld no longer retains dead HTLCs in memory.
instagibbs
reviewed
Jan 9, 2023
| @@ -71,7 +71,6 @@ static inline struct htlc *htlc_get(struct htlc_map *htlcs, u64 id, enum side ow | |||
| return NULL; | |||
| } | |||
|
|
|||
| /* FIXME: Move these out of the hash! */ | |||
There was a problem hiding this comment.
Maybe drop a short comment on what dead precisely means for safety-of-deletion?
There was a problem hiding this comment.
Maybe whoever named the function originally should write the comment. I almost deleted the function entirely since it's an implementation detail that doesn't belong in the public interface (i.e., the header file), but I left it there to minimize the diff.
instagibbs
approved these changes
Jan 19, 2023
|
|
||
| memset(&r, 0, sizeof(r)); | ||
| sha256(&rhash, &r, sizeof(r)); | ||
|
|
||
| assert(channel_add_htlc(channel, sender, 1337, msatoshi, 900, &rhash, | ||
| dummy_routing, NULL, NULL, NULL) | ||
| == CHANNEL_ERR_ADD_OK); | ||
| htlc = channel_get_htlc(channel, sender, 1337); |
There was a problem hiding this comment.
please make 1337 a variable and use it everywhere
| @@ -318,9 +319,9 @@ static void send_and_fulfill_htlc(struct channel *channel, | |||
| assert(ret); | |||
There was a problem hiding this comment.
Suggested change
| assert(ret); | |
| assert(ret); | |
| assert(channel_get_htlc(channel, sender, 1337)); |
| @@ -297,8 +299,7 @@ static void send_and_fulfill_htlc(struct channel *channel, | |||
| assert(ret); | |||
There was a problem hiding this comment.
Suggested change
| assert(ret); | |
| assert(ret); | |
| assert(channel_get_htlc(channel, sender, 1337)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
channel->htlcsmap was exhibiting unbounded growth, as elements were never removed from it. This was causinglightning_channeldprocesses to consume ever-increasing amounts of memory, and iterating over the map was causing ever-increasing CPU utilization. There wereFIXMEcomments suggesting that the intention was to remove HTLCs from the map upon their deaths. This PR implements that intention.