Lint:fix lints

Signed-off-by: Thor <1187526662@qq.com>

.golangci.yml

@@ -21,7 +21,6 @@ linters:
     - dupl
     - errcheck
     - funlen
-    - gochecknoinits
     - goconst
     - gocritic
     - gocyclo
@@ -103,3 +102,10 @@ issues:
         - golint
         - deadcode
         - godot
+
+linters-settings:
+  lll:
+    line-length: 256
+  funlen:
+    lines: 100
+    statements: 60

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)

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/preempt/preempt.go

@@ -108,7 +108,7 @@ func (alloc *Action) Execute(ssn *framework.Session) {
 
 				preemptor := preemptorTasks[preemptorJob.UID].Pop().(*api.TaskInfo)
 
-				if preempted, _ := preempt(ssn, stmt, preemptor, func(task *api.TaskInfo) bool {
+				if preempted := preempt(ssn, stmt, preemptor, func(task *api.TaskInfo) bool {
 					// Ignore non running task.
 					if task.Status != api.Running {
 						return false
@@ -155,7 +155,7 @@ func (alloc *Action) Execute(ssn *framework.Session) {
 				preemptor := preemptorTasks[job.UID].Pop().(*api.TaskInfo)
 
 				stmt := ssn.Statement()
-				assigned, _ := preempt(ssn, stmt, preemptor, func(task *api.TaskInfo) bool {
+				assigned := preempt(ssn, stmt, preemptor, func(task *api.TaskInfo) bool {
 					// Ignore non running task.
 					if task.Status != api.Running {
 						return false
@@ -185,7 +185,7 @@ func preempt(
 	stmt *framework.Statement,
 	preemptor *api.TaskInfo,
 	filter func(*api.TaskInfo) bool,
-) (bool, error) {
+) bool {
 	assigned := false
 
 	allNodes := util.GetNodeList(ssn.Nodes)
@@ -258,5 +258,5 @@ func preempt(
 		}
 	}
 
-	return assigned, nil
+	return assigned
 }

pkg/scheduler/actions/reclaim/reclaim.go

@@ -50,7 +50,7 @@ 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
+	// var underRequest []*api.JobInfo
 	for _, job := range ssn.Jobs {
 		if job.PodGroup.Status.Phase == scheduling.PodGroupPending {
 			continue
@@ -64,22 +64,18 @@ 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)
+			// 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 +188,6 @@ func (ra *Action) Execute(ssn *framework.Session) {
 		}
 		queues.Push(queue)
 	}
-
 }
 
 func (ra *Action) UnInitialize() {

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)
 }

pkg/scheduler/cache/event_handlers.go

@@ -19,7 +19,7 @@ package cache
 import (
 	"fmt"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/scheduling/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -246,18 +246,16 @@ func (sc *SchedulerCache) DeletePod(obj interface{}) {
 }
 
 // Assumes that lock is already acquired.
-func (sc *SchedulerCache) addNode(node *v1.Node) error {
+func (sc *SchedulerCache) addNode(node *v1.Node) {
 	if sc.Nodes[node.Name] != nil {
 		sc.Nodes[node.Name].SetNode(node)
 	} else {
 		sc.Nodes[node.Name] = schedulingapi.NewNodeInfo(node)
 	}
-
-	return nil
 }
 
 // Assumes that lock is already acquired.
-func (sc *SchedulerCache) updateNode(oldNode, newNode *v1.Node) error {
+func (sc *SchedulerCache) updateNode(newNode *v1.Node) error {
 	if sc.Nodes[newNode.Name] != nil {
 		sc.Nodes[newNode.Name].SetNode(newNode)
 		return nil
@@ -286,11 +284,7 @@ func (sc *SchedulerCache) AddNode(obj interface{}) {
 	sc.Mutex.Lock()
 	defer sc.Mutex.Unlock()
 
-	err := sc.addNode(node)
-	if err != nil {
-		klog.Errorf("Failed to add node %s into cache: %v", node.Name, err)
-		return
-	}
+	sc.addNode(node)
 }
 
 // UpdateNode update node to scheduler cache
@@ -309,7 +303,7 @@ func (sc *SchedulerCache) UpdateNode(oldObj, newObj interface{}) {
 	sc.Mutex.Lock()
 	defer sc.Mutex.Unlock()
 
-	err := sc.updateNode(oldNode, newNode)
+	err := sc.updateNode(newNode)
 	if err != nil {
 		klog.Errorf("Failed to update node %v in cache: %v", oldNode.Name, err)
 		return
@@ -596,9 +590,7 @@ func (sc *SchedulerCache) UpdatePriorityClass(oldObj, newObj interface{}) {
 	newSS, ok := newObj.(*v1beta1.PriorityClass)
 	if !ok {
 		klog.Errorf("Cannot convert newObj to *v1beta1.PriorityClass: %v", newObj)
-
 		return
-
 	}
 
 	sc.Mutex.Lock()

pkg/scheduler/framework/session_plugins.go

@@ -460,7 +460,7 @@ func (ssn *Session) NodeOrderFn(task *api.TaskInfo, node *api.NodeInfo) (float64
 			if err != nil {
 				return 0, err
 			}
-			priorityScore = priorityScore + score
+			priorityScore += score
 
 		}
 	}
@@ -509,7 +509,7 @@ func (ssn *Session) NodeOrderMapFn(task *api.TaskInfo, node *api.NodeInfo) (map[
 				if err != nil {
 					return nodeScoreMap, priorityScore, err
 				}
-				priorityScore = priorityScore + score
+				priorityScore += score
 			}
 			if pfn, found := ssn.nodeMapFns[plugin.Name]; found {
 				score, err := pfn(task, node)
@@ -540,7 +540,7 @@ func (ssn *Session) NodeOrderReduceFn(task *api.TaskInfo, pluginNodeScoreMap map
 				return nodeScoreMap, err
 			}
 			for _, hp := range pluginNodeScoreMap[plugin.Name] {
-				nodeScoreMap[hp.Host] = nodeScoreMap[hp.Host] + float64(hp.Score)
+				nodeScoreMap[hp.Host] += float64(hp.Score)
 			}
 		}
 	}

pkg/scheduler/framework/statement.go

@@ -73,7 +73,7 @@ func (s *Statement) Evict(reclaimee *api.TaskInfo, reason string) error {
 
 func (s *Statement) evict(reclaimee *api.TaskInfo, reason string) error {
 	if err := s.ssn.cache.Evict(reclaimee, reason); err != nil {
-		if e := s.unevict(reclaimee, reason); e != nil {
+		if e := s.unevict(reclaimee); e != nil {
 			klog.Errorf("Faled to unevict task <%v/%v>: %v.",
 				reclaimee.Namespace, reclaimee.Name, e)
 		}
@@ -83,7 +83,7 @@ func (s *Statement) evict(reclaimee *api.TaskInfo, reason string) error {
 	return nil
 }
 
-func (s *Statement) unevict(reclaimee *api.TaskInfo, reason string) error {
+func (s *Statement) unevict(reclaimee *api.TaskInfo) error {
 	// Update status in session
 	job, found := s.ssn.Jobs[reclaimee.Job]
 	if found {
@@ -251,7 +251,7 @@ func (s *Statement) Allocate(task *api.TaskInfo, hostname string) error {
 	return nil
 }
 
-func (s *Statement) allocate(task *api.TaskInfo, hostname string) error {
+func (s *Statement) allocate(task *api.TaskInfo) error {
 	if err := s.ssn.cache.BindVolumes(task); err != nil {
 		return err
 	}
@@ -278,7 +278,7 @@ func (s *Statement) allocate(task *api.TaskInfo, hostname string) error {
 }
 
 // unallocate the pod for task
-func (s *Statement) unallocate(task *api.TaskInfo, reason string) error {
+func (s *Statement) unallocate(task *api.TaskInfo) error {
 	// Update status in session
 	job, found := s.ssn.Jobs[task.Job]
 	if found {
@@ -314,11 +314,11 @@ func (s *Statement) Discard() {
 		op := s.operations[i]
 		switch op.name {
 		case "evict":
-			s.unevict(op.args[0].(*api.TaskInfo), op.args[1].(string))
+			s.unevict(op.args[0].(*api.TaskInfo))
 		case "pipeline":
 			s.unpipeline(op.args[0].(*api.TaskInfo))
 		case "allocate":
-			s.unallocate(op.args[0].(*api.TaskInfo), op.args[1].(string))
+			s.unallocate(op.args[0].(*api.TaskInfo))
 		}
 	}
 }
@@ -333,7 +333,7 @@ func (s *Statement) Commit() {
 		case "pipeline":
 			s.pipeline(op.args[0].(*api.TaskInfo))
 		case "allocate":
-			s.allocate(op.args[0].(*api.TaskInfo), op.args[1].(string))
+			s.allocate(op.args[0].(*api.TaskInfo))
 		}
 	}
 }