Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MG-2125 - Unable to enable thing using bootstrap #2132

Merged
merged 4 commits into from
Apr 3, 2024

Conversation

JeffMboya
Copy link
Contributor

@JeffMboya JeffMboya commented Apr 2, 2024

What type of PR is this?

This is a bug fix.

What does this do?

This PR introduces svcerr.ErrConflict into the Connect function. The svcerr.ErrConflict error is triggered when an attempt is made to establish a connection that already exists. In this case, instead of halting the process, the Connect function skips the current iteration and returns HTTP/1.1 200 OK (because the desired end state - a connection existing- is already true for the current channel) and moves on to the next channel. This ensures that all channels in conIDs are processed, and any existing connections do not interrupt the operation.

Which issue(s) does this PR fix/relate to?

Have you included tests for your changes?

No

Did you document any new/modified feature?

No, I have not updated the documentation because the changes are related to error handling and do not introduce new functionality.

@JeffMboya JeffMboya changed the title Add ErrConflict error and handle it in Connect function MG-2125 - Unable to enable thing using bootstrap Apr 2, 2024
@JeffMboya JeffMboya marked this pull request as ready for review April 3, 2024 07:19
@JeffMboya JeffMboya force-pushed the thing-connect-event-consumption branch 4 times, most recently from aaa3f71 to 2e78700 Compare April 3, 2024 10:35
@arvindh123 arvindh123 added this to the S1 milestone Apr 3, 2024
@JeffMboya JeffMboya force-pushed the thing-connect-event-consumption branch from 2e78700 to 61e874c Compare April 3, 2024 11:14
arvindh123
arvindh123 previously approved these changes Apr 3, 2024
@arvindh123 arvindh123 requested a review from dborovcanin April 3, 2024 11:21
felixgateru
felixgateru previously approved these changes Apr 3, 2024
Comment on lines +328 to +330
if errors.Contains(err, svcerr.ErrConflict) {
continue
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment explaining why we are ignoring the conflicts.

@JeffMboya JeffMboya dismissed stale reviews from felixgateru and arvindh123 via 17b5b4e April 3, 2024 12:24
@JeffMboya JeffMboya requested a review from dborovcanin April 3, 2024 12:35
dborovcanin
dborovcanin previously approved these changes Apr 3, 2024
@dborovcanin dborovcanin merged commit 8b930e8 into absmach:main Apr 3, 2024
6 checks passed
nyagamunene pushed a commit to nyagamunene/supermq that referenced this pull request Apr 4, 2024
nyagamunene pushed a commit to nyagamunene/supermq that referenced this pull request Apr 5, 2024
nyagamunene pushed a commit to nyagamunene/supermq that referenced this pull request Apr 7, 2024
JeffMboya added a commit to JeffMboya/supermq that referenced this pull request Apr 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

Bug: Unable to enable thing using bootstrap
4 participants