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

Streaming qcow2->raw conversion and resource limits on qemu-img subprocess #317

Merged
merged 16 commits into from
Sep 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ release-announcement
.project
.vscode
cluster/.*
.history
2 changes: 1 addition & 1 deletion hack/build/docker/builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:27
FROM fedora:28

RUN dnf install -y qemu xz gzip git && dnf clean all

Expand Down
2 changes: 1 addition & 1 deletion hack/build/docker/cdi-controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:27
FROM fedora:28

COPY ./cdi-controller /usr/bin/cdi-controller

Expand Down
2 changes: 1 addition & 1 deletion hack/build/docker/cdi-func-test-file-host-init/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM fedora:28

RUN mkdir -p /tmp/shared /tmp/source

RUN yum install -y qemu-img
RUN yum install -y qemu-img qemu-block-curl && dnf clean all

COPY cdi-func-test-file-host-init /usr/bin/

Expand Down
4 changes: 2 additions & 2 deletions hack/build/docker/cdi-importer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM fedora:27
FROM fedora:28

RUN dnf install -y qemu-img
RUN dnf install -y qemu-img qemu-block-curl && dnf clean all

RUN mkdir /data

Expand Down
115 changes: 108 additions & 7 deletions pkg/image/qemu.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,119 @@
/*
Copyright 2018 The CDI Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package image

import (
"os/exec"
"encoding/json"
"fmt"
"net/url"

"github.com/golang/glog"
"github.com/pkg/errors"

"kubevirt.io/containerized-data-importer/pkg/system"
)

// ConvertQcow2ToRaw is a wrapper for qemu-img convert which takes a qcow2 file (specified by src) and converts
// it to a raw image (written to the provided dest file)
func ConvertQcow2ToRaw(src, dest string) error {
cmd := exec.Command("qemu-img", "convert", "-f", "qcow2", "-O", "raw", src, dest)
err := cmd.Run()
const (
networkTimeoutSecs = 3600 //max is 10000
maxMemory = 1 << 30 //value from OpenStack Nova
maxCPUSecs = 30 //value from OpenStack Nova
)

// QEMUOperations defines the interface for executing qemu subprocesses
type QEMUOperations interface {
ConvertQcow2ToRaw(string, string) error
ConvertQcow2ToRawStream(*url.URL, string) error
Validate(string, string) error
}

type qemuOperations struct{}

Copy link
Contributor

Choose a reason for hiding this comment

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

Something to consider - interface implementation can be checked at compile time with

var _ qemuOperations = QEMUOperations

to ensure that changes in the interface definition are reflected by qemuOperations

var qemuExecFunction = system.ExecWithLimits

var qemuLimits = &system.ProcessLimitValues{AddressSpaceLimit: maxMemory, CPUTimeLimit: maxCPUSecs}

var qemuIterface = NewQEMUOperations()

// NewQEMUOperations returns the default implementation of QEMUOperations
func NewQEMUOperations() QEMUOperations {
return &qemuOperations{}
}

func (o *qemuOperations) ConvertQcow2ToRaw(src, dest string) error {
_, err := qemuExecFunction(qemuLimits, "qemu-img", "convert", "-f", "qcow2", "-O", "raw", src, dest)
if err != nil {
return errors.Wrap(err, "could not convert local qcow2 image to raw")
}

return nil
}

func (o *qemuOperations) ConvertQcow2ToRawStream(url *url.URL, dest string) error {
jsonArg := fmt.Sprintf("json: {\"file.driver\": \"%s\", \"file.url\": \"%s\", \"file.timeout\": %d}", url.Scheme, url, networkTimeoutSecs)

_, err := qemuExecFunction(qemuLimits, "qemu-img", "convert", "-f", "qcow2", "-O", "raw", jsonArg, dest)
if err != nil {
return errors.Wrap(err, "could not convert qcow2 image to raw")
return errors.Wrap(err, "could not stream/convert qcow2 image to raw")
}

return nil
}

func (o *qemuOperations) Validate(image, format string) error {
type imageInfo struct {
Format string `json:"format"`
BackingFile string `json:"backing-filename"`
}

output, err := qemuExecFunction(qemuLimits, "qemu-img", "info", "--output=json", image)
if err != nil {
return errors.Wrapf(err, "Error getting info on image %s", image)
}

var info imageInfo
err = json.Unmarshal(output, &info)
if err != nil {
glog.Errorf("Invalid JSON:\n%s\n", string(output))
return errors.Wrapf(err, "Invalid json for image %s", image)
}

if info.Format != format {
return errors.Errorf("Invalid format %s for image %s", info.Format, image)
}

if len(info.BackingFile) > 0 {
return errors.Errorf("Image %s is invalid because it has backing file %s", image, info.BackingFile)
}

return nil
}

// ConvertQcow2ToRaw is a wrapper for qemu-img convert which takes a qcow2 file (specified by src) and converts
// it to a raw image (written to the provided dest file)
func ConvertQcow2ToRaw(src, dest string) error {
return qemuIterface.ConvertQcow2ToRaw(src, dest)
}

// ConvertQcow2ToRawStream converts an http accessible qcow2 image to raw format without locally caching the qcow2 image
func ConvertQcow2ToRawStream(url *url.URL, dest string) error {
return qemuIterface.ConvertQcow2ToRawStream(url, dest)
}

// Validate does basic validation of a qemu image
func Validate(image, format string) error {
return qemuIterface.Validate(image, format)
}
Loading