diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-09-08 09:58:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-08 09:58:21 +0200 |
commit | 3c129c2ac776a392ab604b5c158981d60700f7d1 (patch) | |
tree | f902592554dc5052f90ed0717e12cf76d5d151e9 | |
parent | 124f4892ae45f19d49b3ca9adaa779c0f2851bfd (diff) | |
parent | 0161729355c19c63cfbc77d5f2a55f83de7be250 (diff) |
Merge pull request #28448 from vespa-engine/mpolden/allow-gpu-in-cd
Allow GPU in CD system
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index ac13ee992c2..f31ebcb0a47 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -15,6 +15,7 @@ import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.ProvisionLock; import com.yahoo.config.provision.ProvisionLogger; import com.yahoo.config.provision.Provisioner; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.jdisc.Metric; import com.yahoo.transaction.Mutex; @@ -119,7 +120,7 @@ public class NodeRepositoryProvisioner implements Provisioner { if (!requested.minResources().nodeResources().gpuResources().equals(requested.maxResources().nodeResources().gpuResources())) throw new IllegalArgumentException(requested + " is invalid: GPU capacity cannot have ranges"); - if (!requested.minResources().nodeResources().gpuResources().isZero() && !zone.system().isPublic()) + if (!requested.minResources().nodeResources().gpuResources().isZero() && zone.system() == SystemName.main) throw new IllegalArgumentException(requested + " is invalid: GPUs are not supported in " + zone); logInsufficientDiskResources(cluster, requested, logger); |