Skip to content

Commit 943e4e6

Browse files
virt invokes RPC to resize console window (#288)
* update libyavirt dep * virt invokes ResizeConsoleWindow RPC * drop empty exec msg
1 parent fc2cd13 commit 943e4e6

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

cluster/calcium/helper.go

+3
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ func rawProcessVirtualizationInStream(
156156
defer inStream.Close()
157157

158158
for cmd := range inCh {
159+
if len(cmd) == 0 {
160+
continue
161+
}
159162
if f, ok := specialPrefixCallback[string(cmd[:1])]; ok {
160163
f(cmd[1:])
161164
continue

engine/virt/virt.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,7 @@ func (v *Virt) ExecExitCode(ctx context.Context, execID string) (code int, err e
105105

106106
// ExecResize resize exec tty
107107
func (v *Virt) ExecResize(ctx context.Context, execID string, height, width uint) (err error) {
108-
resizeCmd := fmt.Sprintf("yaexec resize -r %d -c %d", height, width)
109-
msg, err := v.client.ExecuteGuest(ctx, execID, strings.Split(resizeCmd, " "))
110-
log.Debugf("[ExecResize] resize got response: %v", msg)
111-
return err
108+
return v.client.ResizeConsoleWindow(ctx, execID, height, width)
112109
}
113110

114111
// NetworkConnect connects to a network.

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/opencontainers/runc v0.1.1 // indirect
2929
github.com/patrickmn/go-cache v2.1.0+incompatible
3030
github.com/pkg/errors v0.9.1
31-
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01
31+
github.com/projecteru2/libyavirt v0.0.0-20201130082506-1a1e5c346f47
3232
github.com/prometheus/client_golang v1.7.1
3333
github.com/sanity-io/litter v1.3.0
3434
github.com/sethvargo/go-signalcontext v0.1.0

go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
222222
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
223223
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01 h1:jwdXaoOwm2yG3GdFREt1qMWL9RrumHvcqQpgYieNM3s=
224224
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
225+
github.com/projecteru2/libyavirt v0.0.0-20201130080123-f664f4852f70 h1:wbULh6iiJ0WKxLYfEHdbIMSdBIxjQRFkR7e8eAh2fts=
226+
github.com/projecteru2/libyavirt v0.0.0-20201130080123-f664f4852f70/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
227+
github.com/projecteru2/libyavirt v0.0.0-20201130082506-1a1e5c346f47 h1:UO7w6jA6QdSl1dxjje/SqomL38diAGymQ4SX6alQ6dA=
228+
github.com/projecteru2/libyavirt v0.0.0-20201130082506-1a1e5c346f47/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
225229
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
226230
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
227231
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

0 commit comments

Comments
 (0)