-
Notifications
You must be signed in to change notification settings - Fork 254
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
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
a35d878
do streaming qcow2->raw conversion if we can. also put resource limi…
mhenriks 46dbf28
add simple qcow2 image validation
mhenriks b9559ed
initial unit tests
mhenriks e60775e
test mem/cpu limit code and incorporate pr comments
mhenriks 9f08b40
do dnf clean after installing packages
mhenriks b989bc1
refactor some tests to not call qemu-img binaries
mhenriks d070396
refactor data stream tests to not call qemu-img
mhenriks 6b13c7f
update tests for better coverage
mhenriks 7469b1a
add tests that resource limits are actually enforced
mhenriks f0472ac
rebase and update for dataStream changes
mhenriks 696aec8
move prlimit/exec stuff from util to system
mhenriks d1b8223
use deferred in test functions that override default interfaces
mhenriks 46528ff
rebase and refactoring
mhenriks d9bbc4e
don't attempt to stream-convert http files that require creds
mhenriks e4c54af
Merge branch 'master' into streaming-qcow
aglitke 0705741
Merge branch 'master' into streaming-qcow
awels File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,4 @@ release-announcement | |
.project | ||
.vscode | ||
cluster/.* | ||
.history |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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{} | ||
|
||
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) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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