Skip to content

Commit f4113e2

Browse files
CMGSCMGS
committed
use latest yavirt lib, revise vol defines
1 parent 03348e6 commit f4113e2

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

‎engine/virt/helper.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,25 @@ import (
88

99
"github.com/cockroachdb/errors"
1010
coretypes "github.com/projecteru2/core/types"
11+
virttypes "github.com/projecteru2/libyavirt/types"
1112
)
1213

1314
const sep = "@"
1415

15-
func (v *Virt) parseVolumes(volumes []string) ([]string, error) {
16-
vols := []string{}
17-
18-
// format `/source:/dir0:rw:1G:1000:1000:10M:10M`
19-
for _, bind := range volumes {
16+
func (v *Virt) parseVolumes(volumes []string) ([]virttypes.Volume, error) {
17+
vols := make([]virttypes.Volume, len(volumes))
18+
// format `/source:/dir0:rw:1024:1000:1000:10M:10M`
19+
for i, bind := range volumes {
2020
parts := strings.Split(bind, ":")
2121
if len(parts) != 4 && len(parts) != 8 {
2222
return nil, errors.Wrapf(coretypes.ErrInvalidVolumeBind, "bind: %s", bind)
2323
}
2424

2525
src := parts[0]
26-
dest := filepath.Join("/", parts[1])
26+
dest := parts[1]
27+
if !strings.HasPrefix(dest, "/") {
28+
dest = filepath.Join("/", parts[1])
29+
}
2730

2831
mnt := dest
2932
// the src part has been translated to real host directory by eru-sched or kept it to empty.
@@ -38,10 +41,15 @@ func (v *Virt) parseVolumes(volumes []string) ([]string, error) {
3841

3942
ioConstraints := ""
4043
if len(parts) > 4 {
41-
ioConstraints = fmt.Sprintf(":%s", strings.Join(parts[4:], ":"))
44+
ioConstraints = strings.Join(parts[4:], ":")
4245
}
4346

44-
vols = append(vols, fmt.Sprintf("%s:%d%s", mnt, capacity, ioConstraints))
47+
volume := virttypes.Volume{
48+
Mount: mnt,
49+
Capacity: capacity,
50+
IO: ioConstraints,
51+
}
52+
vols[i] = volume
4553
}
4654

4755
return vols, nil

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/alphadose/haxmap v1.2.0
99
github.com/cenkalti/backoff/v4 v4.2.1
1010
github.com/cockroachdb/errors v1.9.1
11-
github.com/docker/distribution v2.8.1+incompatible
11+
github.com/docker/distribution v2.8.2+incompatible
1212
github.com/docker/docker v23.0.4+incompatible
1313
github.com/docker/go-connections v0.4.0
1414
github.com/docker/go-units v0.5.0
@@ -23,7 +23,7 @@ require (
2323
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
2424
github.com/panjf2000/ants/v2 v2.7.3
2525
github.com/patrickmn/go-cache v2.1.0+incompatible
26-
github.com/projecteru2/libyavirt v0.0.0-20230511035158-650f74b8b68c
26+
github.com/projecteru2/libyavirt v0.0.0-20230512040131-dd14c75027c3
2727
github.com/prometheus/client_golang v1.15.0
2828
github.com/rs/zerolog v1.29.1
2929
github.com/sanity-io/litter v1.5.5
@@ -39,7 +39,7 @@ require (
3939
golang.org/x/crypto v0.8.0
4040
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
4141
golang.org/x/net v0.10.0
42-
google.golang.org/grpc v1.54.0
42+
google.golang.org/grpc v1.54.1
4343
google.golang.org/protobuf v1.30.0
4444
)
4545

@@ -54,7 +54,7 @@ require (
5454
github.com/benbjohnson/clock v1.3.3 // indirect
5555
github.com/beorn7/perks v1.0.1 // indirect
5656
github.com/cespare/xxhash/v2 v2.2.0 // indirect
57-
github.com/cloudflare/circl v1.3.2 // indirect
57+
github.com/cloudflare/circl v1.3.3 // indirect
5858
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
5959
github.com/cockroachdb/redact v1.1.3 // indirect
6060
github.com/containerd/containerd v1.7.0 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
9696
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
9797
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
9898
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
99-
github.com/cloudflare/circl v1.3.2 h1:VWp8dY3yH69fdM7lM6A1+NhhVoDu9vqK0jOgmkQHFWk=
100-
github.com/cloudflare/circl v1.3.2/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw=
99+
github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
100+
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
101101
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
102102
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
103103
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
@@ -138,8 +138,8 @@ github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6ps
138138
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
139139
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
140140
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
141-
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
142-
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
141+
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
142+
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
143143
github.com/docker/docker v23.0.4+incompatible h1:Kd3Bh9V/rO+XpTP/BLqM+gx8z7+Yb0AA2Ibj+nNo4ek=
144144
github.com/docker/docker v23.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
145145
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -459,8 +459,8 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
459459
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
460460
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
461461
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
462-
github.com/projecteru2/libyavirt v0.0.0-20230511035158-650f74b8b68c h1:R88Kqp6sKjw1PebzKxfCqvunPtIww9ALhCjRCteQRrU=
463-
github.com/projecteru2/libyavirt v0.0.0-20230511035158-650f74b8b68c/go.mod h1:+D8ICExygXdwkRG7PbZTy7ITcUL+AAM/aGGaQMNDI84=
462+
github.com/projecteru2/libyavirt v0.0.0-20230512040131-dd14c75027c3 h1:Ac8sKZ+sVujRYssY27cFBOo+SVyvKhjJXpWpNKFO9c0=
463+
github.com/projecteru2/libyavirt v0.0.0-20230512040131-dd14c75027c3/go.mod h1:N41KaKmqbailweGs4x/mt2H0O0Y7MizObZQ+igLdzpw=
464464
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
465465
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
466466
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
@@ -993,8 +993,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
993993
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
994994
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
995995
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
996-
google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
997-
google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
996+
google.golang.org/grpc v1.54.1 h1:zQZQNqQZU9cHv2vLdDhB2mFeDZ2hGpgYM1A0PKjFsSM=
997+
google.golang.org/grpc v1.54.1/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
998998
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
999999
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
10001000
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

0 commit comments

Comments
 (0)