mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-18 23:39:30 +00:00
runtime: Fix logging for remote hypervisor
Need to use hvLogger Fixes: #11286 Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
This commit is contained in:
@@ -18,7 +18,6 @@ import (
|
|||||||
hypannotations "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/annotations"
|
hypannotations "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/annotations"
|
||||||
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
|
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const defaultMinTimeout = 60
|
const defaultMinTimeout = 60
|
||||||
@@ -128,7 +127,7 @@ func (rh *remoteHypervisor) StartVM(ctx context.Context, timeout int) error {
|
|||||||
ctx2, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
|
ctx2, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
logrus.Printf("calling remote hypervisor StartVM (timeout: %d)", timeout)
|
hvLogger.Infof("calling remote hypervisor StartVM (timeout: %d)", timeout)
|
||||||
|
|
||||||
if _, err := s.client.StartVM(ctx2, req); err != nil {
|
if _, err := s.client.StartVM(ctx2, req); err != nil {
|
||||||
return fmt.Errorf("remote hypervisor call failed: %w", err)
|
return fmt.Errorf("remote hypervisor call failed: %w", err)
|
||||||
@@ -179,11 +178,11 @@ func notImplemented(name string) error {
|
|||||||
|
|
||||||
err := errors.Errorf("%s: not implemented", name)
|
err := errors.Errorf("%s: not implemented", name)
|
||||||
|
|
||||||
logrus.Errorf(err.Error())
|
hvLogger.Errorf(err.Error())
|
||||||
|
|
||||||
if tracer, ok := err.(interface{ StackTrace() errors.StackTrace }); ok {
|
if tracer, ok := err.(interface{ StackTrace() errors.StackTrace }); ok {
|
||||||
for _, f := range tracer.StackTrace() {
|
for _, f := range tracer.StackTrace() {
|
||||||
logrus.Errorf("%+s:%d\n", f, f)
|
hvLogger.Errorf("%+s:%d\n", f, f)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,7 +203,7 @@ func (rh *remoteHypervisor) ResumeVM(ctx context.Context) error {
|
|||||||
|
|
||||||
func (rh *remoteHypervisor) AddDevice(ctx context.Context, devInfo interface{}, devType DeviceType) error {
|
func (rh *remoteHypervisor) AddDevice(ctx context.Context, devInfo interface{}, devType DeviceType) error {
|
||||||
// TODO should we return notImplemented("AddDevice"), rather than nil and ignoring it?
|
// TODO should we return notImplemented("AddDevice"), rather than nil and ignoring it?
|
||||||
logrus.Printf("addDevice: deviceType=%v devInfo=%#v", devType, devInfo)
|
hvLogger.Infof("addDevice: deviceType=%v devInfo=%#v", devType, devInfo)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,7 +221,7 @@ func (rh *remoteHypervisor) ResizeMemory(ctx context.Context, memMB uint32, memo
|
|||||||
|
|
||||||
func (rh *remoteHypervisor) GetTotalMemoryMB(ctx context.Context) uint32 {
|
func (rh *remoteHypervisor) GetTotalMemoryMB(ctx context.Context) uint32 {
|
||||||
//The remote hypervisor uses the peer pod config to determine the memory of the VM, so we need to use static resource management
|
//The remote hypervisor uses the peer pod config to determine the memory of the VM, so we need to use static resource management
|
||||||
logrus.Error("GetTotalMemoryMB - remote hypervisor cannot update resources")
|
hvLogger.Error("GetTotalMemoryMB - remote hypervisor cannot update resources")
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user