chores: fix fmt (#16)

Signed-off-by: 佑祎 <zzw261520@alibaba-inc.com>

.github/workflows/ci.yaml

@@ -20,6 +20,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v3
         with:
           version: v1.47.3
+          args: --timeout 3m0s
 
   unit-tests:
     strategy:

cmd/yarn-copilot/main.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package main
 
 import (

cmd/yarn-copilot/options/options.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package options
 
 import "time"

pkg/controller/noderesource/resource_sync_controller.go

@@ -96,7 +96,7 @@ func Add(mgr ctrl.Manager) error {
 		return err
 	}
 	r := &YARNResourceSyncReconciler{
-		Client: mgr.GetClient(),
+		Client:     mgr.GetClient(),
 		yarnClient: yarnClient,
 	}
 	if err := r.yarnClient.Initialize(); err != nil {

pkg/yarn/client/examples/rm_update_node_resource_with_ha.go → pkg/yarn/client/examples/rm-update-node-resource-with-ha/main.go

@@ -56,4 +56,4 @@ func main() {
 	}
 
 	log.Printf("UpdateNodeResource response %v", response)
-}
+}

pkg/yarn/client/ha_service_client.go

@@ -37,4 +37,4 @@ func (c *YarnHAClient) GetServiceStatus(request *hadoopcommon.GetServiceStatusRe
 		return nil, err
 	}
 	return response, nil
-}
+}

pkg/yarn/client/rm_admin_client.go

@@ -38,4 +38,4 @@ func (c *YarnAdminClient) UpdateNodeResource(request *yarnserver.UpdateNodeResou
 		return nil, err
 	}
 	return response, nil
-}
+}

pkg/yarn/config/yarn_configuration.go

@@ -28,20 +28,20 @@ var (
 )
 
 const (
-	YARN_PREFIX                      = "yarn."
-	RM_PREFIX                        = YARN_PREFIX + "resourcemanager."
-	RM_ADDRESS                       = RM_PREFIX + "address"
-	RM_SCHEDULER_ADDRESS             = RM_PREFIX + "scheduler.address"
-	RM_ADMIN_ADDRESS                 = RM_PREFIX + "admin.address"
-	RM_HA_ENABLED                 = RM_PREFIX + "ha.enabled"
-	RM_HA_RM_IDS                 = RM_PREFIX + "ha.rm-ids"
-	RM_AM_EXPIRY_INTERVAL_MS         = YARN_PREFIX + "am.liveness-monitor.expiry-interval-ms"
+	YARN_PREFIX              = "yarn."
+	RM_PREFIX                = YARN_PREFIX + "resourcemanager."
+	RM_ADDRESS               = RM_PREFIX + "address"
+	RM_SCHEDULER_ADDRESS     = RM_PREFIX + "scheduler.address"
+	RM_ADMIN_ADDRESS         = RM_PREFIX + "admin.address"
+	RM_HA_ENABLED            = RM_PREFIX + "ha.enabled"
+	RM_HA_RM_IDS             = RM_PREFIX + "ha.rm-ids"
+	RM_AM_EXPIRY_INTERVAL_MS = YARN_PREFIX + "am.liveness-monitor.expiry-interval-ms"
 
 	DEFAULT_RM_ADDRESS               = "0.0.0.0:8032"
 	DEFAULT_RM_SCHEDULER_ADDRESS     = "0.0.0.0:8030"
 	DEFAULT_RM_ADMIN_ADDRESS         = "0.0.0.0:8033"
 	DEFAULT_RM_AM_EXPIRY_INTERVAL_MS = 600000
-	DEFAULT_RM_HA_ENABLED = false
+	DEFAULT_RM_HA_ENABLED            = false
 )
 
 type yarn_configuration struct {

pkg/yarn/copilot/nm/nm.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package nm
 
 import (
@@ -10,13 +26,12 @@ import (
 	"time"
 
 	"github.com/go-resty/resty/v2"
-	"github.com/koordinator-sh/koordinator/pkg/koordlet/pleg"
-	"github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer"
-	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"k8s.io/klog/v2"
 
 	"github.com/koordinator-sh/goyarn/pkg/yarn/copilot/utils"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/pleg"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer"
+	"github.com/koordinator-sh/koordinator/pkg/koordlet/util/system"
 )
 
 const (
@@ -106,7 +121,7 @@ func (n *NodeMangerOperator) syncMemoryCgroup(stop <-chan struct{}) error {
 func (n *NodeMangerOperator) syncNoneProcCgroup() {
 	klog.V(5).Info("syncNoneProcCgroup")
 	cpuPath := n.GenerateCgroupFullPath(system.CgroupCPUDir)
-	filepath.Walk(cpuPath, func(path string, info os.FileInfo, err error) error {
+	err := filepath.Walk(cpuPath, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			klog.Warningf("ignore file %s error:%s", path, err.Error())
 			return err
@@ -129,6 +144,9 @@ func (n *NodeMangerOperator) syncNoneProcCgroup() {
 		}
 		return nil
 	})
+	if err != nil {
+		klog.Errorf("walk cpu cgroup dir failed, error %v", err)
+	}
 }
 
 func (n *NodeMangerOperator) syncNMEndpoint() {
@@ -150,7 +168,7 @@ func (n *NodeMangerOperator) syncNMEndpoint() {
 func (n *NodeMangerOperator) syncAllCgroup() {
 	subDirFunc := func(dir string) map[string]struct{} {
 		res := map[string]struct{}{}
-		filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+		err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
 			if err != nil {
 				klog.Warningf("ignore file %s error:%s", path, err.Error())
 				return err
@@ -161,15 +179,18 @@ func (n *NodeMangerOperator) syncAllCgroup() {
 			}
 			return nil
 		})
+		if err != nil {
+			klog.Errorf("walk cpu cgroup dir failed, error %v", err)
+		}
 		return res
 	}
 	cpuList := subDirFunc(filepath.Join(n.CgroupRoot, system.CgroupCPUDir, n.CgroupPath))
 	memList := subDirFunc(filepath.Join(n.CgroupRoot, system.CgroupMemDir, n.CgroupPath))
 	toCreate, toDelete := utils.DiffMap(cpuList, memList)
-	for path, _ := range toCreate {
+	for path := range toCreate {
 		n.createMemoryCgroup(path)
 	}
-	for path, _ := range toDelete {
+	for path := range toDelete {
 		n.removeMemoryCgroup(path)
 	}
 }
@@ -211,7 +232,7 @@ func (n *NodeMangerOperator) createMemoryCgroup(fileName string) {
 		return
 	}
 	cpuCgroupPath := filepath.Join(n.CgroupRoot, system.CgroupCPUDir, n.CgroupPath, basename)
-	pids, err := cgroups.GetPids(cpuCgroupPath)
+	pids, err := utils.GetPids(cpuCgroupPath)
 	if err != nil {
 		klog.Error(err)
 		return
@@ -261,7 +282,7 @@ func (n *NodeMangerOperator) KillContainer(containerID string) error {
 
 func (n *NodeMangerOperator) getProcessGroupID(containerID string) int {
 	containerCgroupPath := filepath.Join(n.CgroupRoot, "cpu", n.CgroupPath, containerID)
-	pids, err := cgroups.GetPids(containerCgroupPath)
+	pids, err := utils.GetPids(containerCgroupPath)
 	if err != nil {
 		klog.Error(err)
 		return 0

pkg/yarn/copilot/nm/nm_pod_discover.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package nm
 
 import (
@@ -28,7 +44,7 @@ func (n *NMPodWatcher) GetNMPodEndpoint() (string, bool, error) {
 		if pod.Labels[ComponentLabelKey] != NodeManagerComponentLabelName {
 			continue
 		}
-		if pod.Spec.HostNetwork == true {
+		if pod.Spec.HostNetwork {
 			return "localhost:8042", true, nil
 		}
 		return fmt.Sprintf("%s:8042", pod.Status.PodIP), true, nil

pkg/yarn/copilot/server/helper.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package server
 
 import (

pkg/yarn/copilot/server/server.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package server
 
 import (
@@ -40,7 +56,10 @@ func (y *YarnCopilotServer) Run(ctx context.Context) error {
 		Handler: e,
 	}
 	sockDir := filepath.Dir(y.unixPath)
-	os.MkdirAll(sockDir, os.ModePerm)
+	err := os.MkdirAll(sockDir, os.ModePerm)
+	if err != nil {
+		klog.Fatal("mkdir for socket failed", err)
+	}
 	if system.FileExists(y.unixPath) {
 		os.Remove(y.unixPath)
 	}
@@ -50,17 +69,20 @@ func (y *YarnCopilotServer) Run(ctx context.Context) error {
 		os.Exit(1)
 	}
 	defer os.Remove(y.unixPath)
-	go server.Serve(listener)
-	for {
-		select {
-		case <-ctx.Done():
-			klog.Info("graceful shutdown")
-			if err := server.Shutdown(ctx); err != nil {
-				klog.Errorf("Server forced to shutdown: %v", err)
-			}
-			return nil
+	go func() {
+		err := server.Serve(listener)
+		if err != nil {
+			klog.Fatal("start serve failed", err)
 		}
+	}()
+
+	<-ctx.Done()
+	klog.Info("graceful shutdown")
+	if err := server.Shutdown(ctx); err != nil {
+		klog.Errorf("Server forced to shutdown: %v", err)
 	}
+	return nil
+
 }
 
 func (y *YarnCopilotServer) Health(ctx *gin.Context) {
@@ -144,5 +166,4 @@ func (y *YarnCopilotServer) KillContainer(ctx *gin.Context) {
 }
 
 func (y *YarnCopilotServer) KillContainerByResource(ctx *gin.Context) {
-	return
 }

pkg/yarn/copilot/utils/cgroups_linux.go

@@ -0,0 +1,26 @@
+//go:build linux
+// +build linux
+
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import "github.com/opencontainers/runc/libcontainer/cgroups"
+
+func GetPids(cgroupPath string) ([]int, error) {
+	return cgroups.GetPids(cgroupPath)
+}

pkg/yarn/copilot/utils/cgroups_unsupported.go

@@ -0,0 +1,26 @@
+//go:build !linux
+// +build !linux
+
+/*
+Copyright 2022 The Koordinator Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import "fmt"
+
+func GetPids(cgroupPath string) ([]int, error) {
+	return nil, fmt.Errorf("unsupported")
+}