refactor: VM 할당 개선 #72
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -214,27 +214,31 @@ func InitializeCoreData(configPath string) (structure.ControlContext, error) { | |
| currentCore.IsAlive = false | ||
| return fmt.Errorf("failed to get Disk info for core %s:%d: %w", currentCore.IP, currentCore.Port, err) | ||
| } | ||
| cpuResp, err := coreClient.GetCoreMachineCpuInfo(ctx) | ||
| if err != nil { | ||
| currentCore.IsAlive = false | ||
| return fmt.Errorf("failed to get CPU info for core %s:%d: %w", currentCore.IP, currentCore.Port, err) | ||
| } | ||
| if cpuResp == nil || cpuResp.VcpuStatus == nil { | ||
| currentCore.IsAlive = false | ||
| return fmt.Errorf("core %s:%d returned no vcpu_status in CPU info", currentCore.IP, currentCore.Port) | ||
| } | ||
|
Comment on lines
+217
to
+225
There was a problem hiding this comment. 🩺 Stability & Availability | 🟠 Major | 🏗️ Heavy lift 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
printf '\n== startup/init.go around InitializeCoreData ==\n'
nl -ba startup/init.go | sed -n '140,280p'
printf '\n== client/model/vm.go around VcpuStatus ==\n'
nl -ba client/model/vm.go | sed -n '70,120p'
printf '\n== client/vm.go around GetCoreMachineCpuInfo ==\n'
nl -ba client/vm.go | sed -n '80,140p'
printf '\n== search for errgroup usage in startup/init.go ==\n'
rg -n "errgroup|Wait\(\)|Go\(" startup/init.goRepository: easy-cloud-Knet/KWS_Control Length of output: 254 🏁 Script executed: #!/bin/bash
set -euo pipefail
printf '\n== startup/init.go around InitializeCoreData ==\n'
python3 - <<'PY'
from pathlib import Path
p = Path("startup/init.go")
for i, line in enumerate(p.read_text().splitlines(), 1):
if 140 <= i <= 280:
print(f"{i:4d}\t{line}")
PY
printf '\n== client/model/vm.go around VcpuStatus ==\n'
python3 - <<'PY'
from pathlib import Path
p = Path("client/model/vm.go")
for i, line in enumerate(p.read_text().splitlines(), 1):
if 70 <= i <= 120:
print(f"{i:4d}\t{line}")
PY
printf '\n== client/vm.go around GetCoreMachineCpuInfo ==\n'
python3 - <<'PY'
from pathlib import Path
p = Path("client/vm.go")
for i, line in enumerate(p.read_text().splitlines(), 1):
if 80 <= i <= 140:
print(f"{i:4d}\t{line}")
PY
printf '\n== search for errgroup usage in startup/init.go ==\n'
python3 - <<'PY'
from pathlib import Path
for i, line in enumerate(Path("startup/init.go").read_text().splitlines(), 1):
if "errgroup" in line or "Wait()" in line or ".Go(" in line:
print(f"{i:4d}\t{line}")
PYRepository: easy-cloud-Knet/KWS_Control Length of output: 9872 Single core CPU lookup still aborts startup for all cores. 🤖 Prompt for AI Agents |
||
|
|
||
| totalMemoryMiB := uint32(memResp.Total * 1024) | ||
| totalDiskMiB := uint32(diskResp.Total * 1024) | ||
| freeMemoryMiB := uint32(memResp.Available * 1024) | ||
| freeDiskMiB := uint32(diskResp.Free * 1024) | ||
|
|
||
| totalCpuCores := cpuResp.VcpuStatus.Total | ||
| freeCpuCores := cpuResp.VcpuStatus.Idle | ||
|
|
||
| currentCore.CoreInfoIdx.Cpu = totalCpuCores | ||
| currentCore.CoreInfoIdx.Memory = totalMemoryMiB | ||
| currentCore.CoreInfoIdx.Disk = totalDiskMiB | ||
|
|
||
| currentCore.FreeDisk = freeDiskMiB | ||
| currentCore.FreeMemory = freeMemoryMiB | ||
| currentCore.FreeCPU = freeCpuCores | ||
|
|
||
| return nil | ||
| }) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| package structure | ||
|
|
||
| import ( | ||
| "math" | ||
| "slices" | ||
| "sync" | ||
| ) | ||
|
|
@@ -32,25 +33,81 @@ type HardwareRequirement struct { | |
| Disk uint32 // MiB | ||
| } | ||
|
|
||
| // CoreSelectionResult는 ReserveCore의 반환값으로 진단 정보를 내포 | ||
| type CoreSelectionResult struct { | ||
| Core *Core | ||
| Index int | ||
| AliveCount int | ||
| TotalCores int | ||
| } | ||
|
|
||
| // 분산 기본 가중치 | ||
| // 자원 우선순위 - 메모리 > 디스크 > CPU. | ||
| // 현재는 하드코딩, 나중에 백엔드? 아니면 별도의 관리자 페이지 등에서 데이터페칭하는 방식도 괜찮을 거 같음. | ||
| const ( | ||
| loadWeightMemory = 0.6 | ||
| loadWeightDisk = 0.3 | ||
| loadWeightCPU = 0.1 | ||
| loadBalanceGain = 0.5 // 자원 간 사용률 분산 페널티 강도 | ||
| saturationBase = 1.01 // 비선형 페널티 기준, saturationPenalty()에서 사용. | ||
| ) | ||
|
|
||
| // utilRatio는 VM 배치 후 해당 자원의 사용률 [0,1]을 반환. | ||
| // total==0(정보 없음/불량 코어)이면 1(포화 취급 → 회피). | ||
| func utilRatio(total, free, req uint32) float64 { | ||
| if total == 0 { | ||
| return 1 | ||
| } | ||
| u := float64(total-free+req) / float64(total) // 호출부에서 free>=req, free<=total 보장 | ||
| if u < 0 { | ||
| u = 0 | ||
| } | ||
| if u > 1 { | ||
| u = 1 | ||
| } | ||
| return u | ||
| } | ||
|
|
||
| // 100%에 가까울수록 부하 가중치 급격하게 커짐. | ||
| // U=0→~0.99, 0.8→~4.8, 0.9→~9.1, 0.99→50, 1.0→100. | ||
| func saturationPenalty(u float64) float64 { | ||
| return 1.0 / (saturationBase - u) | ||
| } | ||
|
|
||
| // 코어의 부하 점수 반환 (낮을수록 우수). | ||
| // 가중 포화 페널티(자원 우선순위 + 포화 회피) + 다차원 균형(분산) 페널티로 구성. | ||
| func loadScore(c *Core, req HardwareRequirement) float64 { | ||
| uMem := utilRatio(c.CoreInfoIdx.Memory, c.FreeMemory, req.Memory) | ||
| uDisk := utilRatio(c.CoreInfoIdx.Disk, c.FreeDisk, req.Disk) | ||
| uCPU := utilRatio(c.CoreInfoIdx.Cpu, c.FreeCPU, req.CPU) | ||
|
|
||
| weighted := loadWeightMemory*saturationPenalty(uMem) + | ||
| loadWeightDisk*saturationPenalty(uDisk) + | ||
| loadWeightCPU*saturationPenalty(uCPU) | ||
|
|
||
| // 다차원 균형: 자원 간 사용률 분산이 클수록(고립 자원) 페널티 → stranded resource 방지 | ||
| mean := (uMem + uDisk + uCPU) / 3 | ||
| variance := ((uMem-mean)*(uMem-mean) + | ||
| (uDisk-mean)*(uDisk-mean) + | ||
| (uCPU-mean)*(uCPU-mean)) / 3 | ||
|
|
||
| return weighted + loadBalanceGain*variance | ||
| } | ||
|
|
||
| // ReserveCore는 요청 자원을 만족하는 살아있는 코어 중 loadScore가 가장 낮은 코어를 | ||
| // 선택하고, 같은 Lock 구간 안에서 즉시 Free* 자원을 차감(예약)한다. | ||
| // fit 검사와 차감이 원자적이라 동시 호출 간 오버서브스크립션(Free* 언더플로)이 발생하지 않는다. | ||
| // 네트워크 콜은 호출자가 락 밖에서 수행. 적합한 코어가 없으면 Core==nil(예약 없음)로 반환하며, | ||
| // 진단 로그를 위한 카운트 정보를 함께 제공 | ||
| func (rm *ResourceManager) ReserveCore(req HardwareRequirement) CoreSelectionResult { | ||
| rm.mu.Lock() | ||
| defer rm.mu.Unlock() | ||
|
|
||
| result := CoreSelectionResult{ | ||
| Index: -1, | ||
| TotalCores: len(rm.Cores), | ||
| } | ||
| bestScore := math.MaxFloat64 | ||
|
|
||
| for i := range rm.Cores { | ||
| core := &rm.Cores[i] | ||
|
|
@@ -59,30 +116,36 @@ func (rm *ResourceManager) SelectCore(req HardwareRequirement) CoreSelectionResu | |
| } | ||
| result.AliveCount++ | ||
|
|
||
| if core.FreeMemory < req.Memory || core.FreeCPU < req.CPU || core.FreeDisk < req.Disk { | ||
| continue | ||
| } | ||
| if s := loadScore(core, req); s < bestScore { | ||
| bestScore = s | ||
| result.Core = core | ||
| result.Index = i | ||
| } | ||
| } | ||
|
|
||
| if result.Core != nil { // 락 안에서 즉시 예약 -> TOCTOU 제거 | ||
| result.Core.FreeMemory -= req.Memory | ||
| result.Core.FreeCPU -= req.CPU | ||
| result.Core.FreeDisk -= req.Disk | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| // AttachVMInfo는 예약된 코어에 VM 메타데이터를 등록 (Free* 차감은 ReserveCore에서 이미 완료). | ||
| func (rm *ResourceManager) AttachVMInfo(core *Core, uuid UUID, vm *VMInfo) { | ||
| rm.mu.Lock() | ||
| defer rm.mu.Unlock() | ||
|
|
||
| if core.VMInfoIdx == nil { | ||
| core.VMInfoIdx = make(map[UUID]*VMInfo) | ||
| } | ||
| core.VMInfoIdx[uuid] = vm | ||
| } | ||
|
|
||
| // DeallocateResources는 ReserveCore(예약) + AttachVMInfo(부착)의 역연산 (롤백) | ||
| func (rm *ResourceManager) DeallocateResources(core *Core, uuid UUID, req HardwareRequirement) { | ||
| rm.mu.Lock() | ||
| defer rm.mu.Unlock() | ||
|
|
@@ -93,6 +156,33 @@ func (rm *ResourceManager) DeallocateResources(core *Core, uuid UUID, req Hardwa | |
| core.FreeDisk += req.Disk | ||
| } | ||
|
|
||
| // ReleaseVM은 VM이 점유하던 인메모리 자원을 모두 해제 (Reserve+Attach+Register의 역연산). | ||
| // Free* 복구 + VMInfoIdx/VMLocation/AliveVM 정리를 한 Lock 안에서 원자적으로 수행. | ||
| // 멱등: 이미 해제된 VM에 다시 호출해도 Free*가 이중 복구되지 않는다(VMInfoIdx 존재 여부로 가드). | ||
| // 해제할 자원을 찾았으면 true 반환. | ||
| func (rm *ResourceManager) ReleaseVM(core *Core, uuid UUID) bool { | ||
| rm.mu.Lock() | ||
| defer rm.mu.Unlock() | ||
|
|
||
| released := false | ||
| if vm, ok := core.VMInfoIdx[uuid]; ok { | ||
| core.FreeMemory += vm.Memory | ||
| core.FreeCPU += vm.Cpu | ||
| core.FreeDisk += vm.Disk | ||
| delete(core.VMInfoIdx, uuid) | ||
| released = true | ||
| } | ||
| delete(rm.VMLocation, uuid) | ||
|
|
||
| for i, v := range rm.AliveVM { | ||
| if v.UUID == uuid { | ||
| rm.AliveVM = slices.Delete(rm.AliveVM, i, i+1) | ||
| break | ||
| } | ||
| } | ||
| return released | ||
| } | ||
|
|
||
| // RegisterVM은 VMLocation 맵과 AliveVM 슬라이스에 VM을 동시에 등록 | ||
| func (rm *ResourceManager) RegisterVM(uuid UUID, core *Core, vm *VMInfo) { | ||
| rm.mu.Lock() | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.