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

[QEMU] Fixing an unintentional variable shadowing #3798

Merged
merged 3 commits into from
Jan 31, 2018
Merged

[QEMU] Fixing an unintentional variable shadowing #3798

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1015f05
Merge pull request #1 from hashicorp/master
simar7 Jan 26, 2018
1223a57
qemu: Fix unintentional shadowing of monitorPath variable
simar7 Jan 26, 2018
19e1a7f
qemu: Make the driver debugging output more indicative
simar7 Jan 26, 2018
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
3 changes: 2 additions & 1 deletion client/driver/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (*StartResponse
}
// This socket will be used to manage the virtual machine (for example,
// to perform graceful shutdowns)
monitorPath, err := d.getMonitorPath(ctx.TaskDir.Dir)
monitorPath, err = d.getMonitorPath(ctx.TaskDir.Dir)
if err != nil {
d.logger.Printf("[ERR] driver.qemu: could not get qemu monitor path: %s", err)
return nil, err
Expand Down Expand Up @@ -464,6 +464,7 @@ func (h *qemuHandle) Kill() error {
// If Nomad did not send a graceful shutdown signal, issue an interrupt to
// the qemu process as a last resort
if gracefulShutdownSent == false {
h.logger.Printf("[DEBUG] driver.qemu: graceful shutdown is not enabled, sending an interrupt signal to QEMU")
Copy link
Member

Choose a reason for hiding this comment

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

It's nice to include something to indicate what task log lines refer to. Perhaps something like:

[DEBUG] driver.qemu: graceful shutdown disabled, sending interrupt signal to pid %d", h.userPid

if err := h.executor.ShutDown(); err != nil {
if h.pluginClient.Exited() {
return nil
Expand Down