From 8c60092634c706eaaf0f34e5a0ec5b1fbde5a7a0 Mon Sep 17 00:00:00 2001
From: zhanghan2021 <zhanghan@kylinos.cn>
Date: Wed, 24 Jan 2024 14:13:46 +0800
Subject: [PATCH] Execution result judgment and storage

---
 node_modules/.yarn-integrity     | 12 ------------
 server/model/common.go           |  1 -
 server/service/resultservice.go  |  5 ++---
 server/template/tune/compress.go |  8 +++++---
 4 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 node_modules/.yarn-integrity

diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
deleted file mode 100644
index 8d6591c..0000000
--- a/node_modules/.yarn-integrity
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "systemParams": "win32-x64-115",
-  "modulesFolders": [
-    "node_modules"
-  ],
-  "flags": [],
-  "linkedModules": [],
-  "topLevelPatterns": [],
-  "lockfileEntries": {},
-  "files": [],
-  "artifacts": {}
-}
\ No newline at end of file
diff --git a/server/model/common.go b/server/model/common.go
index 864a192..2c7dac8 100644
--- a/server/model/common.go
+++ b/server/model/common.go
@@ -23,7 +23,6 @@ type RunResult struct {
 	EndTime     string `json:"endTime"`
 	RetCode     int    `json:"retcode"`
 	Stdout      string `json:"stdout"`
-	Stderr      string `json:"stderr"`
 	IsSuccess   string `json:"is_success"`
 }
 
diff --git a/server/service/resultservice.go b/server/service/resultservice.go
index 087fa50..4f73a45 100644
--- a/server/service/resultservice.go
+++ b/server/service/resultservice.go
@@ -42,15 +42,14 @@ func DeleteResult(resultId []int) error {
 
 func processResult(dbtaskid int, res *common.CmdResult, commandType string) (string, error) {
 	var commandResultStatus string
-	if res.Stderr == "" && len(res.Stdout) != 0 {
+	if res.RetCode == 0 {
 		commandResultStatus = IsSuccess_success
 	} else {
 		commandResultStatus = IsSuccess_fail
 	}
 	result := &model.RunResult{
 		RetCode:   res.RetCode,
-		Stdout:    res.Stdout,
-		Stderr:    res.Stderr,
+		Stdout:    res.Stdout + res.Stderr,
 		IsSuccess: commandResultStatus,
 	}
 
diff --git a/server/template/tune/compress.go b/server/template/tune/compress.go
index 32b8c71..40f502e 100644
--- a/server/template/tune/compress.go
+++ b/server/template/tune/compress.go
@@ -1,14 +1,16 @@
 package tune
 
+import "openeuler.org/PilotGo/atune-plugin/plugin"
+
 type CompressApp struct{}
 
 func (c *CompressApp) Info() *TuneInfo {
 	info := &TuneInfo{
 		TuneName:      "compress",
-		WorkDirectory: "mkdir -p /tmp/tune/ && cp -r ../../templete/compress.tar.gz /tmp/tune/ && cd /tmp/tune && tar -xzvf compress.tar.gz",
+		WorkDirectory: "mkdir -p /tmp/tune/ && cd /tmp/tune/ && [ -e compress.tar.gz ] && tar -xzvf compress.tar.gz || ( curl -OJ http://" + plugin.GlobalClient.Server() + "/api/v1/download/compress.tar.gz && tar -xzvf compress.tar.gz)",
 		Prepare:       "cd /tmp/tune/compress && sh prepare.sh enwik8.zip",
-		Tune:          "atune-adm tuning --project compress --detail compress_client.yaml",
-		Restore:       "atune-adm tuning --restore --project compress",
+		Tune:          "cd /tmp/tune/compress && atune-adm tuning --project compress --detail compress_client.yaml",
+		Restore:       "cd /tmp/tune/compress && atune-adm tuning --restore --project compress",
 	}
 	return info
 }
-- 
Gitee