Skip to content

Fix stacktrace in DataSourceRbxCloud if no metadata disk is found. #632

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

Merged
OddBloke merged 2 commits into from
Nov 10, 2020
Merged

Fix stacktrace in DataSourceRbxCloud if no metadata disk is found. #632

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28376d1
Fix stacktrace in DataSourceRbxCloud if no metadata disk is found.
smoser Oct 28, 2020
8dda95c
Merge branch 'master' into fix/rbx-stacktrace-on-notfound
OddBloke Nov 10, 2020
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
16 changes: 10 additions & 6 deletions cloudinit/sources/DataSourceRbxCloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ def gratuitous_arp(items, distro):


def get_md():
rbx_data = None
"""Returns False (not found or error) or a dictionary with metadata."""
Copy link
Copy Markdown
Collaborator

@igalic igalic Oct 28, 2020

Choose a reason for hiding this comment

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

instead of (or in addition to) this long-winded doc-string, we could add a type annotation

Copy link
Copy Markdown
Collaborator

@OddBloke OddBloke Nov 10, 2020

Choose a reason for hiding this comment

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

instead of (or in addition to) this long-winded doc-string, we could add a type annotation

The return type is Union[dict, bool] which we can't express in our still-supporting-3.4 codebase.

devices = set(
util.find_devs_with('LABEL=CLOUDMD') +
util.find_devs_with('LABEL=cloudmd')
)
if not devices:
return False
for device in devices:
try:
rbx_data = util.mount_cb(
Expand All @@ -84,17 +86,17 @@ def get_md():
mtype=['vfat', 'fat', 'msdosfs']
)
if rbx_data:
break
return rbx_data
except OSError as err:
if err.errno != errno.ENOENT:
raise
except util.MountFailedError:
util.logexc(LOG, "Failed to mount %s when looking for user "
"data", device)
if not rbx_data:
util.logexc(LOG, "Failed to load metadata and userdata")
return False
return rbx_data

LOG.debug("Did not find RbxCloud data, searched devices: %s",
",".join(devices))
return False


def generate_network_config(netadps):
Expand Down Expand Up @@ -223,6 +225,8 @@ def _get_data(self):
is used to perform instance configuration.
"""
rbx_data = get_md()
if rbx_data is False:
return False
self.userdata_raw = rbx_data['userdata']
self.metadata = rbx_data['metadata']
self.gratuitous_arp = rbx_data['gratuitous_arp']
Expand Down