From 52cf0b1ebe8ec3efb542b88ac2f9a8bf48aab1f6 Mon Sep 17 00:00:00 2001 From: hanxinke Date: Thu, 2 Apr 2020 12:04:22 +0800 Subject: [PATCH] atune: update output and log --- cmd/atuned/atuned.go | 8 +++--- common/config/config.go | 2 +- common/log/log.go | 2 +- common/models/configurator.go | 6 ++-- common/models/monitor.go | 6 ++-- common/models/training.go | 2 +- common/profile/loader.go | 2 +- common/profile/profile.go | 8 +++--- common/profile/profile_rollback.go | 4 +-- common/project/projet.go | 12 ++++---- common/schedule/schedule.go | 8 +++--- common/service/monitor/monitors.go | 4 +-- common/service/pyservice/pyservice.go | 4 +-- common/service/timer/timer.go | 2 +- common/sqlstore/sqlstore.go | 6 ++-- common/tuning/hpre_tuning.go | 6 ++-- common/tuning/optimizer.go | 6 ++-- common/tuning/rule_tuning.go | 2 +- modules/client/profile/profile_define.go | 2 +- modules/server/profile/profile.go | 36 ++++++++++++------------ tests/test_atund_cnf_disk.sh | 2 +- tests/test_atund_cnf_network.sh | 2 +- tests/test_atund_cnf_user.sh | 2 +- 23 files changed, 67 insertions(+), 67 deletions(-) diff --git a/cmd/atuned/atuned.go b/cmd/atuned/atuned.go index 72d7b40..d83cb6d 100644 --- a/cmd/atuned/atuned.go +++ b/cmd/atuned/atuned.go @@ -105,7 +105,7 @@ func doBeforeJob(ctx *cli.Context) error { cfg := config.NewCfg() if err := cfg.Load(); err != nil { log.Errorf("Faild to load config file, error: %v", err) - return fmt.Errorf("faild to load config file, error: %v", err) + return fmt.Errorf("failed to load config file, error: %v", err) } store := &sqlstore.Sqlstore{ @@ -123,7 +123,7 @@ func doBeforeJob(ctx *cli.Context) error { log.Infof("initializing service: %s", service.Name) service.Instance.Set(cfg) if err := service.Instance.Init(); err != nil { - return fmt.Errorf("service init faild: %v", err) + return fmt.Errorf("service init failed: %v", err) } } @@ -138,7 +138,7 @@ func doBeforeJob(ctx *cli.Context) error { go func() { err := backgroundService.Run() if err != nil { - log.Errorf("service %s running faild, reason: %v", service.Name, err) + log.Errorf("service %s running failed, reason: %v", service.Name, err) return } }() @@ -188,7 +188,7 @@ func runatuned(ctx *cli.Context) error { } if err := utils.WaitForPyservice(config.LocalHost, config.RestPort); err != nil { - log.Errorf("waiting for pyservice faild: %v", err) + log.Errorf("waiting for pyservice failed: %v", err) return err } diff --git a/common/config/config.go b/common/config/config.go index 43e5a1d..be9552a 100644 --- a/common/config/config.go +++ b/common/config/config.go @@ -128,7 +128,7 @@ func (c *Cfg) Load() error { cfg, err := ini.Load(defaultConfigFile) if err != nil { - return fmt.Errorf("faild to parse %s, %v", defaultConfigFile, err) + return fmt.Errorf("failed to parse %s, %v", defaultConfigFile, err) } c.Raw = cfg diff --git a/common/log/log.go b/common/log/log.go index 4fc8ff7..11d7e79 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -49,7 +49,7 @@ func InitLogger(modes []string, cfg *ini.File) error { case "syslog": syslogHook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_INFO, "atuned") if err != nil { - baseLogger.Errorf("syslog hook init faild:%v", err) + baseLogger.Errorf("syslog hook init failed:%v", err) } baseLogger.entry.Logger.AddHook(syslogHook) } diff --git a/common/models/configurator.go b/common/models/configurator.go index 3dd2e75..056cf14 100644 --- a/common/models/configurator.go +++ b/common/models/configurator.go @@ -48,7 +48,7 @@ func (c *Configurator) Put() (*RespConfigurator, error) { return nil, fmt.Errorf("section %s is not exist", c.Section) } if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) if err != nil { @@ -77,7 +77,7 @@ func (c *Configurator) Post() (*RespConfigurator, error) { return nil, fmt.Errorf("section %s is not exist", c.Section) } if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) if err != nil { @@ -106,7 +106,7 @@ func (c *Configurator) Get() (*RespConfigurator, error) { return nil, fmt.Errorf("section %s is not exist", c.Section) } if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) diff --git a/common/models/monitor.go b/common/models/monitor.go index 2e6ca88..dad7a3a 100644 --- a/common/models/monitor.go +++ b/common/models/monitor.go @@ -48,7 +48,7 @@ func (m *MonitorBody) Get() (*MonitorGetResp, error) { defer res.Body.Close() if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to monitor service faild") + return nil, fmt.Errorf("connect to monitor service failed") } resBody, err := ioutil.ReadAll(res.Body) @@ -77,12 +77,12 @@ func MonitorGet(module string, purpose string, format string, path string, para respGetIns, err := monitorBody.Get() if err != nil { - log.Errorf("model monitor module %s get data faild: %v", module, err) + log.Errorf("model monitor module %s get data failed: %v", module, err) return "", err } if respGetIns.Status != "OK" { - log.Errorf("model monitor module %s get data faild, error: %s", module, respGetIns.Value) + log.Errorf("model monitor module %s get data failed, error: %s", module, respGetIns.Value) return "", fmt.Errorf(respGetIns.Value) } return respGetIns.Value, nil diff --git a/common/models/training.go b/common/models/training.go index e19b4b1..6712a51 100644 --- a/common/models/training.go +++ b/common/models/training.go @@ -36,7 +36,7 @@ func (t *Training) Post() (bool, error) { defer response.Body.Close() if response.StatusCode != 200 { - return false, fmt.Errorf("training data faild") + return false, fmt.Errorf("training data failed") } return true, nil diff --git a/common/profile/loader.go b/common/profile/loader.go index 22a97c0..e70c6ec 100644 --- a/common/profile/loader.go +++ b/common/profile/loader.go @@ -165,7 +165,7 @@ func LoadFromWorkloadType(workloadType string) (Profile, bool) { classProfile := &sqlstore.GetClass{Class: workloadType} err := sqlstore.GetClasses(classProfile) if err != nil { - log.Errorf("inquery class_profile table faild") + log.Errorf("inquery class_profile table failed") return Profile{}, false } if len(classProfile.Result) == 0 { diff --git a/common/profile/profile.go b/common/profile/profile.go index 7a5b126..4de99fd 100644 --- a/common/profile/profile.go +++ b/common/profile/profile.go @@ -76,7 +76,7 @@ func (c *ConfigPutBody) Put() (*RespPut, error) { } defer res.Body.Close() if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) if err != nil { @@ -101,7 +101,7 @@ func (c *ConfigPutBody) Post() (*RespPut, error) { } defer res.Body.Close() if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) if err != nil { @@ -347,7 +347,7 @@ func (p *Profile) Check(ch chan *PB.AckCheck) error { for _, service := range services { log.Infof("initializing checker service in profile check: %s", service.Name) if err := service.Instance.Init(); err != nil { - return fmt.Errorf("service init faild: %v", err) + return fmt.Errorf("service init failed: %v", err) } } @@ -364,7 +364,7 @@ func (p *Profile) Check(ch chan *PB.AckCheck) error { } err := checkerService.Check(ch) if err != nil { - log.Errorf("service %s running faild, reason: %v", service.Name, err) + log.Errorf("service %s running failed, reason: %v", service.Name, err) continue } } diff --git a/common/profile/profile_rollback.go b/common/profile/profile_rollback.go index cec51a5..e2506fe 100644 --- a/common/profile/profile_rollback.go +++ b/common/profile/profile_rollback.go @@ -57,7 +57,7 @@ func (p *HistoryProfile) Resume(ch chan *PB.AckCheck) error { description := fmt.Sprintf("value: %s", key.Value()) sendChanToAdm(ch, key.Name(), utils.SUCCESS, description) } else { - description := fmt.Sprintf("faild: %s", statusStr) + description := fmt.Sprintf("failed: %s", statusStr) sendChanToAdm(ch, key.Name(), utils.FAILD, description) } } @@ -80,7 +80,7 @@ func (p *HistoryProfile) Load(context string) error { func Rollback() error { profileLogs, err := sqlstore.GetProfileLogs() if err != nil { - log.Errorf("get profile history faild, %v", err) + log.Errorf("get profile history failed, %v", err) return err } diff --git a/common/project/projet.go b/common/project/projet.go index a788a9b..69ccc9e 100644 --- a/common/project/projet.go +++ b/common/project/projet.go @@ -87,13 +87,13 @@ func (y *YamlPrjCli) BenchMark() (string, error) { newScript := strings.Replace(evaluation.Info.Get, "$out", string(benchOutByte), -1) bout, err := ExecCommand(newScript) if err != nil { - err = fmt.Errorf("faild to exec %s, err: %v", newScript, err) + err = fmt.Errorf("failed to exec %s, err: %v", newScript, err) return strings.Join(benchStr, ","), err } floatOut, err := strconv.ParseFloat(strings.Replace(string(bout), "\n", "", -1), 64) if err != nil { - err = fmt.Errorf("faild to parse float, err: %v", err) + err = fmt.Errorf("failed to parse float, err: %v", err) return strings.Join(benchStr, ","), err } @@ -121,7 +121,7 @@ func (y *YamlPrjSvr) RunSet(optStr string) error { for _, obj := range y.Object { out, err := ExecCommand(obj.Info.GetScript) if err != nil { - return fmt.Errorf("faild to exec %s, err: %v", obj.Info.GetScript, err) + return fmt.Errorf("failed to exec %s, err: %v", obj.Info.GetScript, err) } if strings.TrimSpace(string(out)) == paraMap[obj.Name] { @@ -133,7 +133,7 @@ func (y *YamlPrjSvr) RunSet(optStr string) error { log.Info("set script:", newScript) _, err = ExecCommand(newScript) if err != nil { - return fmt.Errorf("faild to exec %s, err: %v", newScript, err) + return fmt.Errorf("failed to exec %s, err: %v", newScript, err) } } return nil @@ -155,13 +155,13 @@ func (y *YamlPrjSvr) RestartProject() error { if needRestart { out, err := ExecCommand(stopWorkload) if err != nil { - return fmt.Errorf("faild to exec %s, err: %v", stopWorkload, err) + return fmt.Errorf("failed to exec %s, err: %v", stopWorkload, err) } log.Debug(string(out)) out, err = ExecCommand(startWorkload) if err != nil { - return fmt.Errorf("faild to exec %s, err: %v", startWorkload, err) + return fmt.Errorf("failed to exec %s, err: %v", startWorkload, err) } log.Debug(string(out)) } diff --git a/common/schedule/schedule.go b/common/schedule/schedule.go index 2f0dbb3..eb57781 100644 --- a/common/schedule/schedule.go +++ b/common/schedule/schedule.go @@ -60,7 +60,7 @@ func (c *ConfigPutBody) Put() (*RespPut, error) { } defer res.Body.Close() if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) if err != nil { @@ -85,7 +85,7 @@ func (c *ConfigPutBody) Get() (*RespPut, error) { } defer res.Body.Close() if res.StatusCode != 200 { - return nil, fmt.Errorf("connect to configurator service faild") + return nil, fmt.Errorf("connect to configurator service failed") } resBody, err := ioutil.ReadAll(res.Body) if err != nil { @@ -182,7 +182,7 @@ func (s *Scheduler) Active(ch chan *PB.AckCheck, itemKeys []string, items map[st for _, service := range services { log.Infof("initializing checker service: %s", service.Name) if err := service.Instance.Init(); err != nil { - return fmt.Errorf("service init faild: %v", err) + return fmt.Errorf("service init failed: %v", err) } } @@ -199,7 +199,7 @@ func (s *Scheduler) Active(ch chan *PB.AckCheck, itemKeys []string, items map[st } err := checkerService.Check(ch) if err != nil { - log.Errorf("service %s running faild, reason: %v", service.Name, err) + log.Errorf("service %s running failed, reason: %v", service.Name, err) continue } } diff --git a/common/service/monitor/monitors.go b/common/service/monitor/monitors.go index b38a9c7..aa0d91e 100644 --- a/common/service/monitor/monitors.go +++ b/common/service/monitor/monitors.go @@ -49,7 +49,7 @@ func (m *Monitor) Set(cfg *config.Cfg) { // Run method start the monitor service func (m *Monitor) Run() error { if err := utils.WaitForPyservice(config.LocalHost, config.RestPort); err != nil { - log.Errorf("waiting for pyservice faild: %v", err) + log.Errorf("waiting for pyservice failed: %v", err) return err } @@ -85,7 +85,7 @@ func (m *Monitor) Run() error { if _, err := models.MonitorGet(strings.ToUpper(modulePurpose[0]), strings.ToUpper(modulePurpose[1]), config.FileFormat, filename, ""); err != nil { - log.Errorf("collect module %s faild, error: %v", module, err) + log.Errorf("collect module %s failed, error: %v", module, err) continue } } diff --git a/common/service/pyservice/pyservice.go b/common/service/pyservice/pyservice.go index 81d98c3..b31ba57 100644 --- a/common/service/pyservice/pyservice.go +++ b/common/service/pyservice/pyservice.go @@ -66,14 +66,14 @@ func (p *PyEngine) Run() error { err := cmd.Start() if err != nil { - log.Errorf("cmd.Start() analysis service faild: %v", err) + log.Errorf("cmd.Start() analysis service failed: %v", err) os.Exit(-1) } err = cmd.Wait() if err != nil { - log.Errorf("cmd.Run() analysis faild with: %v", err) + log.Errorf("cmd.Run() analysis failed with: %v", err) os.Exit(-1) } diff --git a/common/service/timer/timer.go b/common/service/timer/timer.go index 324d9e1..3b8640f 100644 --- a/common/service/timer/timer.go +++ b/common/service/timer/timer.go @@ -54,7 +54,7 @@ func (t *Timer) Set(cfg *config.Cfg) { func (t *Timer) Run() error { /* Static & Dynamic judge */ if err := utils.WaitForPyservice(config.LocalHost, config.RestPort); err != nil { - log.Errorf("waiting for pyservice faild: %v", err) + log.Errorf("waiting for pyservice failed: %v", err) return err } diff --git a/common/sqlstore/sqlstore.go b/common/sqlstore/sqlstore.go index abf4d51..7c1b874 100644 --- a/common/sqlstore/sqlstore.go +++ b/common/sqlstore/sqlstore.go @@ -38,7 +38,7 @@ func (s *Sqlstore) Init() error { err := os.MkdirAll(config.DatabasePath, 0750) if err != nil { - return fmt.Errorf("faild to mkdir: %s(%v)", config.DatabasePath, err) + return fmt.Errorf("failed to mkdir: %s(%v)", config.DatabasePath, err) } dbName := path.Join(config.DatabasePath, config.DatabaseName) @@ -48,7 +48,7 @@ func (s *Sqlstore) Init() error { engine, err = xorm.NewEngine(config.DatabaseType, connStr) if err != nil { - return fmt.Errorf("faild to connect to database: %v", err) + return fmt.Errorf("failed to connect to database: %v", err) } s.engine = engine @@ -68,7 +68,7 @@ func Reload(path string) error { log.Infof("Reload DB: %s", path) engine, err := xorm.NewEngine("sqlite3", connStr) if err != nil { - return fmt.Errorf("faild to connect to database: %v", err) + return fmt.Errorf("failed to connect to database: %v", err) } globalEngine = engine diff --git a/common/tuning/hpre_tuning.go b/common/tuning/hpre_tuning.go index e850967..a3fe729 100644 --- a/common/tuning/hpre_tuning.go +++ b/common/tuning/hpre_tuning.go @@ -57,7 +57,7 @@ func (h *HprePostBody) Get() (*RespHprePost, error) { fmt.Println(res.StatusCode) respBody, err := ioutil.ReadAll(res.Body) fmt.Println(string(respBody), err) - return nil, fmt.Errorf("get hpre support faild") + return nil, fmt.Errorf("get hpre support failed") } respBody, err := ioutil.ReadAll(res.Body) @@ -125,8 +125,8 @@ func IsSupportHpre() (bool, error) { } respGetIns, err := body.Get() if err != nil { - log.Infof("get support_hpre faild") - return false, fmt.Errorf("get support_hpre faild") + log.Infof("get support_hpre failed") + return false, fmt.Errorf("get support_hpre failed") } if respGetIns.Value == "yes" { diff --git a/common/tuning/optimizer.go b/common/tuning/optimizer.go index 75bb0b2..fa2aaab 100644 --- a/common/tuning/optimizer.go +++ b/common/tuning/optimizer.go @@ -93,7 +93,7 @@ func (o *Optimizer) InitTuned(ch chan *PB.AckCheck) error { out, err := project.ExecCommand(item.Info.GetScript) if err != nil { - return fmt.Errorf("faild to exec %s, err: %v", item.Info.GetScript, err) + return fmt.Errorf("failed to exec %s, err: %v", item.Info.GetScript, err) } initConfigure = append(initConfigure, strings.TrimSpace(knob.Name+"="+string(out))) } @@ -265,7 +265,7 @@ func (o *Optimizer) evalParsing(ch chan *PB.AckCheck) (string, error) { func deleteTask(url string) error { resp, err := http.Delete(url) if err != nil { - log.Error("delete task faild:", err) + log.Error("delete task failed:", err) return err } defer resp.Body.Close() @@ -279,7 +279,7 @@ func CheckServerPrj(data string, optimizer *Optimizer) error { if !info.IsDir() { prj := new(project.YamlPrjSvr) if err := utils.ParseFile(path, "yaml", &prj); err != nil { - return fmt.Errorf("load %s faild, err: %v", path, err) + return fmt.Errorf("load %s failed, err: %v", path, err) } log.Infof("project:%s load %s success", prj.Project, path) prjs = append(prjs, prj) diff --git a/common/tuning/rule_tuning.go b/common/tuning/rule_tuning.go index 2dcf1eb..85ce9c4 100644 --- a/common/tuning/rule_tuning.go +++ b/common/tuning/rule_tuning.go @@ -45,7 +45,7 @@ func (r *RuleBody) Post() (*map[string]interface{}, error) { defer res.Body.Close() if res.StatusCode != 200 { log.Errorf("URL: %s, response code: %d", url, res.StatusCode) - return nil, fmt.Errorf("get monitor data faild, url: %s", url) + return nil, fmt.Errorf("get monitor data failed, url: %s", url) } respBody, err := ioutil.ReadAll(res.Body) diff --git a/modules/client/profile/profile_define.go b/modules/client/profile/profile_define.go index 26bbc76..c35ff66 100644 --- a/modules/client/profile/profile_define.go +++ b/modules/client/profile/profile_define.go @@ -78,7 +78,7 @@ func profileDefineCheck(ctx *cli.Context) error { _, err = ini.Load(file) if err != nil { - return fmt.Errorf("load profile faild, file format may be not correct") + return fmt.Errorf("load profile failed, file format may be not correct") } return nil diff --git a/modules/server/profile/profile.go b/modules/server/profile/profile.go index b70e975..16d20b5 100644 --- a/modules/server/profile/profile.go +++ b/modules/server/profile/profile.go @@ -117,7 +117,7 @@ func NewProfileServer(ctx *cli.Context, opts ...interface{}) (interface{}, error cfg, err := ini.Load(defaultConfigFile) if err != nil { - return nil, fmt.Errorf("faild to parse %s, %v", defaultConfigFile, err) + return nil, fmt.Errorf("failed to parse %s, %v", defaultConfigFile, err) } return &ProfileServer{ @@ -146,7 +146,7 @@ func (p *ClassifyPostBody) Post() (*RespClassify, error) { defer response.Body.Close() if response.StatusCode != 200 { - return nil, fmt.Errorf("online learning faild") + return nil, fmt.Errorf("online learning failed") } resBody, err := ioutil.ReadAll(response.Body) if err != nil { @@ -172,7 +172,7 @@ func (c *CollectorPost) Post() (*RespCollectorPost, error) { defer response.Body.Close() if response.StatusCode != 200 { - return nil, fmt.Errorf("collect data faild") + return nil, fmt.Errorf("collect data failed") } resBody, err := ioutil.ReadAll(response.Body) if err != nil { @@ -255,7 +255,7 @@ func (s *ProfileServer) CheckInitProfile(profileInfo *PB.ProfileInfo, for _, service := range services { log.Infof("initializing checker service: %s", service.Name) if err := service.Instance.Init(); err != nil { - return fmt.Errorf("service init faild: %v", err) + return fmt.Errorf("service init failed: %v", err) } } @@ -272,7 +272,7 @@ func (s *ProfileServer) CheckInitProfile(profileInfo *PB.ProfileInfo, } err := checkerService.Check(ch) if err != nil { - log.Errorf("service %s running faild, reason: %v", service.Name, err) + log.Errorf("service %s running failed, reason: %v", service.Name, err) continue } } @@ -291,7 +291,7 @@ func (s *ProfileServer) Analysis(message *PB.AnalysisMessage, stream PB.ProfileM npipe, err := utils.CreateNamedPipe() if err != nil { - return fmt.Errorf("create named pipe faild") + return fmt.Errorf("create named pipe failed") } defer os.Remove(npipe) @@ -369,8 +369,8 @@ func (s *ProfileServer) Analysis(message *PB.AnalysisMessage, stream PB.ProfileM //3. judge the workload type is exist in the database classProfile := &sqlstore.GetClass{Class: workloadType} if err := sqlstore.GetClasses(classProfile); err != nil { - log.Errorf("inquery workload type table faild %v", err) - return fmt.Errorf("inquery workload type table faild %v", err) + log.Errorf("inquery workload type table failed %v", err) + return fmt.Errorf("inquery workload type table failed %v", err) } if len(classProfile.Result) == 0 { log.Errorf("%s is not exist in the table", workloadType) @@ -562,8 +562,8 @@ func (s *ProfileServer) InfoProfile(profileInfo *PB.ProfileInfo, stream PB.Profi classProfile := &sqlstore.GetClass{Class: workloadType} err := sqlstore.GetClasses(classProfile) if err != nil { - log.Errorf("inquery class_profile table faild") - return fmt.Errorf("inquery class_profile table faild") + log.Errorf("inquery class_profile table failed") + return fmt.Errorf("inquery class_profile table failed") } if len(classProfile.Result) == 0 { @@ -818,7 +818,7 @@ func (s *ProfileServer) Training(message *PB.TrainMessage, stream PB.ProfileMgr_ return nil } - _ = stream.Send(&PB.AckCheck{Name: "training the self collect data faild"}) + _ = stream.Send(&PB.AckCheck{Name: "training the self collect data failed"}) return nil } @@ -828,7 +828,7 @@ func (s *ProfileServer) Charaterization(profileInfo *PB.ProfileInfo, stream PB.P npipe, err := utils.CreateNamedPipe() if err != nil { - return fmt.Errorf("create named pipe faild") + return fmt.Errorf("create named pipe failed") } defer os.Remove(npipe) @@ -989,8 +989,8 @@ func (s *ProfileServer) Delete(ctx context.Context, message *PB.DefineMessage) ( // get the profile type from the classprofile table classProfile := &sqlstore.GetClass{Class: workloadType} if err := sqlstore.GetClasses(classProfile); err != nil { - log.Errorf("inquery workload type table faild %v", err) - return &PB.Ack{}, fmt.Errorf("inquery workload type table faild %v", err) + log.Errorf("inquery workload type table failed %v", err) + return &PB.Ack{}, fmt.Errorf("inquery workload type table failed %v", err) } if len(classProfile.Result) == 0 { log.Errorf("%s is not exist in the table", workloadType) @@ -1007,13 +1007,13 @@ func (s *ProfileServer) Delete(ctx context.Context, message *PB.DefineMessage) ( // delete profile depend the profiletype for _, profileName := range profileNames { if err := sqlstore.DeleteProfile(profileName); err != nil { - log.Errorf("delete item from profile table faild %v ", err) + log.Errorf("delete item from profile table failed %v ", err) } } // delete classprofile depend the workloadType if err := sqlstore.DeleteClassProfile(workloadType); err != nil { - log.Errorf("delete item from classprofile tabble faild.") + log.Errorf("delete item from classprofile tabble failed.") return &PB.Ack{}, err } return &PB.Ack{Status: "OK"}, nil @@ -1044,8 +1044,8 @@ func (s *ProfileServer) Update(ctx context.Context, message *PB.DefineMessage) ( // get the profile type from the classprofile table classProfile := &sqlstore.GetClass{Class: workloadType} if err := sqlstore.GetClasses(classProfile); err != nil { - log.Errorf("inquery workload type table faild %v", err) - return &PB.Ack{}, fmt.Errorf("inquery workload type table faild %v", err) + log.Errorf("inquery workload type table failed %v", err) + return &PB.Ack{}, fmt.Errorf("inquery workload type table failed %v", err) } if len(classProfile.Result) == 0 { log.Errorf("%s is not exist in the table", workloadType) diff --git a/tests/test_atund_cnf_disk.sh b/tests/test_atund_cnf_disk.sh index ad677c9..98e9c33 100644 --- a/tests/test_atund_cnf_disk.sh +++ b/tests/test_atund_cnf_disk.sh @@ -55,7 +55,7 @@ test01() atune-adm analysis > $ANALYSIS_LOG check_result $? 1 - grep "collect data faild" $ANALYSIS_LOG + grep "collect data failed" $ANALYSIS_LOG check_result $? 0 done diff --git a/tests/test_atund_cnf_network.sh b/tests/test_atund_cnf_network.sh index 3c0e1d9..d3aa0ee 100644 --- a/tests/test_atund_cnf_network.sh +++ b/tests/test_atund_cnf_network.sh @@ -63,7 +63,7 @@ test01() atune-adm analysis > $ANALYSIS_LOG check_result $? 1 - grep "collect data faild" $ANALYSIS_LOG + grep "collect data failed" $ANALYSIS_LOG check_result $? 0 fi done diff --git a/tests/test_atund_cnf_user.sh b/tests/test_atund_cnf_user.sh index 0916622..c9cbbb7 100644 --- a/tests/test_atund_cnf_user.sh +++ b/tests/test_atund_cnf_user.sh @@ -55,7 +55,7 @@ test01() atune-adm analysis > $ANALYSIS_LOG check_result $? 1 - grep "collect data faild" $ANALYSIS_LOG + grep "collect data failed" $ANALYSIS_LOG check_result $? 0 done -- GitLab