diff --git a/atune/.gitignore b/atune/.gitignore index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e9abc7f6a85931701cd3211c9a184269b2afd298 100644 --- a/atune/.gitignore +++ b/atune/.gitignore @@ -0,0 +1 @@ +config.yml \ No newline at end of file diff --git a/atune/main.go b/atune/main.go deleted file mode 100644 index 8978fafb607c06904a636fa97658cb8b27ace139..0000000000000000000000000000000000000000 --- a/atune/main.go +++ /dev/null @@ -1,12 +0,0 @@ -package main - -import ( - "fmt" - - "openeuler.org/PilotGo/atune-plugin/utils" -) - -func main() { - info := utils.GetTuneInfo("gcc_compile") - fmt.Printf("%#v", info) -} diff --git a/atune/server/config.yml.templete b/atune/server/config.yml.templete new file mode 100644 index 0000000000000000000000000000000000000000..b10e418d9bfb789b5c886f1726bf89e9adf0277f --- /dev/null +++ b/atune/server/config.yml.templete @@ -0,0 +1,19 @@ +plugin_atune: + url: "http://localhost:8099/plugin/atune" + plugin_type: "iframe" # iframe micro-app +http_server: + addr: "localhost:8099" +pilotgo_server: + addr: "0.0.0.0:8888" +log: + level: debug + driver: file #可选stdout和file。stdout：输出到终端控制台；file：输出到path下的指定文件。 + path: ./log/plugin_atune.log + max_file: 1 + max_size: 10485760 +mysql: + host: localhost + port: 3306 + user: '' + password: '' + database: PluginAtune \ No newline at end of file diff --git a/atune/server/config/config.go b/atune/server/config/config.go new file mode 100644 index 0000000000000000000000000000000000000000..3d7f78558ac572e2c20a9d857e8988a464f5553d --- /dev/null +++ b/atune/server/config/config.go @@ -0,0 +1,69 @@ +package config + +import ( + "fmt" + "io/ioutil" + "os" + + "gitee.com/openeuler/PilotGo-plugins/sdk/logger" + "gopkg.in/yaml.v2" +) + +type PluginAtune struct { + URL string `yaml:"url"` + PluginType string `yaml:"plugin_type"` +} + +type HttpServer struct { + Addr string `yaml:"addr"` +} +type PilotGoServer struct { + Addr string `yaml:"addr"` +} + +type MysqlDBInfo struct { + HostName string `yaml:"host"` + Port int `yaml:"port"` + UserName string `yaml:"user"` + Password string `yaml:"password"` + DataBase string `yaml:"database"` +} + +type ServerConfig struct { + PluginAtune *PluginAtune `yaml:"plugin_atune"` + HttpServer *HttpServer `yaml:"http_server"` + PilotGoServer *PilotGoServer `yaml:"pilotgo_server"` + Logopts *logger.LogOpts `yaml:"log"` + Mysql *MysqlDBInfo `yaml:"mysql"` +} + +const config_file = "./config.yml" + +var global_config ServerConfig + +func Init() { + err := readConfig(config_file, &global_config) + if err != nil { + fmt.Printf("%v", err.Error()) + os.Exit(-1) + } +} + +func Config() *ServerConfig { + return &global_config +} + +func readConfig(file string, config interface{}) error { + bytes, err := ioutil.ReadFile(file) + if err != nil { + fmt.Printf("open %s failed! err = %s\n", file, err.Error()) + return err + } + + err = yaml.Unmarshal(bytes, config) + if err != nil { + fmt.Printf("yaml Unmarshal %s failed!\n", string(bytes)) + return err + } + return nil +} diff --git a/atune/server/db/db.go b/atune/server/db/db.go new file mode 100644 index 0000000000000000000000000000000000000000..7fbf6105dcd3c8d39432fe63a81dd3eee6bce1ab --- /dev/null +++ b/atune/server/db/db.go @@ -0,0 +1,105 @@ +package db + +import ( + "database/sql" + "fmt" + + "gorm.io/driver/mysql" + "gorm.io/gorm" + "gorm.io/gorm/schema" + "openeuler.org/PilotGo/atune-plugin/config" +) + +var Url string +var global_db *gorm.DB + +type MysqlManager struct { + ip string + port int + userName string + passWord string + dbName string + db *gorm.DB +} + +func MySQL() *gorm.DB { + return global_db +} + +func MysqldbInit(conf *config.MysqlDBInfo) error { + err := ensureDatabase(conf) + if err != nil { + return err + } + _, err = mysqlInit( + conf.HostName, + conf.UserName, + conf.Password, + conf.DataBase, + conf.Port) + if err != nil { + return err + } + + return nil +} + +func mysqlInit(ip, username, password, dbname string, port int) (*MysqlManager, error) { + m := &MysqlManager{ + ip: ip, + port: port, + userName: username, + passWord: password, + dbName: dbname, + } + Url = fmt.Sprintf("%s:%s@(%s:%d)/%s?charset=utf8mb4&parseTime=true", + m.userName, + m.passWord, + m.ip, + m.port, + m.dbName) + + var err error + m.db, err = gorm.Open(mysql.Open(Url), &gorm.Config{ + NamingStrategy: schema.NamingStrategy{ + SingularTable: true, + }, + }) + if err != nil { + return nil, err + } + global_db = m.db + + var db *sql.DB + if db, err = m.db.DB(); err != nil { + return nil, err + } + + db.SetMaxIdleConns(10) + db.SetMaxOpenConns(100) + + return m, nil +} +func ensureDatabase(conf *config.MysqlDBInfo) error { + Url := fmt.Sprintf("%s:%s@(%s:%d)/?charset=utf8mb4&parseTime=true", + conf.UserName, + conf.Password, + conf.HostName, + conf.Port) + db, err := gorm.Open(mysql.Open(Url)) + if err != nil { + return err + } + + creatDataBase := "CREATE DATABASE IF NOT EXISTS " + conf.DataBase + " DEFAULT CHARSET utf8 COLLATE utf8_general_ci" + db.Exec(creatDataBase) + + d, err := db.DB() + if err != nil { + return err + } + if err = d.Close(); err != nil { + return err + } + return nil +} diff --git a/atune/global/global.go b/atune/server/global/global.go similarity index 100% rename from atune/global/global.go rename to atune/server/global/global.go diff --git a/atune/go.mod b/atune/server/go.mod similarity index 53% rename from atune/go.mod rename to atune/server/go.mod index 396071bb036c0056d149eda05af3d2d9a2dc9c59..fb0c9a895443423a474ed875d66600fee8555023 100644 --- a/atune/go.mod +++ b/atune/server/go.mod @@ -1,3 +1,5 @@ module openeuler.org/PilotGo/atune-plugin go 1.18 + +require gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/atune/server/go.sum b/atune/server/go.sum new file mode 100644 index 0000000000000000000000000000000000000000..75346616b19bda7882ecbba954fe5bc1e5577468 --- /dev/null +++ b/atune/server/go.sum @@ -0,0 +1,3 @@ +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/atune/server/main.go b/atune/server/main.go new file mode 100644 index 0000000000000000000000000000000000000000..abb6838940b4df29896d026269cc128d953deb2f --- /dev/null +++ b/atune/server/main.go @@ -0,0 +1,56 @@ +package main + +import ( + "fmt" + "os" + "os/signal" + "syscall" + + "gitee.com/openeuler/PilotGo-plugins/sdk/logger" + "gitee.com/openeuler/PilotGo-plugins/sdk/plugin/client" + "openeuler.org/PilotGo/atune-plugin/config" + "openeuler.org/PilotGo/atune-plugin/db" + "openeuler.org/PilotGo/atune-plugin/plugin" + "openeuler.org/PilotGo/atune-plugin/router" +) + +func main() { + fmt.Println("hello atune") + + config.Init() + + if err := logger.Init(config.Config().Logopts); err != nil { + fmt.Printf("logger init failed, please check the config file: %s", err) + os.Exit(-1) + } + + if err := db.MysqldbInit(config.Config().Mysql); err != nil { + logger.Error("mysql db init failed, please check again: %s", err) + os.Exit(-1) + } + + err := router.HttpServerInit(config.Config().HttpServer) + if err != nil { + logger.Error("http server init failed, error:%v", err) + os.Exit(-1) + } + + plugin.GlobalClient = client.DefaultClient(plugin.Init(config.Config().PluginAtune)) + plugin.GlobalClient.Server = config.Config().HttpServer.Addr + + c := make(chan os.Signal, 1) + signal.Notify(c, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) + for { + s := <-c + switch s { + case syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT: + logger.Info("signal interrupted: %s", s.String()) + goto EXIT + default: + logger.Info("unknown signal: %s", s.String()) + } + } + +EXIT: + logger.Info("exit system, bye~") +} diff --git a/atune/server/plugin/plugin_manager.go b/atune/server/plugin/plugin_manager.go new file mode 100644 index 0000000000000000000000000000000000000000..923a740cfea1c60f73a57cd7fc7bb9e75c55d5cd --- /dev/null +++ b/atune/server/plugin/plugin_manager.go @@ -0,0 +1,24 @@ +package plugin + +import ( + "gitee.com/openeuler/PilotGo-plugins/sdk/plugin/client" + "openeuler.org/PilotGo/atune-plugin/config" +) + +var ( + GlobalClient *client.Client +) + +func Init(plugin *config.PluginAtune) *client.PluginInfo { + PluginInfo := client.PluginInfo{ + Name: "atune", + Version: "0.0.1", + Description: "A-Tune智能运维调优工具", + Author: "zhanghan", + Email: "zhanghan@kylinos.cn", + Url: plugin.URL, + PluginType: plugin.PluginType, + } + + return &PluginInfo +} diff --git a/atune/server/router/router.go b/atune/server/router/router.go new file mode 100644 index 0000000000000000000000000000000000000000..3ae621a5acd14aaeca02d343c77fbea9a29aba9b --- /dev/null +++ b/atune/server/router/router.go @@ -0,0 +1,44 @@ +package router + +import ( + "gitee.com/openeuler/PilotGo-plugins/sdk/logger" + "github.com/gin-gonic/gin" + "openeuler.org/PilotGo/atune-plugin/config" + "openeuler.org/PilotGo/atune-plugin/plugin" +) + +func HttpServerInit(conf *config.HttpServer) error { + + go func() { + r := setupRouter() + + logger.Info("start http service on: http://%s", conf.Addr) + if err := r.Run(conf.Addr); err != nil { + logger.Error("start http server failed:%v", err) + } + + }() + + return nil +} +func setupRouter() *gin.Engine { + gin.SetMode(gin.ReleaseMode) + router := gin.New() + router.Use(logger.LoggerDebug()) + router.Use(gin.Recovery()) + + registerAPIs(router) + + return router +} +func registerAPIs(router *gin.Engine) { + logger.Debug("router register") + plugin.GlobalClient.RegisterHandlers(router) + + DBTarget := router.Group("/plugin/" + plugin.GlobalClient.PluginInfo.Name) + { + DBTarget.GET("", func(ctx *gin.Context) { + ctx.JSON(200, `{"hello","world"}`) + }) + } +} diff --git a/atune/utils/enter_tune.go b/atune/server/templete/enter_tune.go similarity index 95% rename from atune/utils/enter_tune.go rename to atune/server/templete/enter_tune.go index 6b73af764f4a272eb711832fcb37585e61d3b96b..1f28c127126393ce15bb9be558670202612f8357 100644 --- a/atune/utils/enter_tune.go +++ b/atune/server/templete/enter_tune.go @@ -1,6 +1,6 @@ -package utils +package templete -import "openeuler.org/PilotGo/atune-plugin/utils/tune" +import "openeuler.org/PilotGo/atune-plugin/templete/tune" const ( Compress = "compress" diff --git a/atune/templete/tuning/Hive/scripts/set_add_random.sh b/atune/server/templete/templete/Hive/scripts/set_add_random.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_add_random.sh rename to atune/server/templete/templete/Hive/scripts/set_add_random.sh diff --git a/atune/templete/tuning/Hive/scripts/set_blockdev.sh b/atune/server/templete/templete/Hive/scripts/set_blockdev.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_blockdev.sh rename to atune/server/templete/templete/Hive/scripts/set_blockdev.sh diff --git a/atune/templete/tuning/Hive/scripts/set_fifo_batch.sh b/atune/server/templete/templete/Hive/scripts/set_fifo_batch.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_fifo_batch.sh rename to atune/server/templete/templete/Hive/scripts/set_fifo_batch.sh diff --git a/atune/templete/tuning/Hive/scripts/set_front_merges.sh b/atune/server/templete/templete/Hive/scripts/set_front_merges.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_front_merges.sh rename to atune/server/templete/templete/Hive/scripts/set_front_merges.sh diff --git a/atune/templete/tuning/Hive/scripts/set_max_sectors_kb.sh b/atune/server/templete/templete/Hive/scripts/set_max_sectors_kb.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_max_sectors_kb.sh rename to atune/server/templete/templete/Hive/scripts/set_max_sectors_kb.sh diff --git a/atune/templete/tuning/Hive/scripts/set_nomerges.sh b/atune/server/templete/templete/Hive/scripts/set_nomerges.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_nomerges.sh rename to atune/server/templete/templete/Hive/scripts/set_nomerges.sh diff --git a/atune/templete/tuning/Hive/scripts/set_nr_requests.sh b/atune/server/templete/templete/Hive/scripts/set_nr_requests.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_nr_requests.sh rename to atune/server/templete/templete/Hive/scripts/set_nr_requests.sh diff --git a/atune/templete/tuning/Hive/scripts/set_queue_depth.sh b/atune/server/templete/templete/Hive/scripts/set_queue_depth.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_queue_depth.sh rename to atune/server/templete/templete/Hive/scripts/set_queue_depth.sh diff --git a/atune/templete/tuning/Hive/scripts/set_read_ahead_kb.sh b/atune/server/templete/templete/Hive/scripts/set_read_ahead_kb.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_read_ahead_kb.sh rename to atune/server/templete/templete/Hive/scripts/set_read_ahead_kb.sh diff --git a/atune/templete/tuning/Hive/scripts/set_read_expire.sh b/atune/server/templete/templete/Hive/scripts/set_read_expire.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_read_expire.sh rename to atune/server/templete/templete/Hive/scripts/set_read_expire.sh diff --git a/atune/templete/tuning/Hive/scripts/set_rotational.sh b/atune/server/templete/templete/Hive/scripts/set_rotational.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_rotational.sh rename to atune/server/templete/templete/Hive/scripts/set_rotational.sh diff --git a/atune/templete/tuning/Hive/scripts/set_rq_affinity.sh b/atune/server/templete/templete/Hive/scripts/set_rq_affinity.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_rq_affinity.sh rename to atune/server/templete/templete/Hive/scripts/set_rq_affinity.sh diff --git a/atune/templete/tuning/Hive/scripts/set_scheduler.sh b/atune/server/templete/templete/Hive/scripts/set_scheduler.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_scheduler.sh rename to atune/server/templete/templete/Hive/scripts/set_scheduler.sh diff --git a/atune/templete/tuning/Hive/scripts/set_write_cache.sh b/atune/server/templete/templete/Hive/scripts/set_write_cache.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_write_cache.sh rename to atune/server/templete/templete/Hive/scripts/set_write_cache.sh diff --git a/atune/templete/tuning/Hive/scripts/set_writes_starved.sh b/atune/server/templete/templete/Hive/scripts/set_writes_starved.sh similarity index 100% rename from atune/templete/tuning/Hive/scripts/set_writes_starved.sh rename to atune/server/templete/templete/Hive/scripts/set_writes_starved.sh diff --git a/atune/templete/tuning/compress/README.md b/atune/server/templete/templete/compress/README.md similarity index 100% rename from atune/templete/tuning/compress/README.md rename to atune/server/templete/templete/compress/README.md diff --git a/atune/templete/tuning/compress/compress.py b/atune/server/templete/templete/compress/compress.py similarity index 100% rename from atune/templete/tuning/compress/compress.py rename to atune/server/templete/templete/compress/compress.py diff --git a/atune/templete/tuning/compress/compress_client.yaml b/atune/server/templete/templete/compress/compress_client.yaml similarity index 100% rename from atune/templete/tuning/compress/compress_client.yaml rename to atune/server/templete/templete/compress/compress_client.yaml diff --git a/atune/templete/tuning/compress/compress_server.yaml b/atune/server/templete/templete/compress/compress_server.yaml similarity index 100% rename from atune/templete/tuning/compress/compress_server.yaml rename to atune/server/templete/templete/compress/compress_server.yaml diff --git a/atune/templete/tuning/compress/enwik8.zip b/atune/server/templete/templete/compress/enwik8.zip similarity index 100% rename from atune/templete/tuning/compress/enwik8.zip rename to atune/server/templete/templete/compress/enwik8.zip diff --git a/atune/templete/tuning/compress/prepare.sh b/atune/server/templete/templete/compress/prepare.sh similarity index 100% rename from atune/templete/tuning/compress/prepare.sh rename to atune/server/templete/templete/compress/prepare.sh diff --git a/atune/templete/tuning/compress_Except_example/README.md b/atune/server/templete/templete/compress_Except_example/README.md similarity index 100% rename from atune/templete/tuning/compress_Except_example/README.md rename to atune/server/templete/templete/compress_Except_example/README.md diff --git a/atune/templete/tuning/compress_Except_example/compress_Except_example.py b/atune/server/templete/templete/compress_Except_example/compress_Except_example.py similarity index 100% rename from atune/templete/tuning/compress_Except_example/compress_Except_example.py rename to atune/server/templete/templete/compress_Except_example/compress_Except_example.py diff --git a/atune/templete/tuning/compress_Except_example/compress_Except_example_client.yaml b/atune/server/templete/templete/compress_Except_example/compress_Except_example_client.yaml similarity index 100% rename from atune/templete/tuning/compress_Except_example/compress_Except_example_client.yaml rename to atune/server/templete/templete/compress_Except_example/compress_Except_example_client.yaml diff --git a/atune/templete/tuning/compress_Except_example/compress_Except_example_server.yaml b/atune/server/templete/templete/compress_Except_example/compress_Except_example_server.yaml similarity index 100% rename from atune/templete/tuning/compress_Except_example/compress_Except_example_server.yaml rename to atune/server/templete/templete/compress_Except_example/compress_Except_example_server.yaml diff --git a/atune/templete/tuning/compress_Except_example/enwik8.zip b/atune/server/templete/templete/compress_Except_example/enwik8.zip similarity index 100% rename from atune/templete/tuning/compress_Except_example/enwik8.zip rename to atune/server/templete/templete/compress_Except_example/enwik8.zip diff --git a/atune/templete/tuning/compress_Except_example/prepare.sh b/atune/server/templete/templete/compress_Except_example/prepare.sh similarity index 100% rename from atune/templete/tuning/compress_Except_example/prepare.sh rename to atune/server/templete/templete/compress_Except_example/prepare.sh diff --git a/atune/templete/tuning/ffmpeg/README.md b/atune/server/templete/templete/ffmpeg/README.md similarity index 100% rename from atune/templete/tuning/ffmpeg/README.md rename to atune/server/templete/templete/ffmpeg/README.md diff --git a/atune/templete/tuning/ffmpeg/ffmpeg_benchmark.sh b/atune/server/templete/templete/ffmpeg/ffmpeg_benchmark.sh similarity index 100% rename from atune/templete/tuning/ffmpeg/ffmpeg_benchmark.sh rename to atune/server/templete/templete/ffmpeg/ffmpeg_benchmark.sh diff --git a/atune/templete/tuning/ffmpeg/ffmpeg_client.yaml b/atune/server/templete/templete/ffmpeg/ffmpeg_client.yaml similarity index 100% rename from atune/templete/tuning/ffmpeg/ffmpeg_client.yaml rename to atune/server/templete/templete/ffmpeg/ffmpeg_client.yaml diff --git a/atune/templete/tuning/ffmpeg/ffmpeg_server.yaml b/atune/server/templete/templete/ffmpeg/ffmpeg_server.yaml similarity index 100% rename from atune/templete/tuning/ffmpeg/ffmpeg_server.yaml rename to atune/server/templete/templete/ffmpeg/ffmpeg_server.yaml diff --git a/atune/templete/tuning/ffmpeg/prepare.sh b/atune/server/templete/templete/ffmpeg/prepare.sh similarity index 100% rename from atune/templete/tuning/ffmpeg/prepare.sh rename to atune/server/templete/templete/ffmpeg/prepare.sh diff --git a/atune/templete/tuning/ffmpeg/report/ffmpeg_optimizing.txt b/atune/server/templete/templete/ffmpeg/report/ffmpeg_optimizing.txt similarity index 100% rename from atune/templete/tuning/ffmpeg/report/ffmpeg_optimizing.txt rename to atune/server/templete/templete/ffmpeg/report/ffmpeg_optimizing.txt diff --git "a/atune/templete/tuning/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\345\237\272\347\272\277\346\212\245\345\221\212.pdf" "b/atune/server/templete/templete/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\345\237\272\347\272\277\346\212\245\345\221\212.pdf" similarity index 100% rename from "atune/templete/tuning/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\345\237\272\347\272\277\346\212\245\345\221\212.pdf" rename to "atune/server/templete/templete/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\345\237\272\347\272\277\346\212\245\345\221\212.pdf" diff --git "a/atune/templete/tuning/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\350\260\203\344\274\230\346\212\245\345\221\212.pdf" "b/atune/server/templete/templete/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\350\260\203\344\274\230\346\212\245\345\221\212.pdf" similarity index 100% rename from "atune/templete/tuning/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\350\260\203\344\274\230\346\212\245\345\221\212.pdf" rename to "atune/server/templete/templete/ffmpeg/report/ffmpeg_v6.0_\346\200\247\350\203\275\350\260\203\344\274\230\346\212\245\345\221\212.pdf" diff --git a/atune/templete/tuning/ffmpeg/report/fundament.txt b/atune/server/templete/templete/ffmpeg/report/fundament.txt similarity index 100% rename from atune/templete/tuning/ffmpeg/report/fundament.txt rename to atune/server/templete/templete/ffmpeg/report/fundament.txt diff --git a/atune/templete/tuning/fio/README.md b/atune/server/templete/templete/fio/README.md similarity index 100% rename from atune/templete/tuning/fio/README.md rename to atune/server/templete/templete/fio/README.md diff --git a/atune/templete/tuning/fio/fio-test.sh b/atune/server/templete/templete/fio/fio-test.sh similarity index 100% rename from atune/templete/tuning/fio/fio-test.sh rename to atune/server/templete/templete/fio/fio-test.sh diff --git a/atune/templete/tuning/fio/prepare.sh b/atune/server/templete/templete/fio/prepare.sh similarity index 100% rename from atune/templete/tuning/fio/prepare.sh rename to atune/server/templete/templete/fio/prepare.sh diff --git a/atune/templete/tuning/fio/tuning_fio_client.yaml b/atune/server/templete/templete/fio/tuning_fio_client.yaml similarity index 100% rename from atune/templete/tuning/fio/tuning_fio_client.yaml rename to atune/server/templete/templete/fio/tuning_fio_client.yaml diff --git a/atune/templete/tuning/fio/tuning_fio_server.yaml b/atune/server/templete/templete/fio/tuning_fio_server.yaml similarity index 100% rename from atune/templete/tuning/fio/tuning_fio_server.yaml rename to atune/server/templete/templete/fio/tuning_fio_server.yaml diff --git a/atune/templete/tuning/gcc_compile/README.md b/atune/server/templete/templete/gcc_compile/README.md similarity index 100% rename from atune/templete/tuning/gcc_compile/README.md rename to atune/server/templete/templete/gcc_compile/README.md diff --git a/atune/templete/tuning/gcc_compile/gcc_compile.sh b/atune/server/templete/templete/gcc_compile/gcc_compile.sh similarity index 100% rename from atune/templete/tuning/gcc_compile/gcc_compile.sh rename to atune/server/templete/templete/gcc_compile/gcc_compile.sh diff --git a/atune/templete/tuning/gcc_compile/gcc_compile_client.yaml b/atune/server/templete/templete/gcc_compile/gcc_compile_client.yaml similarity index 100% rename from atune/templete/tuning/gcc_compile/gcc_compile_client.yaml rename to atune/server/templete/templete/gcc_compile/gcc_compile_client.yaml diff --git a/atune/templete/tuning/gcc_compile/gcc_compile_server.yaml b/atune/server/templete/templete/gcc_compile/gcc_compile_server.yaml similarity index 100% rename from atune/templete/tuning/gcc_compile/gcc_compile_server.yaml rename to atune/server/templete/templete/gcc_compile/gcc_compile_server.yaml diff --git a/atune/templete/tuning/gcc_compile/prepare.sh b/atune/server/templete/templete/gcc_compile/prepare.sh similarity index 100% rename from atune/templete/tuning/gcc_compile/prepare.sh rename to atune/server/templete/templete/gcc_compile/prepare.sh diff --git a/atune/templete/tuning/gcc_compile/stream.c b/atune/server/templete/templete/gcc_compile/stream.c similarity index 100% rename from atune/templete/tuning/gcc_compile/stream.c rename to atune/server/templete/templete/gcc_compile/stream.c diff --git a/atune/templete/tuning/go_gc/README.md b/atune/server/templete/templete/go_gc/README.md similarity index 100% rename from atune/templete/tuning/go_gc/README.md rename to atune/server/templete/templete/go_gc/README.md diff --git a/atune/templete/tuning/go_gc/go_gc.sh b/atune/server/templete/templete/go_gc/go_gc.sh similarity index 100% rename from atune/templete/tuning/go_gc/go_gc.sh rename to atune/server/templete/templete/go_gc/go_gc.sh diff --git a/atune/templete/tuning/go_gc/go_gc_client.yaml b/atune/server/templete/templete/go_gc/go_gc_client.yaml similarity index 100% rename from atune/templete/tuning/go_gc/go_gc_client.yaml rename to atune/server/templete/templete/go_gc/go_gc_client.yaml diff --git a/atune/templete/tuning/go_gc/go_gc_server.yaml b/atune/server/templete/templete/go_gc/go_gc_server.yaml similarity index 100% rename from atune/templete/tuning/go_gc/go_gc_server.yaml rename to atune/server/templete/templete/go_gc/go_gc_server.yaml diff --git a/atune/templete/tuning/go_gc/prepare.sh b/atune/server/templete/templete/go_gc/prepare.sh similarity index 100% rename from atune/templete/tuning/go_gc/prepare.sh rename to atune/server/templete/templete/go_gc/prepare.sh diff --git a/atune/templete/tuning/graphicsmagick/README.md b/atune/server/templete/templete/graphicsmagick/README.md similarity index 100% rename from atune/templete/tuning/graphicsmagick/README.md rename to atune/server/templete/templete/graphicsmagick/README.md diff --git a/atune/templete/tuning/graphicsmagick/gm_benchmark.sh b/atune/server/templete/templete/graphicsmagick/gm_benchmark.sh similarity index 100% rename from atune/templete/tuning/graphicsmagick/gm_benchmark.sh rename to atune/server/templete/templete/graphicsmagick/gm_benchmark.sh diff --git a/atune/templete/tuning/graphicsmagick/gm_client.yaml b/atune/server/templete/templete/graphicsmagick/gm_client.yaml similarity index 100% rename from atune/templete/tuning/graphicsmagick/gm_client.yaml rename to atune/server/templete/templete/graphicsmagick/gm_client.yaml diff --git a/atune/templete/tuning/graphicsmagick/gm_server.yaml b/atune/server/templete/templete/graphicsmagick/gm_server.yaml similarity index 100% rename from atune/templete/tuning/graphicsmagick/gm_server.yaml rename to atune/server/templete/templete/graphicsmagick/gm_server.yaml diff --git a/atune/templete/tuning/graphicsmagick/prepare.sh b/atune/server/templete/templete/graphicsmagick/prepare.sh similarity index 100% rename from atune/templete/tuning/graphicsmagick/prepare.sh rename to atune/server/templete/templete/graphicsmagick/prepare.sh diff --git a/atune/templete/tuning/graphicsmagick/report/GM_fundamant.txt b/atune/server/templete/templete/graphicsmagick/report/GM_fundamant.txt similarity index 100% rename from atune/templete/tuning/graphicsmagick/report/GM_fundamant.txt rename to atune/server/templete/templete/graphicsmagick/report/GM_fundamant.txt diff --git a/atune/templete/tuning/graphicsmagick/report/GM_tuning.txt b/atune/server/templete/templete/graphicsmagick/report/GM_tuning.txt similarity index 100% rename from atune/templete/tuning/graphicsmagick/report/GM_tuning.txt rename to atune/server/templete/templete/graphicsmagick/report/GM_tuning.txt diff --git a/atune/templete/tuning/iozone/README.md b/atune/server/templete/templete/iozone/README.md similarity index 100% rename from atune/templete/tuning/iozone/README.md rename to atune/server/templete/templete/iozone/README.md diff --git a/atune/templete/tuning/iozone/iozone-test.sh b/atune/server/templete/templete/iozone/iozone-test.sh similarity index 100% rename from atune/templete/tuning/iozone/iozone-test.sh rename to atune/server/templete/templete/iozone/iozone-test.sh diff --git a/atune/templete/tuning/iozone/prepare.sh b/atune/server/templete/templete/iozone/prepare.sh similarity index 100% rename from atune/templete/tuning/iozone/prepare.sh rename to atune/server/templete/templete/iozone/prepare.sh diff --git a/atune/templete/tuning/iozone/tuning_iozone_client.yaml b/atune/server/templete/templete/iozone/tuning_iozone_client.yaml similarity index 100% rename from atune/templete/tuning/iozone/tuning_iozone_client.yaml rename to atune/server/templete/templete/iozone/tuning_iozone_client.yaml diff --git a/atune/templete/tuning/iozone/tuning_iozone_server.yaml b/atune/server/templete/templete/iozone/tuning_iozone_server.yaml similarity index 100% rename from atune/templete/tuning/iozone/tuning_iozone_server.yaml rename to atune/server/templete/templete/iozone/tuning_iozone_server.yaml diff --git a/atune/templete/tuning/kafka/README.md b/atune/server/templete/templete/kafka/README.md similarity index 100% rename from atune/templete/tuning/kafka/README.md rename to atune/server/templete/templete/kafka/README.md diff --git a/atune/templete/tuning/kafka/benchmark_on_client.sh b/atune/server/templete/templete/kafka/benchmark_on_client.sh similarity index 100% rename from atune/templete/tuning/kafka/benchmark_on_client.sh rename to atune/server/templete/templete/kafka/benchmark_on_client.sh diff --git a/atune/templete/tuning/kafka/kafka_client.yaml b/atune/server/templete/templete/kafka/kafka_client.yaml similarity index 100% rename from atune/templete/tuning/kafka/kafka_client.yaml rename to atune/server/templete/templete/kafka/kafka_client.yaml diff --git a/atune/templete/tuning/kafka/kafka_server.yaml b/atune/server/templete/templete/kafka/kafka_server.yaml similarity index 100% rename from atune/templete/tuning/kafka/kafka_server.yaml rename to atune/server/templete/templete/kafka/kafka_server.yaml diff --git a/atune/templete/tuning/kafka/launcher_on_server.sh b/atune/server/templete/templete/kafka/launcher_on_server.sh similarity index 100% rename from atune/templete/tuning/kafka/launcher_on_server.sh rename to atune/server/templete/templete/kafka/launcher_on_server.sh diff --git a/atune/templete/tuning/kafka/manager.sh b/atune/server/templete/templete/kafka/manager.sh similarity index 100% rename from atune/templete/tuning/kafka/manager.sh rename to atune/server/templete/templete/kafka/manager.sh diff --git a/atune/templete/tuning/kafka/prepare.sh b/atune/server/templete/templete/kafka/prepare.sh similarity index 100% rename from atune/templete/tuning/kafka/prepare.sh rename to atune/server/templete/templete/kafka/prepare.sh diff --git a/atune/templete/tuning/key_parameters_select/README.md b/atune/server/templete/templete/key_parameters_select/README.md similarity index 100% rename from atune/templete/tuning/key_parameters_select/README.md rename to atune/server/templete/templete/key_parameters_select/README.md diff --git a/atune/templete/tuning/key_parameters_select/key_parameters_select.py b/atune/server/templete/templete/key_parameters_select/key_parameters_select.py similarity index 100% rename from atune/templete/tuning/key_parameters_select/key_parameters_select.py rename to atune/server/templete/templete/key_parameters_select/key_parameters_select.py diff --git a/atune/templete/tuning/key_parameters_select/key_parameters_select_client.yaml b/atune/server/templete/templete/key_parameters_select/key_parameters_select_client.yaml similarity index 100% rename from atune/templete/tuning/key_parameters_select/key_parameters_select_client.yaml rename to atune/server/templete/templete/key_parameters_select/key_parameters_select_client.yaml diff --git a/atune/templete/tuning/key_parameters_select/key_parameters_select_server.yaml b/atune/server/templete/templete/key_parameters_select/key_parameters_select_server.yaml similarity index 100% rename from atune/templete/tuning/key_parameters_select/key_parameters_select_server.yaml rename to atune/server/templete/templete/key_parameters_select/key_parameters_select_server.yaml diff --git a/atune/templete/tuning/key_parameters_select/prepare.sh b/atune/server/templete/templete/key_parameters_select/prepare.sh similarity index 100% rename from atune/templete/tuning/key_parameters_select/prepare.sh rename to atune/server/templete/templete/key_parameters_select/prepare.sh diff --git a/atune/templete/tuning/key_parameters_select_variant/README.md b/atune/server/templete/templete/key_parameters_select_variant/README.md similarity index 100% rename from atune/templete/tuning/key_parameters_select_variant/README.md rename to atune/server/templete/templete/key_parameters_select_variant/README.md diff --git a/atune/templete/tuning/key_parameters_select_variant/key_parameters_select_variant.py b/atune/server/templete/templete/key_parameters_select_variant/key_parameters_select_variant.py similarity index 100% rename from atune/templete/tuning/key_parameters_select_variant/key_parameters_select_variant.py rename to atune/server/templete/templete/key_parameters_select_variant/key_parameters_select_variant.py diff --git a/atune/templete/tuning/key_parameters_select_variant/key_parameters_select_variant_client.yaml b/atune/server/templete/templete/key_parameters_select_variant/key_parameters_select_variant_client.yaml similarity index 100% rename from atune/templete/tuning/key_parameters_select_variant/key_parameters_select_variant_client.yaml rename to atune/server/templete/templete/key_parameters_select_variant/key_parameters_select_variant_client.yaml diff --git a/atune/templete/tuning/key_parameters_select_variant/key_parameters_select_variant_server.yaml b/atune/server/templete/templete/key_parameters_select_variant/key_parameters_select_variant_server.yaml similarity index 100% rename from atune/templete/tuning/key_parameters_select_variant/key_parameters_select_variant_server.yaml rename to atune/server/templete/templete/key_parameters_select_variant/key_parameters_select_variant_server.yaml diff --git a/atune/templete/tuning/key_parameters_select_variant/prepare.sh b/atune/server/templete/templete/key_parameters_select_variant/prepare.sh similarity index 100% rename from atune/templete/tuning/key_parameters_select_variant/prepare.sh rename to atune/server/templete/templete/key_parameters_select_variant/prepare.sh diff --git a/atune/templete/tuning/mariadb/README.md b/atune/server/templete/templete/mariadb/README.md similarity index 100% rename from atune/templete/tuning/mariadb/README.md rename to atune/server/templete/templete/mariadb/README.md diff --git a/atune/templete/tuning/mariadb/mariadb_benchmark.sh b/atune/server/templete/templete/mariadb/mariadb_benchmark.sh similarity index 100% rename from atune/templete/tuning/mariadb/mariadb_benchmark.sh rename to atune/server/templete/templete/mariadb/mariadb_benchmark.sh diff --git a/atune/templete/tuning/mariadb/mariadb_client.yaml b/atune/server/templete/templete/mariadb/mariadb_client.yaml similarity index 100% rename from atune/templete/tuning/mariadb/mariadb_client.yaml rename to atune/server/templete/templete/mariadb/mariadb_client.yaml diff --git a/atune/templete/tuning/mariadb/mariadb_server.yaml b/atune/server/templete/templete/mariadb/mariadb_server.yaml similarity index 100% rename from atune/templete/tuning/mariadb/mariadb_server.yaml rename to atune/server/templete/templete/mariadb/mariadb_server.yaml diff --git a/atune/templete/tuning/mariadb/my.cnf b/atune/server/templete/templete/mariadb/my.cnf similarity index 100% rename from atune/templete/tuning/mariadb/my.cnf rename to atune/server/templete/templete/mariadb/my.cnf diff --git a/atune/templete/tuning/mariadb/prepare.sh b/atune/server/templete/templete/mariadb/prepare.sh similarity index 100% rename from atune/templete/tuning/mariadb/prepare.sh rename to atune/server/templete/templete/mariadb/prepare.sh diff --git a/atune/templete/tuning/memcached/README.md b/atune/server/templete/templete/memcached/README.md similarity index 100% rename from atune/templete/tuning/memcached/README.md rename to atune/server/templete/templete/memcached/README.md diff --git a/atune/templete/tuning/memcached/install_memaslap.sh b/atune/server/templete/templete/memcached/install_memaslap.sh similarity index 100% rename from atune/templete/tuning/memcached/install_memaslap.sh rename to atune/server/templete/templete/memcached/install_memaslap.sh diff --git a/atune/templete/tuning/memcached/memcached b/atune/server/templete/templete/memcached/memcached similarity index 100% rename from atune/templete/tuning/memcached/memcached rename to atune/server/templete/templete/memcached/memcached diff --git a/atune/templete/tuning/memcached/memcached_memaslap_benchmark.sh b/atune/server/templete/templete/memcached/memcached_memaslap_benchmark.sh similarity index 100% rename from atune/templete/tuning/memcached/memcached_memaslap_benchmark.sh rename to atune/server/templete/templete/memcached/memcached_memaslap_benchmark.sh diff --git a/atune/templete/tuning/memcached/memcached_memaslap_client.yaml b/atune/server/templete/templete/memcached/memcached_memaslap_client.yaml similarity index 100% rename from atune/templete/tuning/memcached/memcached_memaslap_client.yaml rename to atune/server/templete/templete/memcached/memcached_memaslap_client.yaml diff --git a/atune/templete/tuning/memcached/memcached_memaslap_server.yaml b/atune/server/templete/templete/memcached/memcached_memaslap_server.yaml similarity index 100% rename from atune/templete/tuning/memcached/memcached_memaslap_server.yaml rename to atune/server/templete/templete/memcached/memcached_memaslap_server.yaml diff --git a/atune/templete/tuning/memcached/prepare.sh b/atune/server/templete/templete/memcached/prepare.sh similarity index 100% rename from atune/templete/tuning/memcached/prepare.sh rename to atune/server/templete/templete/memcached/prepare.sh diff --git a/atune/templete/tuning/memory/Makefile b/atune/server/templete/templete/memory/Makefile similarity index 100% rename from atune/templete/tuning/memory/Makefile rename to atune/server/templete/templete/memory/Makefile diff --git a/atune/templete/tuning/memory/README.md b/atune/server/templete/templete/memory/README.md similarity index 100% rename from atune/templete/tuning/memory/README.md rename to atune/server/templete/templete/memory/README.md diff --git a/atune/templete/tuning/memory/prepare.sh b/atune/server/templete/templete/memory/prepare.sh similarity index 100% rename from atune/templete/tuning/memory/prepare.sh rename to atune/server/templete/templete/memory/prepare.sh diff --git a/atune/templete/tuning/memory/tuning_stream_client.yaml b/atune/server/templete/templete/memory/tuning_stream_client.yaml similarity index 100% rename from atune/templete/tuning/memory/tuning_stream_client.yaml rename to atune/server/templete/templete/memory/tuning_stream_client.yaml diff --git a/atune/templete/tuning/memory/tuning_stream_server.yaml b/atune/server/templete/templete/memory/tuning_stream_server.yaml similarity index 100% rename from atune/templete/tuning/memory/tuning_stream_server.yaml rename to atune/server/templete/templete/memory/tuning_stream_server.yaml diff --git a/atune/templete/tuning/mysql_sysbench/README.md b/atune/server/templete/templete/mysql_sysbench/README.md similarity index 100% rename from atune/templete/tuning/mysql_sysbench/README.md rename to atune/server/templete/templete/mysql_sysbench/README.md diff --git a/atune/templete/tuning/mysql_sysbench/my.cnf b/atune/server/templete/templete/mysql_sysbench/my.cnf similarity index 100% rename from atune/templete/tuning/mysql_sysbench/my.cnf rename to atune/server/templete/templete/mysql_sysbench/my.cnf diff --git a/atune/templete/tuning/mysql_sysbench/mysql_sysbench_benchmark.sh b/atune/server/templete/templete/mysql_sysbench/mysql_sysbench_benchmark.sh similarity index 100% rename from atune/templete/tuning/mysql_sysbench/mysql_sysbench_benchmark.sh rename to atune/server/templete/templete/mysql_sysbench/mysql_sysbench_benchmark.sh diff --git a/atune/templete/tuning/mysql_sysbench/mysql_sysbench_client.yaml b/atune/server/templete/templete/mysql_sysbench/mysql_sysbench_client.yaml similarity index 100% rename from atune/templete/tuning/mysql_sysbench/mysql_sysbench_client.yaml rename to atune/server/templete/templete/mysql_sysbench/mysql_sysbench_client.yaml diff --git a/atune/templete/tuning/mysql_sysbench/mysql_sysbench_server.yaml b/atune/server/templete/templete/mysql_sysbench/mysql_sysbench_server.yaml similarity index 100% rename from atune/templete/tuning/mysql_sysbench/mysql_sysbench_server.yaml rename to atune/server/templete/templete/mysql_sysbench/mysql_sysbench_server.yaml diff --git a/atune/templete/tuning/mysql_sysbench/prepare.sh b/atune/server/templete/templete/mysql_sysbench/prepare.sh similarity index 100% rename from atune/templete/tuning/mysql_sysbench/prepare.sh rename to atune/server/templete/templete/mysql_sysbench/prepare.sh diff --git a/atune/templete/tuning/mysql_sysbench/sysbench_config.cfg b/atune/server/templete/templete/mysql_sysbench/sysbench_config.cfg similarity index 100% rename from atune/templete/tuning/mysql_sysbench/sysbench_config.cfg rename to atune/server/templete/templete/mysql_sysbench/sysbench_config.cfg diff --git a/atune/templete/tuning/nginx/README.md b/atune/server/templete/templete/nginx/README.md similarity index 100% rename from atune/templete/tuning/nginx/README.md rename to atune/server/templete/templete/nginx/README.md diff --git a/atune/templete/tuning/nginx/nginx_benchmark.sh b/atune/server/templete/templete/nginx/nginx_benchmark.sh similarity index 100% rename from atune/templete/tuning/nginx/nginx_benchmark.sh rename to atune/server/templete/templete/nginx/nginx_benchmark.sh diff --git a/atune/templete/tuning/nginx/nginx_client.yaml b/atune/server/templete/templete/nginx/nginx_client.yaml similarity index 100% rename from atune/templete/tuning/nginx/nginx_client.yaml rename to atune/server/templete/templete/nginx/nginx_client.yaml diff --git a/atune/templete/tuning/nginx/nginx_http_long_client.yaml b/atune/server/templete/templete/nginx/nginx_http_long_client.yaml similarity index 100% rename from atune/templete/tuning/nginx/nginx_http_long_client.yaml rename to atune/server/templete/templete/nginx/nginx_http_long_client.yaml diff --git a/atune/templete/tuning/nginx/prepare.sh b/atune/server/templete/templete/nginx/prepare.sh similarity index 100% rename from atune/templete/tuning/nginx/prepare.sh rename to atune/server/templete/templete/nginx/prepare.sh diff --git a/atune/templete/tuning/openGauss/README.md b/atune/server/templete/templete/openGauss/README.md similarity index 100% rename from atune/templete/tuning/openGauss/README.md rename to atune/server/templete/templete/openGauss/README.md diff --git a/atune/templete/tuning/openGauss/openGauss_benchmark.sh b/atune/server/templete/templete/openGauss/openGauss_benchmark.sh similarity index 100% rename from atune/templete/tuning/openGauss/openGauss_benchmark.sh rename to atune/server/templete/templete/openGauss/openGauss_benchmark.sh diff --git a/atune/templete/tuning/openGauss/openGauss_client.yaml b/atune/server/templete/templete/openGauss/openGauss_client.yaml similarity index 100% rename from atune/templete/tuning/openGauss/openGauss_client.yaml rename to atune/server/templete/templete/openGauss/openGauss_client.yaml diff --git a/atune/templete/tuning/openGauss/openGauss_server.yaml b/atune/server/templete/templete/openGauss/openGauss_server.yaml similarity index 100% rename from atune/templete/tuning/openGauss/openGauss_server.yaml rename to atune/server/templete/templete/openGauss/openGauss_server.yaml diff --git a/atune/templete/tuning/openGauss/prepare.sh b/atune/server/templete/templete/openGauss/prepare.sh similarity index 100% rename from atune/templete/tuning/openGauss/prepare.sh rename to atune/server/templete/templete/openGauss/prepare.sh diff --git a/atune/templete/tuning/redis/README.md b/atune/server/templete/templete/redis/README.md similarity index 100% rename from atune/templete/tuning/redis/README.md rename to atune/server/templete/templete/redis/README.md diff --git a/atune/templete/tuning/redis/benchmark.py b/atune/server/templete/templete/redis/benchmark.py similarity index 100% rename from atune/templete/tuning/redis/benchmark.py rename to atune/server/templete/templete/redis/benchmark.py diff --git a/atune/templete/tuning/redis/prepare.sh b/atune/server/templete/templete/redis/prepare.sh similarity index 100% rename from atune/templete/tuning/redis/prepare.sh rename to atune/server/templete/templete/redis/prepare.sh diff --git a/atune/templete/tuning/redis/redis_benchmark.sh b/atune/server/templete/templete/redis/redis_benchmark.sh similarity index 100% rename from atune/templete/tuning/redis/redis_benchmark.sh rename to atune/server/templete/templete/redis/redis_benchmark.sh diff --git a/atune/templete/tuning/redis/redis_benchmark_client.yaml b/atune/server/templete/templete/redis/redis_benchmark_client.yaml similarity index 100% rename from atune/templete/tuning/redis/redis_benchmark_client.yaml rename to atune/server/templete/templete/redis/redis_benchmark_client.yaml diff --git a/atune/templete/tuning/redis/redis_benchmark_server.yaml b/atune/server/templete/templete/redis/redis_benchmark_server.yaml similarity index 100% rename from atune/templete/tuning/redis/redis_benchmark_server.yaml rename to atune/server/templete/templete/redis/redis_benchmark_server.yaml diff --git a/atune/templete/tuning/redis/redis_client.yaml b/atune/server/templete/templete/redis/redis_client.yaml similarity index 100% rename from atune/templete/tuning/redis/redis_client.yaml rename to atune/server/templete/templete/redis/redis_client.yaml diff --git a/atune/templete/tuning/redis/redis_server.yaml b/atune/server/templete/templete/redis/redis_server.yaml similarity index 100% rename from atune/templete/tuning/redis/redis_server.yaml rename to atune/server/templete/templete/redis/redis_server.yaml diff --git a/atune/templete/tuning/spark/README.md b/atune/server/templete/templete/spark/README.md similarity index 100% rename from atune/templete/tuning/spark/README.md rename to atune/server/templete/templete/spark/README.md diff --git a/atune/templete/tuning/spark/run_env.sh b/atune/server/templete/templete/spark/run_env.sh similarity index 100% rename from atune/templete/tuning/spark/run_env.sh rename to atune/server/templete/templete/spark/run_env.sh diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/README.md b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/README.md similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/README.md rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/README.md diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/atune_spark_bench.log b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/atune_spark_bench.log similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/atune_spark_bench.log rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/atune_spark_bench.log diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/install_hibench.sh b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/install_hibench.sh similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/install_hibench.sh rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/install_hibench.sh diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/install_spark.sh b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/install_spark.sh similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/install_spark.sh rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/install_spark.sh diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/spark_hibench.sh b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/spark_hibench.sh similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/spark_hibench.sh rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/spark_hibench.sh diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/spark_hibench_client.yaml b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/spark_hibench_client.yaml similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/spark_hibench_client.yaml rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/spark_hibench_client.yaml diff --git a/atune/templete/tuning/spark/spark_auto_deployment_and_tuning/spark_hibench_server.yaml b/atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/spark_hibench_server.yaml similarity index 100% rename from atune/templete/tuning/spark/spark_auto_deployment_and_tuning/spark_hibench_server.yaml rename to atune/server/templete/templete/spark/spark_auto_deployment_and_tuning/spark_hibench_server.yaml diff --git a/atune/templete/tuning/spark/spark_hibench_template/README b/atune/server/templete/templete/spark/spark_hibench_template/README similarity index 100% rename from atune/templete/tuning/spark/spark_hibench_template/README rename to atune/server/templete/templete/spark/spark_hibench_template/README diff --git a/atune/templete/tuning/spark/spark_hibench_template/prepare.sh b/atune/server/templete/templete/spark/spark_hibench_template/prepare.sh similarity index 100% rename from atune/templete/tuning/spark/spark_hibench_template/prepare.sh rename to atune/server/templete/templete/spark/spark_hibench_template/prepare.sh diff --git a/atune/templete/tuning/spark/spark_hibench_template/spark_hibench_template.sh b/atune/server/templete/templete/spark/spark_hibench_template/spark_hibench_template.sh similarity index 100% rename from atune/templete/tuning/spark/spark_hibench_template/spark_hibench_template.sh rename to atune/server/templete/templete/spark/spark_hibench_template/spark_hibench_template.sh diff --git a/atune/templete/tuning/spark/spark_hibench_template/spark_hibench_template_client.yaml b/atune/server/templete/templete/spark/spark_hibench_template/spark_hibench_template_client.yaml similarity index 100% rename from atune/templete/tuning/spark/spark_hibench_template/spark_hibench_template_client.yaml rename to atune/server/templete/templete/spark/spark_hibench_template/spark_hibench_template_client.yaml diff --git a/atune/templete/tuning/spark/spark_hibench_template/spark_hibench_template_server.yaml b/atune/server/templete/templete/spark/spark_hibench_template/spark_hibench_template_server.yaml similarity index 100% rename from atune/templete/tuning/spark/spark_hibench_template/spark_hibench_template_server.yaml rename to atune/server/templete/templete/spark/spark_hibench_template/spark_hibench_template_server.yaml diff --git a/atune/templete/tuning/tensorflow_train/README.md b/atune/server/templete/templete/tensorflow_train/README.md similarity index 100% rename from atune/templete/tuning/tensorflow_train/README.md rename to atune/server/templete/templete/tensorflow_train/README.md diff --git a/atune/templete/tuning/tensorflow_train/prepare.sh b/atune/server/templete/templete/tensorflow_train/prepare.sh similarity index 100% rename from atune/templete/tuning/tensorflow_train/prepare.sh rename to atune/server/templete/templete/tensorflow_train/prepare.sh diff --git a/atune/templete/tuning/tensorflow_train/tensorflow_train.py b/atune/server/templete/templete/tensorflow_train/tensorflow_train.py similarity index 100% rename from atune/templete/tuning/tensorflow_train/tensorflow_train.py rename to atune/server/templete/templete/tensorflow_train/tensorflow_train.py diff --git a/atune/templete/tuning/tensorflow_train/tensorflow_train_client.yaml b/atune/server/templete/templete/tensorflow_train/tensorflow_train_client.yaml similarity index 100% rename from atune/templete/tuning/tensorflow_train/tensorflow_train_client.yaml rename to atune/server/templete/templete/tensorflow_train/tensorflow_train_client.yaml diff --git a/atune/templete/tuning/tensorflow_train/tensorflow_train_server.yaml b/atune/server/templete/templete/tensorflow_train/tensorflow_train_server.yaml similarity index 100% rename from atune/templete/tuning/tensorflow_train/tensorflow_train_server.yaml rename to atune/server/templete/templete/tensorflow_train/tensorflow_train_server.yaml diff --git a/atune/templete/tuning/tidb/README.md b/atune/server/templete/templete/tidb/README.md similarity index 100% rename from atune/templete/tuning/tidb/README.md rename to atune/server/templete/templete/tidb/README.md diff --git a/atune/templete/tuning/tidb/auto_run.sh b/atune/server/templete/templete/tidb/auto_run.sh similarity index 100% rename from atune/templete/tuning/tidb/auto_run.sh rename to atune/server/templete/templete/tidb/auto_run.sh diff --git a/atune/templete/tuning/tidb/change_config.py b/atune/server/templete/templete/tidb/change_config.py similarity index 100% rename from atune/templete/tuning/tidb/change_config.py rename to atune/server/templete/templete/tidb/change_config.py diff --git a/atune/templete/tuning/tidb/config b/atune/server/templete/templete/tidb/config similarity index 100% rename from atune/templete/tuning/tidb/config rename to atune/server/templete/templete/tidb/config diff --git a/atune/templete/tuning/tidb/config.sh b/atune/server/templete/templete/tidb/config.sh similarity index 100% rename from atune/templete/tuning/tidb/config.sh rename to atune/server/templete/templete/tidb/config.sh diff --git a/atune/templete/tuning/tidb/install-sysbench.sh b/atune/server/templete/templete/tidb/install-sysbench.sh similarity index 100% rename from atune/templete/tuning/tidb/install-sysbench.sh rename to atune/server/templete/templete/tidb/install-sysbench.sh diff --git a/atune/templete/tuning/tidb/install-tidb.sh b/atune/server/templete/templete/tidb/install-tidb.sh similarity index 100% rename from atune/templete/tuning/tidb/install-tidb.sh rename to atune/server/templete/templete/tidb/install-tidb.sh diff --git a/atune/templete/tuning/tidb/prepare.sh b/atune/server/templete/templete/tidb/prepare.sh similarity index 100% rename from atune/templete/tuning/tidb/prepare.sh rename to atune/server/templete/templete/tidb/prepare.sh diff --git a/atune/templete/tuning/tidb/prepare_data.sh b/atune/server/templete/templete/tidb/prepare_data.sh similarity index 100% rename from atune/templete/tuning/tidb/prepare_data.sh rename to atune/server/templete/templete/tidb/prepare_data.sh diff --git a/atune/templete/tuning/tidb/start_tidb.sh b/atune/server/templete/templete/tidb/start_tidb.sh similarity index 100% rename from atune/templete/tuning/tidb/start_tidb.sh rename to atune/server/templete/templete/tidb/start_tidb.sh diff --git a/atune/templete/tuning/tidb/stop_tidb.sh b/atune/server/templete/templete/tidb/stop_tidb.sh similarity index 100% rename from atune/templete/tuning/tidb/stop_tidb.sh rename to atune/server/templete/templete/tidb/stop_tidb.sh diff --git a/atune/templete/tuning/tidb/tidb.sh b/atune/server/templete/templete/tidb/tidb.sh similarity index 100% rename from atune/templete/tuning/tidb/tidb.sh rename to atune/server/templete/templete/tidb/tidb.sh diff --git a/atune/templete/tuning/tidb/tidb_client.yaml b/atune/server/templete/templete/tidb/tidb_client.yaml similarity index 100% rename from atune/templete/tuning/tidb/tidb_client.yaml rename to atune/server/templete/templete/tidb/tidb_client.yaml diff --git a/atune/templete/tuning/tidb/tidb_server.yaml b/atune/server/templete/templete/tidb/tidb_server.yaml similarity index 100% rename from atune/templete/tuning/tidb/tidb_server.yaml rename to atune/server/templete/templete/tidb/tidb_server.yaml diff --git a/atune/templete/tuning/tidb/tikv_config_base.toml b/atune/server/templete/templete/tidb/tikv_config_base.toml similarity index 100% rename from atune/templete/tuning/tidb/tikv_config_base.toml rename to atune/server/templete/templete/tidb/tikv_config_base.toml diff --git a/atune/templete/tuning/tidb/topo.yaml b/atune/server/templete/templete/tidb/topo.yaml similarity index 100% rename from atune/templete/tuning/tidb/topo.yaml rename to atune/server/templete/templete/tidb/topo.yaml diff --git a/atune/templete/tuning/tomcat/README.md b/atune/server/templete/templete/tomcat/README.md similarity index 100% rename from atune/templete/tuning/tomcat/README.md rename to atune/server/templete/templete/tomcat/README.md diff --git a/atune/templete/tuning/tomcat/prepare.sh b/atune/server/templete/templete/tomcat/prepare.sh similarity index 100% rename from atune/templete/tuning/tomcat/prepare.sh rename to atune/server/templete/templete/tomcat/prepare.sh diff --git a/atune/templete/tuning/tomcat/tomcat.yaml b/atune/server/templete/templete/tomcat/tomcat.yaml similarity index 100% rename from atune/templete/tuning/tomcat/tomcat.yaml rename to atune/server/templete/templete/tomcat/tomcat.yaml diff --git a/atune/templete/tuning/tomcat/tomcat_benchmark.sh b/atune/server/templete/templete/tomcat/tomcat_benchmark.sh similarity index 100% rename from atune/templete/tuning/tomcat/tomcat_benchmark.sh rename to atune/server/templete/templete/tomcat/tomcat_benchmark.sh diff --git a/atune/templete/tuning/tomcat/tuning_params_tomcat.yaml b/atune/server/templete/templete/tomcat/tuning_params_tomcat.yaml similarity index 100% rename from atune/templete/tuning/tomcat/tuning_params_tomcat.yaml rename to atune/server/templete/templete/tomcat/tuning_params_tomcat.yaml diff --git a/atune/utils/tune/common.go b/atune/server/templete/tune/common.go similarity index 100% rename from atune/utils/tune/common.go rename to atune/server/templete/tune/common.go diff --git a/atune/utils/tune/compress.go b/atune/server/templete/tune/compress.go similarity index 100% rename from atune/utils/tune/compress.go rename to atune/server/templete/tune/compress.go diff --git a/atune/utils/tune/compress_except.go b/atune/server/templete/tune/compress_except.go similarity index 100% rename from atune/utils/tune/compress_except.go rename to atune/server/templete/tune/compress_except.go diff --git a/atune/utils/tune/ffmpeg.go b/atune/server/templete/tune/ffmpeg.go similarity index 100% rename from atune/utils/tune/ffmpeg.go rename to atune/server/templete/tune/ffmpeg.go diff --git a/atune/utils/tune/fio.go b/atune/server/templete/tune/fio.go similarity index 100% rename from atune/utils/tune/fio.go rename to atune/server/templete/tune/fio.go diff --git a/atune/utils/tune/gcc_compile.go b/atune/server/templete/tune/gcc_compile.go similarity index 100% rename from atune/utils/tune/gcc_compile.go rename to atune/server/templete/tune/gcc_compile.go diff --git a/atune/utils/tune/go_gc.go b/atune/server/templete/tune/go_gc.go similarity index 100% rename from atune/utils/tune/go_gc.go rename to atune/server/templete/tune/go_gc.go diff --git a/atune/utils/tune/graphicsmagick.go b/atune/server/templete/tune/graphicsmagick.go similarity index 100% rename from atune/utils/tune/graphicsmagick.go rename to atune/server/templete/tune/graphicsmagick.go diff --git a/atune/utils/tune/iozone.go b/atune/server/templete/tune/iozone.go similarity index 100% rename from atune/utils/tune/iozone.go rename to atune/server/templete/tune/iozone.go diff --git a/atune/utils/tune/key_parameters_select.go b/atune/server/templete/tune/key_parameters_select.go similarity index 100% rename from atune/utils/tune/key_parameters_select.go rename to atune/server/templete/tune/key_parameters_select.go diff --git a/atune/utils/tune/key_parameters_select_variant.go b/atune/server/templete/tune/key_parameters_select_variant.go similarity index 100% rename from atune/utils/tune/key_parameters_select_variant.go rename to atune/server/templete/tune/key_parameters_select_variant.go diff --git a/atune/utils/tune/mariadb.go b/atune/server/templete/tune/mariadb.go similarity index 100% rename from atune/utils/tune/mariadb.go rename to atune/server/templete/tune/mariadb.go diff --git a/atune/utils/tune/memcached.go b/atune/server/templete/tune/memcached.go similarity index 100% rename from atune/utils/tune/memcached.go rename to atune/server/templete/tune/memcached.go diff --git a/atune/utils/tune/memory.go b/atune/server/templete/tune/memory.go similarity index 100% rename from atune/utils/tune/memory.go rename to atune/server/templete/tune/memory.go diff --git a/atune/utils/tune/mysql_sysbench.go b/atune/server/templete/tune/mysql_sysbench.go similarity index 100% rename from atune/utils/tune/mysql_sysbench.go rename to atune/server/templete/tune/mysql_sysbench.go diff --git a/atune/utils/tune/nginx.go b/atune/server/templete/tune/nginx.go similarity index 100% rename from atune/utils/tune/nginx.go rename to atune/server/templete/tune/nginx.go diff --git a/atune/utils/tune/openGauss.go b/atune/server/templete/tune/openGauss.go similarity index 100% rename from atune/utils/tune/openGauss.go rename to atune/server/templete/tune/openGauss.go diff --git a/atune/utils/tune/redis.go b/atune/server/templete/tune/redis.go similarity index 100% rename from atune/utils/tune/redis.go rename to atune/server/templete/tune/redis.go diff --git a/atune/utils/tune/spark.go b/atune/server/templete/tune/spark.go similarity index 100% rename from atune/utils/tune/spark.go rename to atune/server/templete/tune/spark.go diff --git a/atune/utils/tune/tensorflow_train.go b/atune/server/templete/tune/tensorflow_train.go similarity index 100% rename from atune/utils/tune/tensorflow_train.go rename to atune/server/templete/tune/tensorflow_train.go diff --git a/atune/utils/tune/tidb.go b/atune/server/templete/tune/tidb.go similarity index 100% rename from atune/utils/tune/tidb.go rename to atune/server/templete/tune/tidb.go diff --git a/atune/utils/tune/tomcat.go b/atune/server/templete/tune/tomcat.go similarity index 100% rename from atune/utils/tune/tomcat.go rename to atune/server/templete/tune/tomcat.go diff --git a/go.work b/go.work index 6a7c627239e3c19c1ca47e06c95be81501364e16..4fab5f82104e2d16200f4b2763069a9457e2f6c3 100644 --- a/go.work +++ b/go.work @@ -1,7 +1,7 @@ go 1.19 use ( - ./atune + ./atune/server ./container/server ./sdk ./topology/agent