Skip to content

Conversation

@cbouchar
Copy link
Contributor

@cbouchar cbouchar commented Jan 29, 2021

When a guest recipe console log was being processed during beaker
upgrade, an exception was raised with call to startswith in
labcontroller.utils.get_console_files. In the case of guest recipes,
it is possible for the system name to be None. This change recognizes
this case, reports this occurred, and discontinues getting console
files for this guest recipes. Since exception is not raised, other recipes
will continue to get their console files.

Closes: BKR-5038

@cbouchar cbouchar self-assigned this Jan 29, 2021
@StykMartin
Copy link
Contributor

/test

Copy link
Member

@renanrodrigo renanrodrigo left a comment

Choose a reason for hiding this comment

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

NIT2 - the commit message could be more descriptive than 'replace hotfix', making explicit what the change is about

Copy link
Contributor

@StykMartin StykMartin left a comment

Choose a reason for hiding this comment

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

  • Stickler CI is complaining.
  • I don't understand what the commit message is trying to say. Would be nice to reword it.

'system': None}, self.watchdog)
self.assert_(not self.monitor_guest.console_watch.logfiles)

with patch.object(Watchdog, 'spawn_monitor', side_effect=TypeError('Boom!')):
Copy link
Contributor

@StykMartin StykMartin Feb 1, 2021

Choose a reason for hiding this comment

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

You patching it here, I would expect to see some verification afterward.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The verification was that it didn't crash and the log entry I wrote didn't crash. Code has since been removed.

@cbouchar cbouchar changed the title Fix: Replace HOTFIX for multiconsole logs Fix: multiconsole logs raises exception on guest recipe Feb 1, 2021
@cbouchar cbouchar changed the title Fix: multiconsole logs raises exception on guest recipe Fix: multiconsole logs fails on guest recipe Feb 1, 2021
@cbouchar cbouchar changed the title Fix: multiconsole logs fails on guest recipe Fix: Get console logs raises Exception Feb 1, 2021
@cbouchar cbouchar force-pushed the BKR5038-consolelog-hotfix-repl branch 2 times, most recently from dd09385 to c4f3fb7 Compare February 1, 2021 19:30
Copy link
Contributor Author

@cbouchar cbouchar left a comment

Choose a reason for hiding this comment

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

Requested changes have been made.

@StykMartin
Copy link
Contributor

Requested changes have been made.

Hi Carol,

You should fix the commit message as I mentioned and @renanrodrigo. Other than that it looks OK

When a guest recipe console log was being processed during beaker
upgrade, an exception was raised with call to startswith in
labcontroller.utils.get_console_files. In the case of guest recipes,
it is possible for the system name to be None. This change recognizes
this case, reports this occurred, and discontinues getting console
files for this guest recipes. Since exception is not raised, other recipes
will continue to get their console files.

Closes: BKR-5038
@cbouchar cbouchar force-pushed the BKR5038-consolelog-hotfix-repl branch from c4f3fb7 to 4f24136 Compare February 2, 2021 15:24
@cbouchar
Copy link
Contributor Author

cbouchar commented Feb 2, 2021

Requested changes have been made.

Hi Carol,

You should fix the commit message as I mentioned and @renanrodrigo. Other than that it looks OK

I thought I had updated the message. Please check again.

@StykMartin
Copy link
Contributor

Requested changes have been made.

Hi Carol,

You should fix the commit message as I mentioned and @renanrodrigo. Other than that it looks OK

I thought I had updated the message. Please check again.

Cache is trolling me apparently. Sorry about that.

@cbouchar cbouchar merged commit 5cd6c38 into beaker-project:develop Feb 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants