Flush changes from 1.0-FTY-master into 1.0-FTY "stable" #24
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
(trying again -- the tests pass for me. I'm not sure why they failed before -- perhaps they have spurious failures?). If the server is restarted and a client is still connected, it may have a few CONNECTION_PING messages queued up on the socket which the server will receive when it is restarted. This is fine at the moment, but in the case where the client does not then send CONNECTION_OPEN, the server will try to deregister the client, and since the address was never set, it segfaults. Maybe this is only something I see because I'm working on a python client and it's not well-behaved or something, but the server shouldn't crash regardless, because even with well-behaved clients this could happen if the client shuts down just after the server is restarted. Solution: cleanly handle the case of the client address being null. Add a regression test. (cherry picked from commit 08aa5ae)
2 places -- zstr_sendx without final NULL argument, and failing to destroy mlm_proto. (cherry picked from commit a774bec)
This will allow us to properly handle pending stream traffic for disconnected clients. (cherry picked from commit b5c0d7d)
The current code inserts a one second delay in the hope that any pending stream traffic will be flushed before the client context is destroyed. Under heavy load, this may not work and we end up with a use-after-free in s_forward_stream_traffic(). Instead of relying on luck, do proper reference counting on the client contexts. (cherry picked from commit ee93e46)
Insert a delay longer than the settle period into the stream engine to trigger the race condition. (cherry picked from commit c4262ce)
Upstream fixes master
Properly handle pending stream traffic after client disconnect
Signed-off-by: Gerald Guillaume <[email protected]>
Problem : invalid command log misses the command itself
Signed-off-by: Jana Rapava <[email protected]>
Signed-off-by: Gerald Guillaume <[email protected]>
backport from upstream : client unique identifier is not shared
Zproject regen before 1.5.0 branching
Signed-off-by: Jana Rapava <[email protected]>
Markup 20181114
Signed-off-by: Gerald Guillaume <[email protected]>
Signed-off-by: Gerald Guillaume <[email protected]>
Signed-off-by: Gerald Guillaume <[email protected]>
Signed-off-by: Gerald Guillaume <[email protected]>
[issues/217] mlm_client_set_consumer broke the stream when pattern is *
…ter" Solution: snprintf() already truncates to "bufsize-1" (and adds \0) if needed, per docs, so we do not need to reduce it more. This change matches current upstream malamute sources. Signed-off-by: Jim Klimov <[email protected]>
Problem: "snprintf_chk output truncated before the last format character"
jana-rapava
previously approved these changes
Apr 29, 2019
aquette
reviewed
May 10, 2019
|
@jimklimov could you plz confirm that this was discussed and tested (originating from) with Dgé? and thus is mergeable with no regression... |
|
The 1fbb2b5 commit (current state of |
|
As for breaking or not, per zeromq#217 discussion the issue was to be addressed in czmq (or further in regex engine) and so not pursued in upstream malamute. I commented my thoughts on that issue now, though. |
|
@jimklimov and @aquette What should we do with this PR ? |
|
I think, if we have not yet seen definitive malamute-related regressions (with this PR state in master images for 2 months now) then it is good to merge. |
|
Ok Thank I will validate and merger prior branching |
perrettecl
approved these changes
Jun 17, 2019
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.
No description provided.