Merge pull request #841 from kgolab/kg-clean-up-006

Remove unused error handling
This commit is contained in:
Aleksandra Malinowska 2018-05-10 14:10:45 +02:00 committed by GitHub
commit 02230e0450
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions

View File

@ -49,17 +49,11 @@ func FilterOutNodesWithUnreadyGpus(allNodes, readyNodes []*apiv1.Node) ([]*apiv1
// on node object. Assume the node is still not fully started (installing
// GPU drivers).
if hasGpuLabel && (!hasGpuAllocatable || gpuAllocatable.IsZero()) {
newNode, err := getUnreadyNodeCopy(node)
if err != nil {
glog.Errorf("Failed to override status of node %v with unready GPU: %v",
node.Name, err)
} else {
glog.V(3).Infof("Overriding status of node %v, which seems to have unready GPU",
node.Name)
nodesWithUnreadyGpu[newNode.Name] = newNode
nodesWithUnreadyGpu[node.Name] = getUnreadyNodeCopy(node)
isUnready = true
}
}
if !isUnready {
newReadyNodes = append(newReadyNodes, node)
}
@ -75,7 +69,7 @@ func FilterOutNodesWithUnreadyGpus(allNodes, readyNodes []*apiv1.Node) ([]*apiv1
return newAllNodes, newReadyNodes
}
func getUnreadyNodeCopy(node *apiv1.Node) (*apiv1.Node, error) {
func getUnreadyNodeCopy(node *apiv1.Node) *apiv1.Node {
newNode := node.DeepCopy()
newReadyCondition := apiv1.NodeCondition{
Type: apiv1.NodeReady,
@ -89,7 +83,7 @@ func getUnreadyNodeCopy(node *apiv1.Node) (*apiv1.Node, error) {
}
}
newNode.Status.Conditions = newNodeConditions
return newNode, nil
return newNode
}
// NodeHasGpu returns true if a given node has GPU hardware.