Lint:fix lints

.golangci.yml

@@ -14,49 +14,24 @@ linters:
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
-    - bodyclose
     - deadcode
-    - depguard
-    - dogsled
-    - dupl
     - errcheck
-    - funlen
-    - gochecknoinits
-    - goconst
     - gocritic
-    - gocyclo
     - gofmt
-    - goimports
-    - golint
-    - gomnd
-    - goprintffuncname
-    - gosec
+    - goimports 
+    - golint 
     - gosimple
     - govet
     - ineffassign
     - interfacer
     - lll
     - misspell
-    - nakedret
-    - rowserrcheck
-    - scopelint
-    - staticcheck
-    - structcheck
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - varcheck
-    - whitespace
-    - gocognit
-    - godox
-    - maligned
-    - prealloc
-    - wsl
-    - godot
-    - nestif
-    - gomodguard
-    - asciicheck
+    - staticcheck 
+    - structcheck 
+    - typecheck 
+    - unconvert 
+    - unparam 
+    - varcheck 
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source
@@ -102,4 +77,4 @@ issues:
       linters:
         - golint
         - deadcode
-        - godot
+        - godot

cmd/cli/util/util.go

@@ -30,7 +30,7 @@ func CheckError(cmd *cobra.Command, err error) {
 
 		// Ignore the root command.
 		for cur := cmd; cur.Parent() != nil; cur = cur.Parent() {
-			msg = msg + fmt.Sprintf(" %s", cur.Name())
+			msg += fmt.Sprintf(" %s", cur.Name())
 		}
 
 		fmt.Printf("%s: %v\n", msg, err)

cmd/cli/vcctl.go

@@ -60,7 +60,7 @@ func checkError(cmd *cobra.Command, err error) {
 
 		// Ignore the root command.
 		for cur := cmd; cur.Parent() != nil; cur = cur.Parent() {
-			msg = msg + fmt.Sprintf(" %s", cur.Name())
+			msg += fmt.Sprintf(" %s", cur.Name())
 		}
 
 		fmt.Printf("%s: %v\n", msg, err)

example/kubecon-2019-china/scripts/node-info.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	v1 "k8s.io/api/core/v1"
 
 	"volcano.sh/volcano/pkg/scheduler/api"
@@ -89,5 +90,4 @@ func main() {
 		fmt.Printf(" %-20s  |", res)
 	}
 	fmt.Print("\n--------------------------------------------------------------------------------------------------------------\n")
-
 }

pkg/cli/job/util.go

@@ -141,5 +141,5 @@ func HumanDuration(d time.Duration) string {
 	} else if hours < 24*365*8 {
 		return fmt.Sprintf("%dy%dd", hours/24/365, (hours/24)%365)
 	}
-	return fmt.Sprintf("%dy", int(hours/24/365))
+	return fmt.Sprintf("%dy", hours/24/365)
 }

pkg/cli/queue/create.go

@@ -58,7 +58,7 @@ func CreateQueue() error {
 			Name: createQueueFlags.Name,
 		},
 		Spec: schedulingv1beta1.QueueSpec{
-			Weight: int32(createQueueFlags.Weight),
+			Weight: createQueueFlags.Weight,
 		},
 		Status: schedulingv1beta1.QueueStatus{
 			State: schedulingv1beta1.QueueState(createQueueFlags.State),

pkg/cli/util/util.go

@@ -170,5 +170,5 @@ func HumanDuration(d time.Duration) string {
 	} else if hours < 24*365*8 {
 		return fmt.Sprintf("%dy%dd", hours/24/365, (hours/24)%365)
 	}
-	return fmt.Sprintf("%dy", int(hours/24/365))
+	return fmt.Sprintf("%dy", hours/24/365)
 }

pkg/controllers/cache/cache_test.go

@@ -469,7 +469,7 @@ func TestJobCache_AddPod(t *testing.T) {
 		if err == nil {
 			job, err := jobCache.Get(fmt.Sprintf("%s/%s", testcase.JobsInCache["job1"].Namespace, testcase.JobsInCache["job1"].Name))
 			if err != nil {
-				t.Errorf("Expected Error not to occur while retriving job from cache in case %d", i)
+				t.Errorf("Expected Error not to occur while retrieving job from cache in case %d", i)
 			}
 			if err == nil {
 				if len(job.Pods) != 1 {

pkg/controllers/job/job_controller_actions.go

@@ -88,7 +88,7 @@ func (cc *Controller) killJob(jobInfo *apis.JobInfo, podRetainPhase state.PhaseM
 
 	job = job.DeepCopy()
 	// Job version is bumped only when job is killed
-	job.Status.Version = job.Status.Version + 1
+	job.Status.Version++
 
 	job.Status = batch.JobStatus{
 		State: job.Status.State,

pkg/scheduler/actions/enqueue/enqueue.go

@@ -63,14 +63,12 @@ func (enqueue *Action) Execute(ssn *framework.Session) {
 			klog.Errorf("Failed to find Queue <%s> for Job <%s/%s>",
 				job.Queue, job.Namespace, job.Name)
 			continue
-		} else {
-			if _, existed := queueMap[queue.UID]; !existed {
-				klog.V(3).Infof("Added Queue <%s> for Job <%s/%s>",
-					queue.Name, job.Namespace, job.Name)
+		} else if _, existed := queueMap[queue.UID]; !existed {
+			klog.V(3).Infof("Added Queue <%s> for Job <%s/%s>",
+				queue.Name, job.Namespace, job.Name)
 
-				queueMap[queue.UID] = queue
-				queues.Push(queue)
-			}
+			queueMap[queue.UID] = queue
+			queues.Push(queue)
 		}
 
 		if job.PodGroup.Status.Phase == scheduling.PodGroupPending {

pkg/scheduler/actions/reclaim/reclaim.go

@@ -50,7 +50,6 @@ func (ra *Action) Execute(ssn *framework.Session) {
 	klog.V(3).Infof("There are <%d> Jobs and <%d> Queues in total for scheduling.",
 		len(ssn.Jobs), len(ssn.Queues))
 
-	var underRequest []*api.JobInfo
 	for _, job := range ssn.Jobs {
 		if job.PodGroup.Status.Phase == scheduling.PodGroupPending {
 			continue
@@ -64,22 +63,17 @@ func (ra *Action) Execute(ssn *framework.Session) {
 			klog.Errorf("Failed to find Queue <%s> for Job <%s/%s>",
 				job.Queue, job.Namespace, job.Name)
 			continue
-		} else {
-			if _, existed := queueMap[queue.UID]; !existed {
-				klog.V(4).Infof("Added Queue <%s> for Job <%s/%s>",
-					queue.Name, job.Namespace, job.Name)
-
-				queueMap[queue.UID] = queue
-				queues.Push(queue)
-			}
+		} else if _, existed := queueMap[queue.UID]; !existed {
+			klog.V(4).Infof("Added Queue <%s> for Job <%s/%s>", queue.Name, job.Namespace, job.Name)
+			queueMap[queue.UID] = queue
+			queues.Push(queue)
 		}
 
 		if len(job.TaskStatusIndex[api.Pending]) != 0 {
 			if _, found := preemptorsMap[job.Queue]; !found {
 				preemptorsMap[job.Queue] = util.NewPriorityQueue(ssn.JobOrderFn)
 			}
 			preemptorsMap[job.Queue].Push(job)
-			underRequest = append(underRequest, job)
 			preemptorTasks[job.UID] = util.NewPriorityQueue(ssn.TaskOrderFn)
 			for _, task := range job.TaskStatusIndex[api.Pending] {
 				preemptorTasks[job.UID].Push(task)
@@ -192,7 +186,6 @@ func (ra *Action) Execute(ssn *framework.Session) {
 		}
 		queues.Push(queue)
 	}
-
 }
 
 func (ra *Action) UnInitialize() {

pkg/scheduler/api/cluster_info.go

@@ -31,37 +31,37 @@ func (ci ClusterInfo) String() string {
 	str := "Cache:\n"
 
 	if len(ci.Nodes) != 0 {
-		str = str + "Nodes:\n"
+		str += "Nodes:\n"
 		for _, n := range ci.Nodes {
-			str = str + fmt.Sprintf("\t %s: idle(%v) used(%v) allocatable(%v) pods(%d)\n",
+			str += fmt.Sprintf("\t %s: idle(%v) used(%v) allocatable(%v) pods(%d)\n",
 				n.Name, n.Idle, n.Used, n.Allocatable, len(n.Tasks))
 
 			i := 0
 			for _, p := range n.Tasks {
-				str = str + fmt.Sprintf("\t\t %d: %v\n", i, p)
+				str += fmt.Sprintf("\t\t %d: %v\n", i, p)
 				i++
 			}
 		}
 	}
 
 	if len(ci.Jobs) != 0 {
-		str = str + "Jobs:\n"
+		str += "Jobs:\n"
 		for _, job := range ci.Jobs {
-			str = str + fmt.Sprintf("\t Job(%s) name(%s) minAvailable(%v)\n",
+			str += fmt.Sprintf("\t Job(%s) name(%s) minAvailable(%v)\n",
 				job.UID, job.Name, job.MinAvailable)
 
 			i := 0
 			for _, task := range job.Tasks {
-				str = str + fmt.Sprintf("\t\t %d: %v\n", i, task)
+				str += fmt.Sprintf("\t\t %d: %v\n", i, task)
 				i++
 			}
 		}
 	}
 
 	if len(ci.NamespaceInfo) != 0 {
-		str = str + "Namespaces:\n"
+		str += "Namespaces:\n"
 		for _, ns := range ci.NamespaceInfo {
-			str = str + fmt.Sprintf("\t Namespace(%s) Weight(%v)\n",
+			str += fmt.Sprintf("\t Namespace(%s) Weight(%v)\n",
 				ns.Name, ns.Weight)
 		}
 	}

pkg/scheduler/api/job_info.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
@@ -296,7 +296,7 @@ func (ji JobInfo) String() string {
 
 	i := 0
 	for _, task := range ji.Tasks {
-		res = res + fmt.Sprintf("\n\t %d: %v", i, task)
+		res += fmt.Sprintf("\n\t %d: %v", i, task)
 		i++
 	}
 
@@ -352,7 +352,7 @@ func (ji *JobInfo) WaitingTaskNum() int32 {
 	occupid := 0
 	for status, tasks := range ji.TaskStatusIndex {
 		if status == Pipelined {
-			occupid = occupid + len(tasks)
+			occupid += len(tasks)
 		}
 	}
 
@@ -367,7 +367,7 @@ func (ji *JobInfo) ValidTaskNum() int32 {
 			status == Succeeded ||
 			status == Pipelined ||
 			status == Pending {
-			occupied = occupied + len(tasks)
+			occupied += len(tasks)
 		}
 	}
 

pkg/scheduler/api/node_info.go

@@ -297,7 +297,7 @@ func (ni NodeInfo) String() string {
 
 	i := 0
 	for _, task := range ni.Tasks {
-		tasks = tasks + fmt.Sprintf("\n\t %d: %v", i, task)
+		tasks += fmt.Sprintf("\n\t %d: %v", i, task)
 		i++
 	}
 

pkg/scheduler/api/resource_info.go

@@ -214,8 +214,8 @@ func (r *Resource) FitDelta(rr *Resource) *Resource {
 
 // Multi multiples the resource with ratio provided
 func (r *Resource) Multi(ratio float64) *Resource {
-	r.MilliCPU = r.MilliCPU * ratio
-	r.Memory = r.Memory * ratio
+	r.MilliCPU *= ratio
+	r.Memory *= ratio
 	for rName, rQuant := range r.ScalarResources {
 		r.ScalarResources[rName] = rQuant * ratio
 	}

pkg/scheduler/cache/cache.go

@@ -18,7 +18,10 @@ package cache
 
 import (
 	"fmt"
-	"k8s.io/api/core/v1"
+	"sync"
+	"time"
+
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/scheduling/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,8 +41,6 @@ import (
 	"k8s.io/klog"
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	"k8s.io/kubernetes/pkg/scheduler/volumebinder"
-	"sync"
-	"time"
 	vcv1beta1 "volcano.sh/volcano/pkg/apis/scheduling/v1beta1"
 
 	"volcano.sh/volcano/cmd/scheduler/app/options"
@@ -395,7 +396,6 @@ func (sc *SchedulerCache) Run(stopCh <-chan struct{}) {
 
 // WaitForCacheSync sync the cache with the api server
 func (sc *SchedulerCache) WaitForCacheSync(stopCh <-chan struct{}) bool {
-
 	return cache.WaitForCacheSync(stopCh,
 		func() []cache.InformerSynced {
 			informerSynced := []cache.InformerSynced{
@@ -737,31 +737,31 @@ func (sc *SchedulerCache) String() string {
 	str := "Cache:\n"
 
 	if len(sc.Nodes) != 0 {
-		str = str + "Nodes:\n"
+		str += "Nodes:\n"
 		for _, n := range sc.Nodes {
-			str = str + fmt.Sprintf("\t %s: idle(%v) used(%v) allocatable(%v) pods(%d)\n",
+			str += fmt.Sprintf("\t %s: idle(%v) used(%v) allocatable(%v) pods(%d)\n",
 				n.Name, n.Idle, n.Used, n.Allocatable, len(n.Tasks))
 
 			i := 0
 			for _, p := range n.Tasks {
-				str = str + fmt.Sprintf("\t\t %d: %v\n", i, p)
+				str += fmt.Sprintf("\t\t %d: %v\n", i, p)
 				i++
 			}
 		}
 	}
 
 	if len(sc.Jobs) != 0 {
-		str = str + "Jobs:\n"
+		str += "Jobs:\n"
 		for _, job := range sc.Jobs {
-			str = str + fmt.Sprintf("\t %s\n", job)
+			str += fmt.Sprintf("\t %s\n", job)
 		}
 	}
 
 	if len(sc.NamespaceCollection) != 0 {
-		str = str + "Namespaces:\n"
+		str += "Namespaces:\n"
 		for _, ns := range sc.NamespaceCollection {
 			info := ns.Snapshot()
-			str = str + fmt.Sprintf("\t Namespace(%s) Weight(%v)\n",
+			str += fmt.Sprintf("\t Namespace(%s) Weight(%v)\n",
 				info.Name, info.Weight)
 		}
 	}
@@ -831,6 +831,5 @@ func (sc *SchedulerCache) recordPodGroupEvent(podGroup *schedulingapi.PodGroup,
 		klog.Errorf("Error while converting PodGroup to v1alpha1.PodGroup with error: %v", err)
 		return
 	}
-
 	sc.Recorder.Eventf(pg, eventType, reason, msg)
 }