Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tiup: check update before run component #1718

Merged
merged 5 commits into from
Jan 13, 2022
Merged

tiup: check update before run component #1718

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bed34f4
tiup: check update before run component
nexustar Jan 11, 2022
2325bfe
Merge branch 'master' into new_runcomponent
nexustar Jan 11, 2022
14397af
use 2s as check update timeout
nexustar Jan 12, 2022
12d3a53
Merge branch 'master' into new_runcomponent
nexustar Jan 12, 2022
7c89f29
Merge branch 'master' into new_runcomponent
AstroProfundis Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 36 additions & 31 deletions pkg/exec/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,42 @@ import (
// RunComponent start a component and wait it
func RunComponent(env *environment.Environment, tag, spec, binPath string, args []string) error {
component, version := environment.ParseCompVersion(spec)

if version == "" {
fmt.Fprintf(os.Stderr, "tiup is checking updates for component %s ...", component)
updateC := make(chan string)
// timeout for check update
go func() {
time.Sleep(10 * time.Second)
nexustar marked this conversation as resolved.
Show resolved Hide resolved
updateC <- "timeout!"
}()

go func() {
var updateInfo string
if version.IsEmpty() {
latestV, _, err := env.V1Repository().LatestStableVersion(component, false)
if err != nil {
return
}
selectVer, _ := env.SelectInstalledVersion(component, version)

if semver.Compare(selectVer.String(), latestV.String()) < 0 {
updateInfo = fmt.Sprint(color.YellowString(`
Found %[1]s newer version:
The latest version: %[2]s
Local installed version: %[3]s
Update current component: tiup update %[1]s
Update all components: tiup update --all
`,
component, latestV.String(), selectVer.String()))
}
}
updateC <- updateInfo
}()

fmt.Fprintln(os.Stderr, <-updateC)
}

ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand Down Expand Up @@ -66,7 +102,6 @@ func RunComponent(env *environment.Environment, tag, spec, binPath string, args
var sig syscall.Signal
sc := make(chan os.Signal, 1)
signal.Notify(sc, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
updateC := make(chan string)

defer func() {
for err := range ch {
Expand All @@ -87,35 +122,6 @@ func RunComponent(env *environment.Environment, tag, spec, binPath string, args
ch <- p.Cmd.Wait()
}()

// timeout for check update
go func() {
time.Sleep(2 * time.Second)
updateC <- ""
}()

go func() {
var updateInfo string
if version.IsEmpty() {
latestV, _, err := env.V1Repository().LatestStableVersion(p.Component, false)
if err != nil {
return
}
selectVer, _ := env.SelectInstalledVersion(component, version)

if semver.Compare(selectVer.String(), latestV.String()) < 0 {
updateInfo = fmt.Sprint(color.YellowString(`
Found %[1]s newer version:
The latest version: %[2]s
Local installed version: %[3]s
Update current component: tiup update %[1]s
Update all components: tiup update --all
`,
p.Component, latestV.String(), selectVer.String()))
}
}
updateC <- updateInfo
}()

select {
case s := <-sc:
sig = s.(syscall.Signal)
Expand All @@ -129,7 +135,6 @@ Found %[1]s newer version:
return nil

case err := <-ch:
defer fmt.Fprint(os.Stderr, <-updateC)
return errors.Annotatef(err, "run `%s` (wd:%s) failed", p.Exec, p.Dir)
}
}
Expand Down