Skip to content

Commit

Permalink
fix some ci errors
Browse files Browse the repository at this point in the history
Signed-off-by: guoqin <[email protected]>
  • Loading branch information
guoqinwill committed Jan 16, 2024
1 parent 8710c51 commit e50065b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: "^1.20.x"
go-version: 1.20.x
- run: go version
# Runs a set of commands to initialize and analyze with FOSSA
- name: run FOSSA analysis
Expand Down
2 changes: 1 addition & 1 deletion pkg/scheduler/api/devices/nvidia/vgpu/device_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func NewGPUDevices(name string, node *v1.Node) *GPUDevices {
if strings.Contains(handshake, "Requesting") {
formertime, _ := time.Parse("2006.01.02 15:04:05", strings.Split(handshake, "_")[1])
if time.Now().After(formertime.Add(time.Second * 60)) {
klog.Infof("node %v device %s leave, %v remaining devices:%v", node.Name, handshake)
klog.Infof("node %v device %s leave", node.Name, handshake)

tmppat := make(map[string]string)
tmppat[handshake] = "Deleted_" + time.Now().Format("2006.01.02 15:04:05")
Expand Down
2 changes: 1 addition & 1 deletion pkg/scheduler/api/devices/nvidia/vgpu/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ func checkType(annos map[string]string, d GPUDevice, n ContainerDeviceRequest) b
if strings.Compare(n.Type, NvidiaGPUDevice) == 0 {
return checkGPUtype(annos, d.Type)
}
klog.Errorf("Unrecognized device", n.Type)
klog.Errorf("Unrecognized device %v", n.Type)
return false
}

Expand Down
1 change: 1 addition & 0 deletions pkg/scheduler/api/pod_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"

"volcano.sh/apis/pkg/apis/scheduling/v1beta1"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/scheduler/api/resource_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func NewResource(rl v1.ResourceList) *Resource {
if !ignore {
r.AddScalar(rName, float64(rQuant.MilliValue()))
} else {
klog.V(4).Infof("Ignoring resource", rName.String())
klog.V(4).Infof("Ignoring resource %s", rName.String())
}
}
}
Expand Down
1 change: 0 additions & 1 deletion pkg/scheduler/capabilities/volumebinding/binder.go
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,6 @@ func (b *volumeBinder) checkVolumeProvisions(logger klog.Logger, pod *v1.Pod, cl
}

dynamicProvisions = append(dynamicProvisions, claim)

}
logger.V(4).Info("Provisioning for claims of pod that has no matching volumes...", "claimCount", len(claimsToProvision), "pod", klog.KObj(pod), "node", klog.KObj(node))

Expand Down
4 changes: 2 additions & 2 deletions pkg/scheduler/plugins/usage/usage.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (up *usagePlugin) OnSessionOpen(ssn *framework.Session) {
now := time.Now()
if up.period == "" || now.Sub(node.ResourceUsage.MetricsTime) > MetricsActiveTime {
klog.V(4).Infof("The period(%s) is empty or the usage metrics data is not updated for more than %v minutes, "+
"Usage plugin filter for task %s/%s on node %s pass, metrics time is %v. ", up.period, task.Namespace, task.Name, node.Name, node.ResourceUsage.MetricsTime)
"Usage plugin filter for task %s/%s on node %s pass, metrics time is %v. ", up.period, MetricsActiveTime, task.Namespace, task.Name, node.Name, node.ResourceUsage.MetricsTime)

usageStatus.Code = api.Success
predicateStatus = append(predicateStatus, usageStatus)
Expand Down Expand Up @@ -163,7 +163,7 @@ func (up *usagePlugin) OnSessionOpen(ssn *framework.Session) {
now := time.Now()
if up.period == "" || now.Sub(node.ResourceUsage.MetricsTime) > MetricsActiveTime {
klog.V(4).Infof("The period(%s) is empty or the usage metrics data is not updated for more than %v minutes, "+
"Usage plugin score for task %s/%s on node is 0, metrics time is %v. ", up.period, task.Namespace, task.Name, node.Name, node.ResourceUsage.MetricsTime)
"Usage plugin score for task %s/%s on node %s is 0, metrics time is %v. ", up.period, MetricsActiveTime, task.Namespace, task.Name, node.Name, node.ResourceUsage.MetricsTime)
return 0, nil
}

Expand Down

0 comments on commit e50065b

Please sign in to comment.