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.

Sign up for GitHub

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

[neighbor advertiser] catch all exceptions while trying https endpoint #757

Merged
merged 2 commits into from
Dec 2, 2019
Merged

[neighbor advertiser] catch all exceptions while trying https endpoint #757

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c48b0a3
[neighbor advertiser] catch all exceptions while trying https endpoint
yxieca Dec 1, 2019
64bd161
raise exception if https returned non-success status code
yxieca Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/neighbor_advertiser
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import sonic_device_util
from swsssdk import ConfigDBConnector
from swsssdk import SonicV2Connector
from netaddr import IPAddress, IPNetwork
from requests.exceptions import ConnectTimeout


#
Expand Down Expand Up @@ -356,8 +355,9 @@ def wrapped_ferret_request(request_slice, https_endpoint, http_endpoint):
json=request_slice,
timeout=DEFAULT_REQUEST_TIMEOUT,
verify=False)
except ConnectTimeout:
log_info("HTTPS Ferret endpoint not found, trying HTTP...")
response.raise_for_status()
except Exception as e:
Copy link
Contributor

Choose a reason for hiding this comment

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

@trzhang-msft @yxieca is it ever possible for the HTTPS endpoint to return a response with an error code (like 401, 403, etc.)? If it is possible, do we want to fail immediately if such an error code is returned or do we want to try the HTTP endpoint?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It might be returning these codes. But I think we should still retry until http endpoint also failed. Bypassing http endpoint would be tossing away a chance to work. IMHO.

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, that's my concern. I think if one of those error codes is returned then there won't be an exception, so this method will just return the response to the post_neighbor_advertiser_slice method. That method returns failure if the response code is not 200. So, if we think one of these error codes might be returned by the HTTPS endpoint we might want to move that error handling logic into this method so that we can retry with the HTTP endpoint if need be.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see what you mean. Good catch!

Copy link

Choose a reason for hiding this comment

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

@daall is correct. HTTP/HTTPs status codes include non-200, like 400 for bad request. But whether non-200 is treated as an exception is fully client side logic, and I'm not sure about the python built-in behavior here.

log_info("Connect HTTPS Ferret endpoint failed (error: {}), trying HTTP...".format(e))
response = requests.post(http_endpoint,
json=request_slice,
timeout=DEFAULT_REQUEST_TIMEOUT)
Expand Down