From 1bfd0cc47b3457080658f73afe79fdad5d490f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Mon, 1 Jul 2024 20:05:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91=E6=9B=B4=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/go.mod => go.mod | 5 ++--- runtime/go.sum => go.sum | 2 ++ hook/go.mod | 20 -------------------- hook/go.sum | 20 -------------------- hook/main.go | 2 +- install/deb/src/go.mod | 18 ------------------ install/deb/src/go.sum | 12 ------------ install/{deb/src => }/main.go | 2 +- install/{deb/src => }/main_test.go | 0 mindxcheckutils/go.mod | 3 --- runtime/dcmi/dcmi.go | 2 +- runtime/main.go | 4 ++-- 12 files changed, 9 insertions(+), 81 deletions(-) rename runtime/go.mod => go.mod (94%) rename runtime/go.sum => go.sum (99%) delete mode 100644 hook/go.mod delete mode 100644 hook/go.sum delete mode 100644 install/deb/src/go.mod delete mode 100644 install/deb/src/go.sum rename install/{deb/src => }/main.go (99%) rename install/{deb/src => }/main_test.go (100%) delete mode 100644 mindxcheckutils/go.mod diff --git a/runtime/go.mod b/go.mod similarity index 94% rename from runtime/go.mod rename to go.mod index 712bc03..2c6b4ff 100644 --- a/runtime/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module main +module Ascend-docker-runtime go 1.18 @@ -6,9 +6,9 @@ require ( github.com/agiledragon/gomonkey/v2 v2.8.0 github.com/containerd/containerd v1.6.24 github.com/opencontainers/runtime-spec v1.0.3-0.20220718201635-a8106e99982b + github.com/prashantv/gostub v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.8.2 huawei.com/npu-exporter/v5 v5.0.0 - mindxcheckutils v1.0.0 ) require ( @@ -42,5 +42,4 @@ require ( replace ( github.com/prashantv/gostub => github.com/prashantv/gostub v1.0.1-0.20191007164320-bbe3712b9c4a huawei.com/npu-exporter/v5 => gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0 - mindxcheckutils => ../mindxcheckutils ) diff --git a/runtime/go.sum b/go.sum similarity index 99% rename from runtime/go.sum rename to go.sum index 7bd98e6..3d095d5 100644 --- a/runtime/go.sum +++ b/go.sum @@ -537,6 +537,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prashantv/gostub v1.0.1-0.20191007164320-bbe3712b9c4a h1:tkiehFUSAXqIwMzuwKutcjSIZhpc3OKax/c9oKDz5mY= +github.com/prashantv/gostub v1.0.1-0.20191007164320-bbe3712b9c4a/go.mod h1:dP1v6T1QzyGJJKFocwAU0lSZKpfjstjH8TlhkEU0on0= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= diff --git a/hook/go.mod b/hook/go.mod deleted file mode 100644 index 91fec94..0000000 --- a/hook/go.mod +++ /dev/null @@ -1,20 +0,0 @@ -module main - -go 1.18 - -require ( - github.com/opencontainers/runtime-spec v1.0.3-0.20220718201635-a8106e99982b - github.com/prashantv/gostub v1.1.0 - huawei.com/npu-exporter/v5 v5.0.0 - mindxcheckutils v1.0.0 -) - -require ( - github.com/fsnotify/fsnotify v1.6.0 // indirect - golang.org/x/sys v0.8.0 // indirect -) - -replace ( - huawei.com/npu-exporter/v5 => gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0 - mindxcheckutils => ../mindxcheckutils -) diff --git a/hook/go.sum b/hook/go.sum deleted file mode 100644 index 12a0ad0..0000000 --- a/hook/go.sum +++ /dev/null @@ -1,20 +0,0 @@ -gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0 h1:hA93VQJXkYbkLjwNlIwL0C6krpIhsQSqIJ3+l+fiD9Q= -gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0/go.mod h1:uAjPsLJAJ89j/+yMXwoiEhQ037443MoTfG1afXXXdHc= -github.com/agiledragon/gomonkey/v2 v2.8.0 h1:u2K2nNGyk0ippzklz1CWalllEB9ptD+DtSXeCX5O000= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/opencontainers/runtime-spec v1.0.3-0.20220718201635-a8106e99982b h1:udwtfS44rxYE/ViMLchHQBjfE60GZSB1arY7BFbyxLs= -github.com/opencontainers/runtime-spec v1.0.3-0.20220718201635-a8106e99982b/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= -github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/hook/main.go b/hook/main.go index ef66735..b867911 100644 --- a/hook/main.go +++ b/hook/main.go @@ -30,7 +30,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "huawei.com/npu-exporter/v5/common-utils/hwlog" - "mindxcheckutils" + "Ascend-docker-runtime/mindxcheckutils" ) const ( diff --git a/install/deb/src/go.mod b/install/deb/src/go.mod deleted file mode 100644 index a492977..0000000 --- a/install/deb/src/go.mod +++ /dev/null @@ -1,18 +0,0 @@ -module main - -go 1.18 - -require ( - huawei.com/npu-exporter/v5 v5.0.0 - mindxcheckutils v1.0.0 -) - -require ( - github.com/fsnotify/fsnotify v1.6.0 // indirect - golang.org/x/sys v0.8.0 // indirect -) - -replace ( - huawei.com/npu-exporter/v5 => gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0 - mindxcheckutils => ../../../mindxcheckutils -) diff --git a/install/deb/src/go.sum b/install/deb/src/go.sum deleted file mode 100644 index 4417c6d..0000000 --- a/install/deb/src/go.sum +++ /dev/null @@ -1,12 +0,0 @@ -gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0 h1:hA93VQJXkYbkLjwNlIwL0C6krpIhsQSqIJ3+l+fiD9Q= -gitee.com/ascend/ascend-npu-exporter/v5 v5.0.0/go.mod h1:uAjPsLJAJ89j/+yMXwoiEhQ037443MoTfG1afXXXdHc= -github.com/agiledragon/gomonkey/v2 v2.8.0 h1:u2K2nNGyk0ippzklz1CWalllEB9ptD+DtSXeCX5O000= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/install/deb/src/main.go b/install/main.go similarity index 99% rename from install/deb/src/main.go rename to install/main.go index e4f6b1b..a0d6028 100644 --- a/install/deb/src/main.go +++ b/install/main.go @@ -28,7 +28,7 @@ import ( "huawei.com/npu-exporter/v5/common-utils/hwlog" - "mindxcheckutils" + "Ascend-docker-runtime/mindxcheckutils" ) const commonTemplate = `{ diff --git a/install/deb/src/main_test.go b/install/main_test.go similarity index 100% rename from install/deb/src/main_test.go rename to install/main_test.go diff --git a/mindxcheckutils/go.mod b/mindxcheckutils/go.mod deleted file mode 100644 index 7cfb90b..0000000 --- a/mindxcheckutils/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module mindxcheckutils - -go 1.17 diff --git a/runtime/dcmi/dcmi.go b/runtime/dcmi/dcmi.go index 261f970..b0d85e4 100644 --- a/runtime/dcmi/dcmi.go +++ b/runtime/dcmi/dcmi.go @@ -23,7 +23,7 @@ import ( "math" "unsafe" - "mindxcheckutils" + "Ascend-docker-runtime/mindxcheckutils" ) const ( diff --git a/runtime/main.go b/runtime/main.go index 6e15c28..2ca98a9 100644 --- a/runtime/main.go +++ b/runtime/main.go @@ -35,8 +35,8 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "huawei.com/npu-exporter/v5/common-utils/hwlog" - "main/dcmi" - "mindxcheckutils" + "Ascend-docker-runtime/mindxcheckutils" + "Ascend-docker-runtime/runtime/dcmi" ) const ( -- Gitee From 7b59e6656d7c546fc81fbed8654fb56e2ad08130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Tue, 2 Jul 2024 09:32:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91=E5=A2=9E=E5=8A=A0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mindxcheckutils/mindxcheckutils.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mindxcheckutils/mindxcheckutils.go b/mindxcheckutils/mindxcheckutils.go index 5762a0f..f4d805f 100644 --- a/mindxcheckutils/mindxcheckutils.go +++ b/mindxcheckutils/mindxcheckutils.go @@ -17,6 +17,7 @@ package mindxcheckutils import ( "fmt" + "huawei.com/npu-exporter/v5/common-utils/hwlog" "os" "path/filepath" "strings" @@ -40,6 +41,7 @@ const ( backupLogFileMode os.FileMode = 0400 runLogFileMode os.FileMode = 0750 maxFileNum = 32 + getStatErr = "failed to get file stat, error: %v" ) var logPrefix = "" @@ -51,18 +53,22 @@ func RealFileChecker(path string, checkParent, allowLink bool, size int) (string } _, err := FileChecker(path, false, checkParent, allowLink, 0) if err != nil { + hwlog.RunLog.Errorf("failed to check files, error: %v", err) return notValidPath, err } realPath, err := filepath.Abs(path) if err != nil { + hwlog.RunLog.Errorf("failed to get absolute path, error: %v", err) return notValidPath, err } realPath, err = filepath.EvalSymlinks(realPath) if err != nil { + hwlog.RunLog.Errorf("failed to get real path, error: %v", err) return notValidPath, err } fileInfo, err := os.Stat(realPath) if err != nil { + hwlog.RunLog.Errorf(getStatErr, err) return notValidPath, err } if !fileInfo.Mode().IsRegular() { @@ -84,18 +90,22 @@ func RealDirChecker(path string, checkParent, allowLink bool) (string, error) { } _, err := FileChecker(path, true, checkParent, allowLink, 0) if err != nil { + hwlog.RunLog.Errorf("failed to check files, error: %v", err) return notValidPath, err } realPath, err := filepath.Abs(path) if err != nil { + hwlog.RunLog.Errorf("failed to get absolute path, error: %v", err) return notValidPath, err } realPath, err = filepath.EvalSymlinks(realPath) if err != nil { + hwlog.RunLog.Errorf("failed to get real path, error: %v", err) return notValidPath, err } fileInfo, err := os.Stat(realPath) if err != nil { + hwlog.RunLog.Errorf(getStatErr, err) return notValidPath, err } if !fileInfo.IsDir() { @@ -158,6 +168,7 @@ func normalFileCheck(filePath string, allowDir bool, allowLink bool) (os.FileInf } fileInfo, err := os.Stat(filePath) if err != nil { + hwlog.RunLog.Errorf(getStatErr, err) return nil, false, fmt.Errorf("get file stat failed %v", err) } if allowDir { @@ -232,7 +243,7 @@ func ChangeRuntimeLogMode(runLog string) error { return fmt.Errorf("the counter file is over maxFileNum") } if err != nil { - fmt.Printf("prevent panic by handling failure accessing a path %q: %v\n", fileOrPath, err) + hwlog.RunLog.Errorf("prevent panic by handling failure accessing a path %q: %v", fileOrPath, err) return err } hasLogPrefix := strings.HasPrefix(fileOrPath[runLogDirLen:], runLog) @@ -243,11 +254,13 @@ func ChangeRuntimeLogMode(runLog string) error { return fmt.Errorf("the file or path is symlink") } if errChmod := os.Chmod(fileOrPath, backupLogFileMode); errChmod != nil { + hwlog.RunLog.Errorf("set file mode %s failed, error: %v", fileOrPath, err) return fmt.Errorf("set file mode %s failed", fileOrPath) } return nil }) if err != nil { + hwlog.RunLog.Warnf("change runtime log mode failed, error: %v", err) return nil } return nil -- Gitee From 275becd5ac8c72bcda211ff6a1e1f4f18b029754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Tue, 2 Jul 2024 09:40:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91=E4=BF=AE=E6=94=B9module?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- hook/main.go | 2 +- install/main.go | 2 +- runtime/dcmi/dcmi.go | 2 +- runtime/main.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2c6b4ff..ffaf2ab 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module Ascend-docker-runtime +module ascend-docker-runtime go 1.18 diff --git a/hook/main.go b/hook/main.go index b867911..82ea260 100644 --- a/hook/main.go +++ b/hook/main.go @@ -30,7 +30,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "huawei.com/npu-exporter/v5/common-utils/hwlog" - "Ascend-docker-runtime/mindxcheckutils" + "ascend-docker-runtime/mindxcheckutils" ) const ( diff --git a/install/main.go b/install/main.go index a0d6028..b14f1f2 100644 --- a/install/main.go +++ b/install/main.go @@ -28,7 +28,7 @@ import ( "huawei.com/npu-exporter/v5/common-utils/hwlog" - "Ascend-docker-runtime/mindxcheckutils" + "ascend-docker-runtime/mindxcheckutils" ) const commonTemplate = `{ diff --git a/runtime/dcmi/dcmi.go b/runtime/dcmi/dcmi.go index b0d85e4..e399fdd 100644 --- a/runtime/dcmi/dcmi.go +++ b/runtime/dcmi/dcmi.go @@ -23,7 +23,7 @@ import ( "math" "unsafe" - "Ascend-docker-runtime/mindxcheckutils" + "ascend-docker-runtime/mindxcheckutils" ) const ( diff --git a/runtime/main.go b/runtime/main.go index 2ca98a9..f3dc0e7 100644 --- a/runtime/main.go +++ b/runtime/main.go @@ -35,8 +35,8 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "huawei.com/npu-exporter/v5/common-utils/hwlog" - "Ascend-docker-runtime/mindxcheckutils" - "Ascend-docker-runtime/runtime/dcmi" + "ascend-docker-runtime/mindxcheckutils" + "ascend-docker-runtime/runtime/dcmi" ) const ( -- Gitee From f486dea55b0cc07a8207d1c02e520e65e823068d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Tue, 2 Jul 2024 09:43:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91=E4=BF=AE=E6=94=B9import?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mindxcheckutils/mindxcheckutils.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mindxcheckutils/mindxcheckutils.go b/mindxcheckutils/mindxcheckutils.go index f4d805f..7b042ce 100644 --- a/mindxcheckutils/mindxcheckutils.go +++ b/mindxcheckutils/mindxcheckutils.go @@ -17,11 +17,12 @@ package mindxcheckutils import ( "fmt" - "huawei.com/npu-exporter/v5/common-utils/hwlog" "os" "path/filepath" "strings" "syscall" + + "huawei.com/npu-exporter/v5/common-utils/hwlog" ) const ( -- Gitee