From 1fc5bac7fa08161089eb2ac97262f908edf624d7 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Mon, 21 Sep 2020 17:28:50 +0800 Subject: [PATCH] fix host deployer base image --- build/docker/Dockerfile.host-deployer | 2 +- pkg/hostman/diskutils/vddk.go | 1 + pkg/hostman/system_service/system_service.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/docker/Dockerfile.host-deployer b/build/docker/Dockerfile.host-deployer index 12c0553a35..5aa7afa14a 100644 --- a/build/docker/Dockerfile.host-deployer +++ b/build/docker/Dockerfile.host-deployer @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.3 +FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.4 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com" diff --git a/pkg/hostman/diskutils/vddk.go b/pkg/hostman/diskutils/vddk.go index 0ec8bb1df3..141527b30c 100644 --- a/pkg/hostman/diskutils/vddk.go +++ b/pkg/hostman/diskutils/vddk.go @@ -369,6 +369,7 @@ func (vd *VDDKDisk) ConnectBlockDevice() (string, error) { } cmd := NewCommand(execpath(), "-info", "-connect-disk", "-host", vd.Host, "-port", strconv.Itoa(vd.Port), "-user", vd.User, "-password", vd.Passwd, "-mode", "nbd", "-thumb", thumb, "-vm", fmt.Sprintf("moref=%s", vd.VmRef), vd.DiskPath) + log.Infof("command to mount: %s", cmd) env := os.Environ() env = append(env, fmt.Sprintf("LD_LIBRARY_PATH=%s", libdir())) cmd.Env = env diff --git a/pkg/hostman/system_service/system_service.go b/pkg/hostman/system_service/system_service.go index fa0f4f5b2d..d0c9cc7a48 100644 --- a/pkg/hostman/system_service/system_service.go +++ b/pkg/hostman/system_service/system_service.go @@ -98,7 +98,7 @@ func (s *SBaseSystemService) reloadConf(conf, conFile string) (bool, error) { output, _ := procutils.NewRemoteCommandAsFarAsPossible("cat", conFile).Output() oldConf := string(output) if conf != oldConf { - log.Infof("Reload service %s ...", s.name) + log.Debugf("Reload service %s ...", s.name) err := procutils.NewRemoteCommandAsFarAsPossible("rm", "-f", conFile).Run() if err != nil { return false, err