Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions protocol/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,49 @@ func ExecutorMatchesPlacementRequirements(executor ExecutorRef, req PlacementReq
return true
}

type ExecutorCapabilities struct {
Executors []ExecutorRef `json:"executors,omitempty"`
ExecutionTiers []ExecutionSecurityTier `json:"execution_tiers,omitempty"`
}

func ResourceLimitsRequireResourceConstrainedExecutor(limits ResourceLimits) bool {
return limits.CPUPercent > 0 || limits.MemoryBytes > 0
}

func ExecutorCapabilitiesHaveResourceConstrainedMatch(req PlacementRequirements, caps ExecutorCapabilities) bool {
if len(caps.Executors) == 0 {
for _, tier := range caps.ExecutionTiers {
if ExecutionTierSupportsResourceLimits(tier) {
return true
}
}
return false
}
for _, executor := range caps.Executors {
if !ExecutorMatchesPlacementRequirements(executor, req) {
continue
}
if ExecutionTierSupportsResourceLimits(executor.ExecutionSecurityTier) {
return true
}
}
return false
}

func ExecutionTierSupportsResourceLimits(tier ExecutionSecurityTier) bool {
switch tier {
case ExecutionHardenedContainer,
ExecutionSandboxedContainer,
ExecutionMicroVM,
ExecutionConfidentialCPU,
ExecutionConfidentialGPU,
ExecutionWASMCapability:
return true
default:
return false
}
}

type ResourceUsage struct {
CPUMillis int64 `json:"cpu_millis,omitempty"`
GPUMillis int64 `json:"gpu_millis,omitempty"`
Expand Down
44 changes: 44 additions & 0 deletions protocol/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,50 @@ func TestExecutorMatchesPlacementRequirements(t *testing.T) {
}
}

func TestExecutorCapabilitiesHaveResourceConstrainedMatch(t *testing.T) {
req := protocol.PlacementRequirements{
ExecutorProvider: "sandboxed-command",
ExecutionSecurityTier: protocol.ExecutionSandboxedContainer,
ProofTier: protocol.ProofArtifactHash,
}

if !protocol.ResourceLimitsRequireResourceConstrainedExecutor(protocol.ResourceLimits{CPUPercent: 50}) {
t.Fatal("cpu_percent limits should require resource-constrained executor")
}
if !protocol.ResourceLimitsRequireResourceConstrainedExecutor(protocol.ResourceLimits{MemoryBytes: 128 << 20}) {
t.Fatal("memory_bytes limits should require resource-constrained executor")
}
if protocol.ResourceLimitsRequireResourceConstrainedExecutor(protocol.ResourceLimits{WorkspaceBytes: 1 << 30}) {
t.Fatal("workspace-only limits should not require resource-constrained executor")
}

if protocol.ExecutorCapabilitiesHaveResourceConstrainedMatch(req, protocol.ExecutorCapabilities{
Executors: []protocol.ExecutorRef{{
Provider: "command",
ExecutionSecurityTier: protocol.ExecutionTrustedNative,
ProofTier: protocol.ProofReceiptOnly,
}},
}) {
t.Fatal("trusted native executor should not satisfy resource-constrained placement")
}

if !protocol.ExecutorCapabilitiesHaveResourceConstrainedMatch(req, protocol.ExecutorCapabilities{
Executors: []protocol.ExecutorRef{{
Provider: "sandboxed-command",
ExecutionSecurityTier: protocol.ExecutionSandboxedContainer,
ProofTier: protocol.ProofArtifactHash,
}},
}) {
t.Fatal("matching sandboxed executor should satisfy resource-constrained placement")
}

if !protocol.ExecutorCapabilitiesHaveResourceConstrainedMatch(protocol.PlacementRequirements{}, protocol.ExecutorCapabilities{
ExecutionTiers: []protocol.ExecutionSecurityTier{protocol.ExecutionSandboxedContainer},
}) {
t.Fatal("legacy tier-only capabilities should satisfy when they include a constrained tier")
}
}

func TestResourceLimitsRejectNegativeValues(t *testing.T) {
limits := protocol.ResourceLimits{
CPUPercent: -1,
Expand Down
Loading