Skip to content

Commit

Permalink
Merge branch 'master' into typo-in-pkg-util
Browse files Browse the repository at this point in the history
  • Loading branch information
mahdikhashan authored Feb 21, 2025
2 parents 537c419 + dd2fdf1 commit 615e4cb
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 8 deletions.
1 change: 1 addition & 0 deletions OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ reviewers:
- Monokaix
- lowang-bh
- archlitchi
- JesseStutler
approvers:
- k82cn
- kevin-wangzefeng
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ job.batch/volcano-admission-init 1/1 48s 96s

### Install via helm

To install official release, please visit to [helm-charts](https://github.com/volcano-sh/helm-charts) for details.
To install official release, please visit [helm-charts](https://github.com/volcano-sh/helm-charts) for details.

```bash
helm repo add volcano-sh https://volcano-sh.github.io/helm-charts
Expand Down
2 changes: 1 addition & 1 deletion cmd/network-qos/tools/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ func (o *Options) AddFlags(c *cobra.Command) {
"bandwidth usage of online jobs exceeds the defined threshold(online-bandwidth-watermark)")
c.Flags().StringVar(&o.OfflineHighBandwidth, utils.OfflineHighBandwidthKey, o.OfflineHighBandwidth, "offline-high-bandwidth is the maximum amount of network bandwidth that can be used by offline jobs when the"+
"bandwidth usage of online jobs not reach to the defined threshold(online-bandwidth-watermark)")
c.Flags().BoolVar(&o.EnableNetworkQoS, utils.EnableNetworkQoS, o.EnableNetworkQoS, "enbale networkqos")
c.Flags().BoolVar(&o.EnableNetworkQoS, utils.EnableNetworkQoS, o.EnableNetworkQoS, "enable networkqos")
}
4 changes: 2 additions & 2 deletions cmd/scheduler/app/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
// Minimum percentage of nodes to find and score
fs.Int32Var(&s.MinPercentageOfNodesToFind, "minimum-percentage-nodes-to-find", defaultMinPercentageOfNodesToFind, "The minimum percentage of nodes to find and score")

// The percentage of nodes that would be scored in each scheduling cycle; if <= 0, an adpative percentage will be calcuated
fs.Int32Var(&s.PercentageOfNodesToFind, "percentage-nodes-to-find", defaultPercentageOfNodesToFind, "The percentage of nodes to find and score, if <=0 will be calcuated based on the cluster size")
// The percentage of nodes that would be scored in each scheduling cycle; if <= 0, an adaptive percentage will be calculated
fs.Int32Var(&s.PercentageOfNodesToFind, "percentage-nodes-to-find", defaultPercentageOfNodesToFind, "The percentage of nodes to find and score, if <=0 will be calculated based on the cluster size")

fs.StringVar(&s.PluginsDir, "plugins-dir", defaultPluginsDir, "vc-scheduler will load custom plugins which are in this directory")
fs.BoolVar(&s.EnableCSIStorage, "csi-storage", false,
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/config/configmgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (m *ConfigManager) PrepareConfigmap() error {
})
if waitErr != nil {
klog.ErrorS(waitErr, "Failed to wait for creating configMap")
return fmt.Errorf("failed to create configmap(%s:%s), waitting error: %v, latest creation error: %v",
return fmt.Errorf("failed to create configmap(%s:%s), waiting error: %v, latest creation error: %v",
m.agentPodNamespace, utils.ConfigMapName, waitErr, lastCreateErr)
}
return nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/config/source/configmap_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ func (cs *configMapSource) nodeAdd(obj interface{}) {
func (cs *configMapSource) nodeUpdate(oldObj, newObj interface{}) {
oldNode, ok := oldObj.(*corev1.Node)
if !ok {
klog.ErrorS(nil, "can not covert interface object to Node", "oldobj", oldObj)
klog.ErrorS(nil, "can not convert interface object to Node", "oldobj", oldObj)
cs.queue.Add("node")
return
}

newNode, ok := newObj.(*corev1.Node)
if !ok {
klog.ErrorS(nil, "can not covert interface object to Node", "newobj", newObj)
klog.ErrorS(nil, "can not convert interface object to Node", "newobj", newObj)
cs.queue.Add("node")
return
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/features/feature_gate.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func IsUnsupportedError(err error) bool {

func (f *featureGate) Supported(feature Feature, cfg *config.Configuration) error {
if !cfg.IsFeatureSupported(string(feature)) {
return UnsupportedError(fmt.Sprintf("feature(%s) is not supprted by volcano-agent", string(feature)))
return UnsupportedError(fmt.Sprintf("feature(%s) is not supported by volcano-agent", string(feature)))
}

switch feature {
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ reviewers:
- hzxuzhonghu
- TommyLike
- hwdef
- JesseStutler
approvers:
- hzxuzhonghu
- TommyLike
Expand Down
1 change: 1 addition & 0 deletions pkg/scheduler/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ reviewers:
- merryzhou
- lowang-bh
- hwdef
- JesseStutler
4 changes: 4 additions & 0 deletions pkg/scheduler/plugins/gang/gang.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ func (gp *gangPlugin) OnSessionClose(ssn *framework.Session) {
var unreadyTaskCount int32
var unScheduleJobCount int
for _, job := range ssn.Jobs {
// skip the jobs that have no tasks.
if len(job.Tasks) == 0 {
continue
}
if !job.IsReady() {
schedulableTaskNum := func() (num int32) {
for _, task := range job.TaskStatusIndex[api.Pending] {
Expand Down
1 change: 1 addition & 0 deletions pkg/webhooks/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ reviewers:
- jasonliu747
- qiankunli
- hwdef
- JesseStutler
approvers:
- k82cn
- kevin-wangzefeng
Expand Down

0 comments on commit 615e4cb

Please sign in to comment.