fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-21 00:24:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix set storage info bind mount

Browse Source
This commit is contained in:
wanyaoqi
2020-07-09 14:51:56 +08:00
parent 780418219c
commit 0a71acd86b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/hostman/storageman/storage_base.go
View File

@@ -219,6 +219,9 @@ func (s *SBaseStorage) SetStorageInfo(storageId, storageName string, conf jsonut
if dconf, ok := conf.(*jsonutils.JSONDict); ok {
s.StorageConf = dconf
}
if strings.HasPrefix(s.Path, "/opt/cloud") {
return nil
}
if !s.isSetStorageInfo && options.HostOptions.EnableRemoteExecutor {
err := s.bindMountTo(s.Path)
if err == nil {
@@ -237,18 +240,18 @@ func (s *SBaseStorage) bindMountTo(sPath string) error {
}
out, err = procutils.NewCommand("mkdir", "-p", sPath).Output()
if err != nil {
errors.Errorf("mkdir mount path %s failed %s", sPath, out)
return errors.Errorf("mkdir mount path %s failed %s", sPath, out)
}
if procutils.NewCommand("mountpoint", tempPath).Run() != nil {
out, err = procutils.NewRemoteCommandAsFarAsPossible("mount", "--bind", sPath, tempPath).Output()
if err != nil {
errors.Errorf("bind mount to temp path failed %s", out)
return errors.Errorf("bind mount to temp path failed %s", out)
}
}
if procutils.NewCommand("mountpoint", sPath).Run() != nil {
out, err = procutils.NewCommand("mount", "--bind", tempPath, sPath).Output()
if err != nil {
errors.Errorf("bind mount temp path to local image path failed %s", out)
return errors.Errorf("bind mount temp path to local image path failed %s", out)
}
}
return nil