[v6r21] MQ disconnect only producers #4006
Merged
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
Also, refactor a bit of code and fix StompMQConnector test.
Also, simplify some code.
Inside subscribe method stomp.py can raise stomp.exception.NotConnectedException. Handle this exception and pass info as S_ERROR.
chaen
reviewed
Mar 27, 2019
| self.log.error('Failed to subscribe: %s' % e) | ||
| fail = True | ||
| if fail: | ||
| return S_ERROR(EMQUKN, 'Failed to subscribe to at least one broker') |
There was a problem hiding this comment.
why not returning in the exception directly ?
There was a problem hiding this comment.
I am not sure. I think the argument is the following: this for loop is over all connected brokers (we can have more than one for the same connection), we are tryign to close connection to all brokers. If the error occurs for a given broker should we stop immediatly or try to continue anyway with another brokers.
There was a problem hiding this comment.
I did not add this logic, it was like that I just cleaned the code a bit.
It should handle the disconnection case for producers.
In connect() method ReconnectListener was added after start() and connect() method are called. According to internal comments in the stomp.py and also looking at the examples it seems that listener should be added before start() method is called.
wkrzemien
changed the title
|
I don't have specific comments to this PR, so IMHO review OK, but maybe @chaen wants to comment further? |
|
For me it's fine. |
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.
Solving part of the issue presented in #3986
When MQ server is restarted, the clients are blocked. This fix add a dedicated listener ReconnectListener which in case of the disconnection tries to reconnect to the server.
The set of options such as number of trials, interval time etc are provided. To reconnect the internal
stomp.py connect mechanism is used.
The current solution solves the producer case. Separate patch will be prepared for the consumer case. This needs more refactorization due to the handling of subscription after the disconnection occurs.
As byproduct, the handling of stomp.exception.NotConnectedException which could be raised inside StompMQConnector subscribe() method, has been added. The exception is handled and it is transformed into a standard S_ERROR.
Integration tests done:
Scenario I:
1.Server is unavailable
2.Producer wants to connect and send a message. Producer will try to reconnect.
3.Server goes up
4.Producer connects and sends the message
Scenario II:
1.Producer is connected.
2.Server goes down. Producer is trying to reconnect
3.Server goes up. Producer connects and can send message.
BEGINRELEASENOTES
*Resources
FIX: Resources/MessageQueue: add a dedicated listener ReconnectListener
ENDRELEASENOTES