opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5238 from wanyaoqi/bugfix/wyq/fix-host-init-set-reserve-memory

Browse Source 
miscfix : host init set reserve memory
This commit is contained in:
yunion-ci-robot
2020-02-26 23:00:15 +08:00
committed by GitHub
parent 86fd8959ca 4eceefdb04
commit 562f6b6e8a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guestnetworks.go
+5 -3
View File
@@ -372,9 +372,11 @@ func (self *SGuestnetwork) getJsonDescAtHost(host *SHost) jsonutils.JSONObject {
func (self *SGuestnetwork) getJsonDescHostwire(network *SNetwork, hostwire *SHostwire) *jsonutils.JSONDict {
desc := self.getJsonDesc(network)
desc.Add(jsonutils.NewString(hostwire.Bridge), "bridge")
desc.Add(jsonutils.NewString(hostwire.WireId), "wire_id")
desc.Add(jsonutils.NewString(hostwire.Interface), "interface")
if hostwire != nil {
desc.Add(jsonutils.NewString(hostwire.Bridge), "bridge")
desc.Add(jsonutils.NewString(hostwire.WireId), "wire_id")
desc.Add(jsonutils.NewString(hostwire.Interface), "interface")
}
return desc
}
pkg/hostman/hostinfo/hostinfo.go
+3
View File
@@ -856,6 +856,9 @@ func (h *SHostInfo) updateHostRecord(hostId string) {
h.onFail(err)
}
content.Set("mem_size", jsonutils.NewInt(int64(memTotal)))
if len(hostId) == 0 {
content.Set("mem_reserved", jsonutils.NewInt(int64(h.getReservedMem())))
}
content.Set("storage_driver", jsonutils.NewString(api.DISK_DRIVER_LINUX))
content.Set("storage_type", jsonutils.NewString(h.sysinfo.StorageType))
content.Set("storage_size", jsonutils.NewInt(int64(storageman.GetManager().GetTotalCapacity())))
pkg/hostman/storageman/storage_rbd.go
+4
View File
@@ -59,6 +59,10 @@ type SRbdStorage struct {
func NewRBDStorage(manager *SStorageManager, path string) *SRbdStorage {
var ret = new(SRbdStorage)
ret.SBaseStorage = *NewBaseStorage(manager, path)
err := procutils.NewRemoteCommandAsFarAsPossible("mkdir", "-p", "/etc/ceph").Run()
if err != nil {
log.Errorf("Failed to mkdir /etc/ceph: %s", err)
}
return ret
}