Name: {cluster.name}
User: {cluster.user}
diff --git a/web-ui/src/pages/Deployment/index.tsx b/web-ui/src/pages/Deployment/index.tsx
index c674690289..a31172f069 100644
--- a/web-ui/src/pages/Deployment/index.tsx
+++ b/web-ui/src/pages/Deployment/index.tsx
@@ -297,7 +297,7 @@ export default function DeploymentPage() {
}
disabled={operationStatus === undefined}
>
- 预览部署 YAML
+ 预览部署拓扑
From 75a6f185483c7ea8616f42d55924475ff12d9444 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Tue, 25 Aug 2020 22:38:56 +0800
Subject: [PATCH 037/126] refine, only show started steps
---
pkg/cluster/task/step.go | 3 +++
pkg/cluster/task/task.go | 31 ++++++++++++++++++++++---------
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/pkg/cluster/task/step.go b/pkg/cluster/task/step.go
index 8641459e82..8f43b040e0 100644
--- a/pkg/cluster/task/step.go
+++ b/pkg/cluster/task/step.go
@@ -123,6 +123,9 @@ func (s *StepDisplay) handleTaskBegin(task Task) {
}
oneTaskPercentHalf := (100 / len(s.children)) / 2
+ if oneTaskPercentHalf == 0 {
+ oneTaskPercentHalf = 1
+ }
s.progress = s.startedTask*100/len(s.children) + oneTaskPercentHalf
s.startedTask++
diff --git a/pkg/cluster/task/task.go b/pkg/cluster/task/task.go
index 96b46d7d96..8fe1b3a4f1 100644
--- a/pkg/cluster/task/task.go
+++ b/pkg/cluster/task/task.go
@@ -222,28 +222,41 @@ func (s *Serial) ComputeProgress() ([]string, int) {
allStepsCount := 0
finishedSteps := 0
- handleStepDisplay := func(sd *StepDisplay) {
+ handleStepDisplay := func(sd *StepDisplay) string {
allStepsCount++
if sd.progress == 100 {
finishedSteps++
}
- // TODO: refine, not append progress 0 steps?
- stepsStatus = append(stepsStatus, fmt.Sprintf("%s ... %d%%", sd.prefix, sd.progress))
+ if sd.progress > 0 {
+ return fmt.Sprintf("%s ... %d%%", sd.prefix, sd.progress)
+ }
+ return ""
}
for _, step := range s.inner {
+ // for deploy
if sd, ok := step.(*StepDisplay); ok {
- handleStepDisplay(sd)
+ s := handleStepDisplay(sd)
+ if s != "" {
+ stepsStatus = append(stepsStatus, s)
+ }
}
if psd, ok := step.(*ParallelStepDisplay); ok {
- // TODO: refine, not append it if all sub steps progress are 0?
- stepsStatus = append(stepsStatus, psd.prefix)
- for _, s := range psd.inner.inner {
- if sd, ok := s.(*StepDisplay); ok {
- handleStepDisplay(sd)
+ steps := []string{}
+ for _, t := range psd.inner.inner {
+ if sd, ok := t.(*StepDisplay); ok {
+ s := handleStepDisplay(sd)
+ if s != "" {
+ steps = append(steps, s)
+ }
}
}
+ if len(steps) > 0 {
+ stepsStatus = append(stepsStatus, psd.prefix)
+ stepsStatus = append(stepsStatus, steps...)
+ }
}
+ // for scale out
}
progress := 0
From aed394d080783141f7c7cfbe3b09ef2d3ac714da Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Tue, 25 Aug 2020 23:13:23 +0800
Subject: [PATCH 038/126] fix
---
pkg/cluster/task/task.go | 49 +++++++++++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 3 deletions(-)
diff --git a/pkg/cluster/task/task.go b/pkg/cluster/task/task.go
index 8fe1b3a4f1..e7715a32d8 100644
--- a/pkg/cluster/task/task.go
+++ b/pkg/cluster/task/task.go
@@ -65,6 +65,10 @@ type (
Serial struct {
hideDetailDisplay bool
inner []Task
+
+ startedTask int
+ progress int // 0~100
+ curTaskDesc string
}
// Parallel will execute a bundle of task in parallelism way
@@ -185,6 +189,16 @@ func (s *Serial) Execute(ctx *Context) error {
log.Infof("+ [ Serial ] - %s", t.String())
}
}
+
+ // save progress internal
+ oneTaskPercentHalf := (100 / len(s.inner)) / 2
+ if oneTaskPercentHalf == 0 {
+ oneTaskPercentHalf = 1
+ }
+ s.progress = s.startedTask*100/len(s.inner) + oneTaskPercentHalf
+ s.curTaskDesc = t.String()
+ s.startedTask++
+
ctx.ev.PublishTaskBegin(t)
err := t.Execute(ctx)
ctx.ev.PublishTaskFinish(t, err)
@@ -192,6 +206,7 @@ func (s *Serial) Execute(ctx *Context) error {
return err
}
}
+ s.progress = 100
return nil
}
@@ -233,6 +248,17 @@ func (s *Serial) ComputeProgress() ([]string, int) {
return ""
}
+ handleSerial := func(st *Serial) string {
+ allStepsCount++
+ if st.progress == 100 {
+ finishedSteps++
+ }
+ if st.progress > 0 {
+ return fmt.Sprintf("- %s ... %d%%", st.curTaskDesc, st.progress)
+ }
+ return ""
+ }
+
for _, step := range s.inner {
// for deploy
if sd, ok := step.(*StepDisplay); ok {
@@ -256,15 +282,32 @@ func (s *Serial) ComputeProgress() ([]string, int) {
stepsStatus = append(stepsStatus, steps...)
}
}
+
// for scale out
+ if st, ok := step.(*Serial); ok {
+ s := handleSerial(st)
+ if s != "" {
+ stepsStatus = append(stepsStatus, s)
+ }
+ }
+ if pt, ok := step.(*Parallel); ok {
+ for _, t := range pt.inner {
+ if st, ok := t.(*Serial); ok {
+ s := handleSerial(st)
+ if s != "" {
+ stepsStatus = append(stepsStatus, s)
+ }
+ }
+ }
+ }
}
- progress := 0
+ totalProgress := 0
if allStepsCount > 0 {
- progress = finishedSteps * 100 / allStepsCount
+ totalProgress = finishedSteps * 100 / allStepsCount
}
- return stepsStatus, progress
+ return stepsStatus, totalProgress
}
// NewParallel create a Parallel task.
From 9a9213259077a55282f1c86662af6c30342747c7 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Wed, 26 Aug 2020 12:01:53 +0800
Subject: [PATCH 039/126] refine save progress and status for scale out
---
pkg/cluster/manager.go | 13 ++++--
pkg/cluster/task/task.go | 62 +++++++++++----------------
web-ui/src/pages/Deployment/index.tsx | 2 +-
3 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
index 85d7518e79..884d5c2378 100644
--- a/pkg/cluster/manager.go
+++ b/pkg/cluster/manager.go
@@ -1239,9 +1239,16 @@ func (m *Manager) GetOperationStatus() OperationStatus {
Steps: []string{},
}
if operationInfo.curTask != nil {
- steps, progress := operationInfo.curTask.ComputeProgress()
- operationStatus.TotalProgress = progress
- operationStatus.Steps = steps
+ if operationInfo.operationType == "deploy" {
+ steps, progress := operationInfo.curTask.ComputeProgress()
+ operationStatus.TotalProgress = progress
+ operationStatus.Steps = steps
+ } else if operationInfo.operationType == "scaleOut" {
+ operationStatus.TotalProgress = operationInfo.curTask.Progress
+ operationStatus.Steps = []string{}
+ operationStatus.Steps = append(operationStatus.Steps, operationInfo.curTask.Steps...)
+ operationStatus.Steps = append(operationStatus.Steps, operationInfo.curTask.CurTaskSteps...)
+ }
}
if operationInfo.err != nil {
operationStatus.ErrMsg = operationInfo.err.Error()
diff --git a/pkg/cluster/task/task.go b/pkg/cluster/task/task.go
index e7715a32d8..29e1b7fdc7 100644
--- a/pkg/cluster/task/task.go
+++ b/pkg/cluster/task/task.go
@@ -66,9 +66,10 @@ type (
hideDetailDisplay bool
inner []Task
- startedTask int
- progress int // 0~100
- curTaskDesc string
+ startedTasks int
+ Progress int // 0~100
+ CurTaskSteps []string
+ Steps []string
}
// Parallel will execute a bundle of task in parallelism way
@@ -195,21 +196,38 @@ func (s *Serial) Execute(ctx *Context) error {
if oneTaskPercentHalf == 0 {
oneTaskPercentHalf = 1
}
- s.progress = s.startedTask*100/len(s.inner) + oneTaskPercentHalf
- s.curTaskDesc = t.String()
- s.startedTask++
+ s.Progress = s.startedTasks*100/len(s.inner) + oneTaskPercentHalf
+ s.startedTasks++
+ s.saveSteps(t, "Starting")
ctx.ev.PublishTaskBegin(t)
err := t.Execute(ctx)
ctx.ev.PublishTaskFinish(t, err)
if err != nil {
+ s.saveSteps(t, "Error")
return err
}
+ s.saveSteps(t, "Done")
}
- s.progress = 100
+ s.Progress = 100
return nil
}
+// stepStatus: Starting, Error, Done
+func (s *Serial) saveSteps(curTask Task, stepStatus string) {
+ curTaskSteps := strings.Split(curTask.String(), "\n")
+ s.CurTaskSteps = []string{}
+ for _, l := range curTaskSteps {
+ if strings.TrimSpace(l) != "" {
+ s.CurTaskSteps = append(s.CurTaskSteps, fmt.Sprintf("- %s ... %s", l, stepStatus))
+ }
+ }
+ if stepStatus == "Done" {
+ s.Steps = append(s.Steps, s.CurTaskSteps...)
+ s.CurTaskSteps = []string{}
+ }
+}
+
// Rollback implements the Task interface
func (s *Serial) Rollback(ctx *Context) error {
// Rollback in reverse order
@@ -248,19 +266,7 @@ func (s *Serial) ComputeProgress() ([]string, int) {
return ""
}
- handleSerial := func(st *Serial) string {
- allStepsCount++
- if st.progress == 100 {
- finishedSteps++
- }
- if st.progress > 0 {
- return fmt.Sprintf("- %s ... %d%%", st.curTaskDesc, st.progress)
- }
- return ""
- }
-
for _, step := range s.inner {
- // for deploy
if sd, ok := step.(*StepDisplay); ok {
s := handleStepDisplay(sd)
if s != "" {
@@ -282,24 +288,6 @@ func (s *Serial) ComputeProgress() ([]string, int) {
stepsStatus = append(stepsStatus, steps...)
}
}
-
- // for scale out
- if st, ok := step.(*Serial); ok {
- s := handleSerial(st)
- if s != "" {
- stepsStatus = append(stepsStatus, s)
- }
- }
- if pt, ok := step.(*Parallel); ok {
- for _, t := range pt.inner {
- if st, ok := t.(*Serial); ok {
- s := handleSerial(st)
- if s != "" {
- stepsStatus = append(stepsStatus, s)
- }
- }
- }
- }
}
totalProgress := 0
diff --git a/web-ui/src/pages/Deployment/index.tsx b/web-ui/src/pages/Deployment/index.tsx
index a31172f069..c7d884c409 100644
--- a/web-ui/src/pages/Deployment/index.tsx
+++ b/web-ui/src/pages/Deployment/index.tsx
@@ -255,7 +255,7 @@ export default function DeploymentPage() {
title: `开始扩容`,
icon:
,
content:
- '即将开始扩容，请确保在扩容之前已经启动集群，否则扩容将失败！',
+ '即将开始扩容，请确保在扩容之前已经集群已部署成功，否则扩容将失败！',
okText: '扩容',
cancelText: '取消',
onOk: () => handleFinish(values),
From 7896fdca30d9e0b2eead0ec22f60c2ebe6f4d9b7 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 10:55:18 +0800
Subject: [PATCH 040/126] refine
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3406b19d37..df2230a74c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ include ./tests/Makefile
# Build TiUP and all components
build: tiup components
-components: playground client cluster dm bench web server
+components: playground client cluster dm bench web server
tiup:
$(GOBUILD) -ldflags '$(LDFLAGS)' -o bin/tiup
From 023518e5ac32ad3496cbd3ec509cad7e6baaea44 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 11:29:39 +0800
Subject: [PATCH 041/126] update save deploy and scale out status logic
---
components/web/main.go | 4 +-
pkg/cluster/manager.go | 114 ++++++++++++++++++++++++++---------------
2 files changed, 75 insertions(+), 43 deletions(-)
diff --git a/components/web/main.go b/components/web/main.go
index b6c9a64cf2..3dfa850c5b 100644
--- a/components/web/main.go
+++ b/components/web/main.go
@@ -86,7 +86,7 @@ func deployHandler(c *gin.Context) {
tmpfile.Close()
go func() {
- _ = manager.Deploy(
+ manager.DoDeploy(
req.ClusterName,
req.TiDBVersion,
topoFilePath,
@@ -265,7 +265,7 @@ func scaleOutClusterHandler(c *gin.Context) {
tmpfile.Close()
go func() {
- _ = manager.ScaleOut(
+ manager.DoScaleOut(
clusterName,
topoFilePath,
command.PostScaleOutHook,
diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
index 884d5c2378..e1e5ed1baa 100644
--- a/pkg/cluster/manager.go
+++ b/pkg/cluster/manager.go
@@ -56,9 +56,21 @@ var (
operationInfo OperationInfo = OperationInfo{}
)
+// OperationType represents the operation type
+type OperationType string
+
+const (
+ operationDeploy OperationType = "deploy"
+ // operationStart OperationType = "start"
+ // operationStop OperationType = "stop"
+ // operationScaleIn OperationType = "scaleIn"
+ operationScaleOut OperationType = "scaleOut"
+ // operationDestroy OperationType = "destroy"
+)
+
// OperationInfo records latest operation task and related info
type OperationInfo struct {
- operationType string // "deploy" | "scaleOut"
+ operationType OperationType
clusterName string
curTask *task.Serial
err error
@@ -956,6 +968,33 @@ type DeployerInstance interface {
Deploy(b *task.Builder, srcPath string, deployDir string, version string, clusterName string, clusterVersion string)
}
+// DoDeploy do things about deploy
+// TODO: change a method name
+func (m *Manager) DoDeploy(
+ clusterName string,
+ clusterVersion string,
+ topoFile string,
+ opt DeployOptions,
+ afterDeploy func(b *task.Builder, newPart spec.Topology),
+ skipConfirm bool,
+ optTimeout int64,
+ sshTimeout int64,
+ nativeSSH bool,
+) {
+ operationInfo = OperationInfo{operationType: operationDeploy, clusterName: clusterName}
+ operationInfo.err = m.Deploy(
+ clusterName,
+ clusterVersion,
+ topoFile,
+ opt,
+ afterDeploy,
+ skipConfirm,
+ optTimeout,
+ sshTimeout,
+ nativeSSH,
+ )
+}
+
// Deploy a cluster.
func (m *Manager) Deploy(
clusterName string,
@@ -968,18 +1007,13 @@ func (m *Manager) Deploy(
sshTimeout int64,
nativeSSH bool,
) error {
- // reset
- operationInfo = OperationInfo{operationType: "deploy", clusterName: clusterName}
-
if err := clusterutil.ValidateClusterNameOrError(clusterName); err != nil {
- operationInfo.err = err
return err
}
exist, err := m.specManager.Exist(clusterName)
if err != nil {
err = perrs.AddStack(err)
- operationInfo.err = err
return err
}
@@ -988,7 +1022,6 @@ func (m *Manager) Deploy(
err = errDeployNameDuplicate.
New("Cluster name '%s' is duplicated", clusterName).
WithProperty(cliutil.SuggestionFromFormat("Please specify another cluster name"))
- operationInfo.err = err
return err
}
@@ -1000,7 +1033,6 @@ func (m *Manager) Deploy(
// the whole topology back to normal state.
if err := clusterutil.ParseTopologyYaml(topoFile, topo); err != nil &&
!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) {
- operationInfo.err = err
return err
}
@@ -1008,28 +1040,23 @@ func (m *Manager) Deploy(
clusterList, err := m.specManager.GetAllClusters()
if err != nil {
- operationInfo.err = err
return err
}
if err := spec.CheckClusterPortConflict(clusterList, clusterName, topo); err != nil {
- operationInfo.err = err
return err
}
if err := spec.CheckClusterDirConflict(clusterList, clusterName, topo); err != nil {
- operationInfo.err = err
return err
}
if !skipConfirm {
if err := m.confirmTopology(clusterName, clusterVersion, topo, set.NewStringSet()); err != nil {
- operationInfo.err = err
return err
}
}
sshConnProps, err := cliutil.ReadIdentityFileOrPassword(opt.IdentityFile, opt.UsePassword)
if err != nil {
- operationInfo.err = err
return err
}
@@ -1037,7 +1064,6 @@ func (m *Manager) Deploy(
err = errorx.InitializationFailed.
Wrap(err, "Failed to create cluster metadata directory '%s'", m.specManager.Path(clusterName)).
WithProperty(cliutil.SuggestionFromString("Please check file system permissions and try again."))
- operationInfo.err = err
return err
}
@@ -1098,7 +1124,6 @@ func (m *Manager) Deploy(
})
if iterErr != nil {
- operationInfo.err = err
return iterErr
}
@@ -1198,11 +1223,9 @@ func (m *Manager) Deploy(
if err := t.Execute(task.NewContext()); err != nil {
if errorx.Cast(err) != nil {
// FIXME: Map possible task errors and give suggestions.
- operationInfo.err = err
return err
}
err = perrs.AddStack(err)
- operationInfo.err = err
return err
}
@@ -1212,7 +1235,6 @@ func (m *Manager) Deploy(
if err != nil {
err = perrs.AddStack(err)
- operationInfo.err = err
return err
}
@@ -1224,11 +1246,11 @@ func (m *Manager) Deploy(
// OperationStatus represents the current deployment status
type OperationStatus struct {
- OperationType string `json:"operation_type"`
- ClusterName string `json:"cluster_name"`
- TotalProgress int `json:"total_progress"`
- Steps []string `json:"steps"`
- ErrMsg string `json:"err_msg"`
+ OperationType OperationType `json:"operation_type"`
+ ClusterName string `json:"cluster_name"`
+ TotalProgress int `json:"total_progress"`
+ Steps []string `json:"steps"`
+ ErrMsg string `json:"err_msg"`
}
// GetOperationStatus returns the current operations status, including progress, steps, err message
@@ -1239,11 +1261,11 @@ func (m *Manager) GetOperationStatus() OperationStatus {
Steps: []string{},
}
if operationInfo.curTask != nil {
- if operationInfo.operationType == "deploy" {
+ if operationInfo.operationType == operationDeploy {
steps, progress := operationInfo.curTask.ComputeProgress()
operationStatus.TotalProgress = progress
operationStatus.Steps = steps
- } else if operationInfo.operationType == "scaleOut" {
+ } else if operationInfo.operationType == operationScaleOut {
operationStatus.TotalProgress = operationInfo.curTask.Progress
operationStatus.Steps = []string{}
operationStatus.Steps = append(operationStatus.Steps, operationInfo.curTask.Steps...)
@@ -1378,6 +1400,32 @@ func (m *Manager) ScaleIn(
return nil
}
+// DoScaleOut scale out the cluster.
+func (m *Manager) DoScaleOut(
+ clusterName string,
+ topoFile string,
+ afterDeploy func(b *task.Builder, newPart spec.Topology),
+ final func(b *task.Builder, name string, meta spec.Metadata),
+ opt ScaleOutOptions,
+ skipConfirm bool,
+ optTimeout int64,
+ sshTimeout int64,
+ nativeSSH bool,
+) {
+ operationInfo = OperationInfo{operationType: operationScaleOut, clusterName: clusterName}
+ operationInfo.err = m.ScaleOut(
+ clusterName,
+ topoFile,
+ afterDeploy,
+ final,
+ opt,
+ skipConfirm,
+ optTimeout,
+ sshTimeout,
+ nativeSSH,
+ )
+}
+
// ScaleOut scale out the cluster.
func (m *Manager) ScaleOut(
clusterName string,
@@ -1390,13 +1438,9 @@ func (m *Manager) ScaleOut(
sshTimeout int64,
nativeSSH bool,
) error {
- // reset
- operationInfo = OperationInfo{operationType: "scaleOut", clusterName: clusterName}
-
metadata, err := m.meta(clusterName)
if err != nil { // not allowing validation errors
err = perrs.AddStack(err)
- operationInfo.err = err
return err
}
@@ -1405,7 +1449,6 @@ func (m *Manager) ScaleOut(
// not allowing validation errors
if err := topo.Validate(); err != nil {
- operationInfo.err = err
return err
}
@@ -1418,33 +1461,27 @@ func (m *Manager) ScaleOut(
// the whole topology back to normal state.
if err := clusterutil.ParseTopologyYaml(topoFile, newPart); err != nil &&
!errors.Is(perrs.Cause(err), spec.ErrNoTiSparkMaster) {
- operationInfo.err = err
return err
}
if err := validateNewTopo(newPart); err != nil {
- operationInfo.err = err
return err
}
// Abort scale out operation if the merged topology is invalid
mergedTopo := topo.MergeTopo(newPart)
if err := mergedTopo.Validate(); err != nil {
- operationInfo.err = err
return err
}
clusterList, err := m.specManager.GetAllClusters()
if err != nil {
- operationInfo.err = err
return err
}
if err := spec.CheckClusterPortConflict(clusterList, clusterName, mergedTopo); err != nil {
- operationInfo.err = err
return err
}
if err := spec.CheckClusterDirConflict(clusterList, clusterName, mergedTopo); err != nil {
- operationInfo.err = err
return err
}
@@ -1458,21 +1495,18 @@ func (m *Manager) ScaleOut(
if !skipConfirm {
// patchedComponents are components that have been patched and overwrited
if err := m.confirmTopology(clusterName, base.Version, newPart, patchedComponents); err != nil {
- operationInfo.err = err
return err
}
}
sshConnProps, err := cliutil.ReadIdentityFileOrPassword(opt.IdentityFile, opt.UsePassword)
if err != nil {
- operationInfo.err = err
return err
}
// Build the scale out tasks
t, err := buildScaleOutTask(m, clusterName, metadata, mergedTopo, opt, sshConnProps, newPart, patchedComponents, optTimeout, sshTimeout, nativeSSH, afterDeploy, final)
if err != nil {
- operationInfo.err = err
return err
}
@@ -1481,11 +1515,9 @@ func (m *Manager) ScaleOut(
if err := t.Execute(task.NewContext()); err != nil {
if errorx.Cast(err) != nil {
// FIXME: Map possible task errors and give suggestions.
- operationInfo.err = err
return err
}
err = perrs.Trace(err)
- operationInfo.err = err
return err
}
From d59294864ad50fbb49add6efa12bf9f240cb9be2 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 11:38:29 +0800
Subject: [PATCH 042/126] update start cluster, record status as well
---
components/web/main.go | 22 ++++++++++------------
pkg/cluster/manager.go | 12 +++++++++---
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/components/web/main.go b/components/web/main.go
index 3dfa850c5b..c952ca9e0c 100644
--- a/components/web/main.go
+++ b/components/web/main.go
@@ -151,19 +151,17 @@ func destroyClusterHandler(c *gin.Context) {
func startClusterHandler(c *gin.Context) {
clusterName := c.Param("clusterName")
- err := manager.StartCluster(clusterName, operator.Options{
- SSHTimeout: 5,
- OptTimeout: 120,
- APITimeout: 300,
- }, func(b *task.Builder, metadata spec.Metadata) {
- tidbMeta := metadata.(*spec.ClusterMeta)
- b.UpdateTopology(clusterName, tidbMeta, nil)
- })
- if err != nil {
- _ = c.Error(err)
- return
- }
+ go func() {
+ manager.DoStartCluster(clusterName, operator.Options{
+ SSHTimeout: 5,
+ OptTimeout: 120,
+ APITimeout: 300,
+ }, func(b *task.Builder, metadata spec.Metadata) {
+ tidbMeta := metadata.(*spec.ClusterMeta)
+ b.UpdateTopology(clusterName, tidbMeta, nil)
+ })
+ }()
c.Status(http.StatusNoContent)
}
diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
index e1e5ed1baa..d3bfc2e586 100644
--- a/pkg/cluster/manager.go
+++ b/pkg/cluster/manager.go
@@ -61,7 +61,7 @@ type OperationType string
const (
operationDeploy OperationType = "deploy"
- // operationStart OperationType = "start"
+ operationStart OperationType = "start"
// operationStop OperationType = "stop"
// operationScaleIn OperationType = "scaleIn"
operationScaleOut OperationType = "scaleOut"
@@ -92,6 +92,12 @@ func NewManager(sysName string, specManager *spec.SpecManager, bindVersion spec.
}
}
+// DoStartCluster start the cluster with specified name.
+func (m *Manager) DoStartCluster(name string, options operator.Options, fn ...func(b *task.Builder, metadata spec.Metadata)) {
+ operationInfo = OperationInfo{operationType: operationStart, clusterName: name}
+ operationInfo.err = m.StartCluster(name, options, fn...)
+}
+
// StartCluster start the cluster with specified name.
func (m *Manager) StartCluster(name string, options operator.Options, fn ...func(b *task.Builder, metadata spec.Metadata)) error {
log.Infof("Starting cluster %s...", name)
@@ -118,6 +124,7 @@ func (m *Manager) StartCluster(name string, options operator.Options, fn ...func
}
t := b.Build()
+ operationInfo.curTask = t.(*task.Serial)
if err := t.Execute(task.NewContext()); err != nil {
if errorx.Cast(err) != nil {
@@ -1217,7 +1224,6 @@ func (m *Manager) Deploy(
}
t := builder.Build()
-
operationInfo.curTask = t.(*task.Serial)
if err := t.Execute(task.NewContext()); err != nil {
@@ -1265,7 +1271,7 @@ func (m *Manager) GetOperationStatus() OperationStatus {
steps, progress := operationInfo.curTask.ComputeProgress()
operationStatus.TotalProgress = progress
operationStatus.Steps = steps
- } else if operationInfo.operationType == operationScaleOut {
+ } else {
operationStatus.TotalProgress = operationInfo.curTask.Progress
operationStatus.Steps = []string{}
operationStatus.Steps = append(operationStatus.Steps, operationInfo.curTask.Steps...)
From 299c066c7b68ab68513723942cbbb88e1c960972 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 11:43:59 +0800
Subject: [PATCH 043/126] update stop cluster, record status as well
---
components/web/main.go | 17 +++++++----------
pkg/cluster/manager.go | 9 ++++++++-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/components/web/main.go b/components/web/main.go
index c952ca9e0c..312cf74d3c 100644
--- a/components/web/main.go
+++ b/components/web/main.go
@@ -168,16 +168,13 @@ func startClusterHandler(c *gin.Context) {
func stopClusterHandler(c *gin.Context) {
clusterName := c.Param("clusterName")
- err := manager.StopCluster(clusterName, operator.Options{
- SSHTimeout: 5,
- OptTimeout: 120,
- APITimeout: 300,
- })
-
- if err != nil {
- _ = c.Error(err)
- return
- }
+ go func() {
+ manager.DoStopCluster(clusterName, operator.Options{
+ SSHTimeout: 5,
+ OptTimeout: 120,
+ APITimeout: 300,
+ })
+ }()
c.Status(http.StatusNoContent)
}
diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
index d3bfc2e586..886404bbdf 100644
--- a/pkg/cluster/manager.go
+++ b/pkg/cluster/manager.go
@@ -62,7 +62,7 @@ type OperationType string
const (
operationDeploy OperationType = "deploy"
operationStart OperationType = "start"
- // operationStop OperationType = "stop"
+ operationStop OperationType = "stop"
// operationScaleIn OperationType = "scaleIn"
operationScaleOut OperationType = "scaleOut"
// operationDestroy OperationType = "destroy"
@@ -138,6 +138,12 @@ func (m *Manager) StartCluster(name string, options operator.Options, fn ...func
return nil
}
+// DoStopCluster stop the cluster.
+func (m *Manager) DoStopCluster(clusterName string, options operator.Options) {
+ operationInfo = OperationInfo{operationType: operationStop, clusterName: clusterName}
+ operationInfo.err = m.StopCluster(clusterName, options)
+}
+
// StopCluster stop the cluster.
func (m *Manager) StopCluster(clusterName string, options operator.Options) error {
metadata, err := m.meta(clusterName)
@@ -157,6 +163,7 @@ func (m *Manager) StopCluster(clusterName string, options operator.Options) erro
return operator.Stop(ctx, topo, options)
}).
Build()
+ operationInfo.curTask = t.(*task.Serial)
if err := t.Execute(task.NewContext()); err != nil {
if errorx.Cast(err) != nil {
From d3ad4f1de8240eb5ef7ac0fb0059459d93275e9a Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 11:58:31 +0800
Subject: [PATCH 044/126] update scale in cluster, record status as well
---
components/web/main.go | 15 ++++------
pkg/cluster/manager.go | 31 ++++++++++++++++++---
web-ui/src/pages/Clusters/ClusterDetail.tsx | 8 ++----
web-ui/src/pages/Deployment/index.tsx | 1 -
web-ui/src/utils/api.ts | 2 +-
5 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/components/web/main.go b/components/web/main.go
index 312cf74d3c..d14c00f907 100644
--- a/components/web/main.go
+++ b/components/web/main.go
@@ -181,8 +181,8 @@ func stopClusterHandler(c *gin.Context) {
// ScaleInReq represents the request for scale in cluster
type ScaleInReq struct {
- NodeID string `json:"node_id"`
- Force bool `json:"force"`
+ Nodes []string `json:"nodes"`
+ Force bool `json:"force"`
}
func scaleInClusterHandler(c *gin.Context) {
@@ -200,7 +200,7 @@ func scaleInClusterHandler(c *gin.Context) {
APITimeout: 300,
NativeSSH: false,
Force: req.Force,
- Nodes: []string{req.NodeID}}
+ Nodes: req.Nodes}
scale := func(b *task.Builder, imetadata spec.Metadata) {
metadata := imetadata.(*spec.ClusterMeta)
if !gOpt.Force {
@@ -214,12 +214,9 @@ func scaleInClusterHandler(c *gin.Context) {
}
}
- err := manager.ScaleIn(clusterName, true, gOpt.SSHTimeout, gOpt.NativeSSH, gOpt.Force, gOpt.Nodes, scale)
-
- if err != nil {
- _ = c.Error(err)
- return
- }
+ go func() {
+ manager.DoScaleIn(clusterName, true, gOpt.SSHTimeout, gOpt.NativeSSH, gOpt.Force, gOpt.Nodes, scale)
+ }()
c.Status(http.StatusNoContent)
}
diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
index 886404bbdf..1c2f547c49 100644
--- a/pkg/cluster/manager.go
+++ b/pkg/cluster/manager.go
@@ -60,10 +60,10 @@ var (
type OperationType string
const (
- operationDeploy OperationType = "deploy"
- operationStart OperationType = "start"
- operationStop OperationType = "stop"
- // operationScaleIn OperationType = "scaleIn"
+ operationDeploy OperationType = "deploy"
+ operationStart OperationType = "start"
+ operationStop OperationType = "stop"
+ operationScaleIn OperationType = "scaleIn"
operationScaleOut OperationType = "scaleOut"
// operationDestroy OperationType = "destroy"
)
@@ -1291,6 +1291,28 @@ func (m *Manager) GetOperationStatus() OperationStatus {
return operationStatus
}
+// DoScaleIn the cluster.
+func (m *Manager) DoScaleIn(
+ clusterName string,
+ skipConfirm bool,
+ sshTimeout int64,
+ nativeSSH bool,
+ force bool,
+ nodes []string,
+ scale func(builer *task.Builder, metadata spec.Metadata),
+) {
+ operationInfo = OperationInfo{operationType: operationScaleIn, clusterName: clusterName}
+ operationInfo.err = m.ScaleIn(
+ clusterName,
+ skipConfirm,
+ sshTimeout,
+ nativeSSH,
+ force,
+ nodes,
+ scale,
+ )
+}
+
// ScaleIn the cluster.
func (m *Manager) ScaleIn(
clusterName string,
@@ -1399,6 +1421,7 @@ func (m *Manager) ScaleIn(
scale(b, metadata)
t := b.Parallel(regenConfigTasks...).Build()
+ operationInfo.curTask = t.(*task.Serial)
if err := t.Execute(task.NewContext()); err != nil {
if errorx.Cast(err) != nil {
diff --git a/web-ui/src/pages/Clusters/ClusterDetail.tsx b/web-ui/src/pages/Clusters/ClusterDetail.tsx
index 9a88c5b2d1..94a8dcd41a 100644
--- a/web-ui/src/pages/Clusters/ClusterDetail.tsx
+++ b/web-ui/src/pages/Clusters/ClusterDetail.tsx
@@ -79,7 +79,7 @@ export default function ClusterDetailPage() {
},
} as any)
return _columns
- }, [])
+ }, [handleScaleInCluster])
function destroyCluster() {
setDestroying(true)
@@ -157,7 +157,7 @@ export default function ClusterDetailPage() {
setScaleIning(true)
scaleInCluster(clusterName, {
- node_id: node.id,
+ nodes: [node.id],
force,
}).then(({ data, err }) => {
setScaleIning(false)
@@ -173,10 +173,6 @@ export default function ClusterDetailPage() {
})
}
- // function handleScaleOutCluster() {
- // // TODO
- // }
-
if (cluster === undefined) {
return
}
diff --git a/web-ui/src/pages/Deployment/index.tsx b/web-ui/src/pages/Deployment/index.tsx
index c7d884c409..4e35644224 100644
--- a/web-ui/src/pages/Deployment/index.tsx
+++ b/web-ui/src/pages/Deployment/index.tsx
@@ -8,7 +8,6 @@ import {
Form,
Input,
Select,
- message,
} from 'antd'
import uniqid from 'uniqid'
import yaml from 'yaml'
diff --git a/web-ui/src/utils/api.ts b/web-ui/src/utils/api.ts
index 75ca72628c..f4e419bc0e 100644
--- a/web-ui/src/utils/api.ts
+++ b/web-ui/src/utils/api.ts
@@ -38,7 +38,7 @@ export function stopCluster(clusterName: string) {
export function scaleInCluster(
clusterName: string,
- scaleInOpts: { node_id: string; force: boolean }
+ scaleInOpts: { nodes: string[]; force: boolean }
) {
return request(
fullUrl(`clusters/${clusterName}/scale_in`),
From 7000f9328a6b01371297a7f51937f1c69ffb6595 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 12:02:45 +0800
Subject: [PATCH 045/126] update destroy cluster, record status as well
---
components/web/main.go | 17 +++++++----------
pkg/cluster/manager.go | 14 +++++++++++++-
web-ui/src/pages/Deployment/DeploymentTable.tsx | 8 +++++++-
web-ui/src/pages/Deployment/OperationStatus.tsx | 2 +-
web-ui/src/pages/Machines/MachinesTable.tsx | 2 +-
5 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/components/web/main.go b/components/web/main.go
index d14c00f907..455e5d0fd7 100644
--- a/components/web/main.go
+++ b/components/web/main.go
@@ -135,16 +135,13 @@ func clusterHandler(c *gin.Context) {
func destroyClusterHandler(c *gin.Context) {
clusterName := c.Param("clusterName")
- err := manager.DestroyCluster(clusterName, operator.Options{
- SSHTimeout: 5,
- OptTimeout: 120,
- APITimeout: 300,
- }, operator.Options{}, true)
-
- if err != nil {
- _ = c.Error(err)
- return
- }
+ go func() {
+ manager.DoDestroyCluster(clusterName, operator.Options{
+ SSHTimeout: 5,
+ OptTimeout: 120,
+ APITimeout: 300,
+ }, operator.Options{}, true)
+ }()
c.Status(http.StatusNoContent)
}
diff --git a/pkg/cluster/manager.go b/pkg/cluster/manager.go
index 1c2f547c49..351da9529b 100644
--- a/pkg/cluster/manager.go
+++ b/pkg/cluster/manager.go
@@ -65,7 +65,7 @@ const (
operationStop OperationType = "stop"
operationScaleIn OperationType = "scaleIn"
operationScaleOut OperationType = "scaleOut"
- // operationDestroy OperationType = "destroy"
+ operationDestroy OperationType = "destroy"
)
// OperationInfo records latest operation task and related info
@@ -318,6 +318,17 @@ func (m *Manager) CleanCluster(clusterName string, gOpt operator.Options, cleanO
return nil
}
+// DoDestroyCluster destroy the cluster.
+func (m *Manager) DoDestroyCluster(clusterName string, gOpt operator.Options, destroyOpt operator.Options, skipConfirm bool) {
+ operationInfo = OperationInfo{operationType: operationDestroy, clusterName: clusterName}
+ operationInfo.err = m.DestroyCluster(
+ clusterName,
+ gOpt,
+ destroyOpt,
+ skipConfirm,
+ )
+}
+
// DestroyCluster destroy the cluster.
func (m *Manager) DestroyCluster(clusterName string, gOpt operator.Options, destroyOpt operator.Options, skipConfirm bool) error {
metadata, err := m.meta(clusterName)
@@ -352,6 +363,7 @@ func (m *Manager) DestroyCluster(clusterName string, gOpt operator.Options, dest
return operator.Destroy(ctx, topo, destroyOpt)
}).
Build()
+ operationInfo.curTask = t.(*task.Serial)
if err := t.Execute(task.NewContext()); err != nil {
if errorx.Cast(err) != nil {
diff --git a/web-ui/src/pages/Deployment/DeploymentTable.tsx b/web-ui/src/pages/Deployment/DeploymentTable.tsx
index b1e6a18dd0..0806bb54da 100644
--- a/web-ui/src/pages/Deployment/DeploymentTable.tsx
+++ b/web-ui/src/pages/Deployment/DeploymentTable.tsx
@@ -304,7 +304,13 @@ export default function DeploymentTable({
},
},
]
- }, [onAddComponent, onEditComponent, onDeleteComponent, onDeleteComponents])
+ }, [
+ onAddComponent,
+ onEditComponent,
+ onDeleteComponent,
+ onDeleteComponents,
+ globalLoginOptions.username,
+ ])
return (
-
正在执行的操作：{operation_type === 'deploy' ? '部署' : '扩容'}
+
正在执行的操作：{operation_type} cluster
集群：{cluster_name}
执行结果: {result()}
{err_msg && (
diff --git a/web-ui/src/pages/Machines/MachinesTable.tsx b/web-ui/src/pages/Machines/MachinesTable.tsx
index cdb63e2fca..6e8b14a57d 100644
--- a/web-ui/src/pages/Machines/MachinesTable.tsx
+++ b/web-ui/src/pages/Machines/MachinesTable.tsx
@@ -76,7 +76,7 @@ export default function MachinesTable({
),
},
]
- }, [onEdit, onDelete])
+ }, [onEdit, onDelete, globalLoginOptions.username])
return (
Date: Thu, 27 Aug 2020 14:18:50 +0800
Subject: [PATCH 046/126] adjust router
---
web-ui/src/App.tsx | 61 ++++++++-----------------------
web-ui/src/pages/Home/index.tsx | 55 ++++++++++++++++++++++++++++
web-ui/src/pages/Status/index.tsx | 40 ++++++++++++++++++++
3 files changed, 110 insertions(+), 46 deletions(-)
create mode 100644 web-ui/src/pages/Home/index.tsx
create mode 100644 web-ui/src/pages/Status/index.tsx
diff --git a/web-ui/src/App.tsx b/web-ui/src/App.tsx
index 8349c1106f..5ad02a45fe 100644
--- a/web-ui/src/App.tsx
+++ b/web-ui/src/App.tsx
@@ -1,61 +1,30 @@
import React from 'react'
-import {
- BrowserRouter as Router,
- Routes,
- Route,
- NavLink,
- Navigate,
-} from 'react-router-dom'
-import { Layout, Menu } from 'antd'
-import {
- HddOutlined,
- DeploymentUnitOutlined,
- ClusterOutlined,
-} from '@ant-design/icons'
+import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'
import MachinesPage from './pages/Machines'
import DeploymentPage from './pages/Deployment'
import ClustersPage from './pages/Clusters'
-import './App.less'
import ClusterDetailPage from './pages/Clusters/ClusterDetail'
+import StatusPage from './pages/Status'
+import HomePage from './pages/Home'
-const { Sider, Content } = Layout
-
-function SiderMenu() {
- return (
-
-
-
- )
-}
+import './App.less'
function App() {
return (
-
-
-
-
- } />
- } />
- } />
- }>
- } />
-
-
-
-
+
+ } />
+
+ }>
+ }>
+ } />
+
+ } />
+ } />
+
+
)
}
diff --git a/web-ui/src/pages/Home/index.tsx b/web-ui/src/pages/Home/index.tsx
new file mode 100644
index 0000000000..75e342a39a
--- /dev/null
+++ b/web-ui/src/pages/Home/index.tsx
@@ -0,0 +1,55 @@
+import React, { useEffect } from 'react'
+import { NavLink, Outlet, useNavigate } from 'react-router-dom'
+import { Layout, Menu } from 'antd'
+import {
+ HddOutlined,
+ DeploymentUnitOutlined,
+ ClusterOutlined,
+} from '@ant-design/icons'
+import { getStatus } from '../../utils/api'
+
+const { Sider, Content } = Layout
+
+function SiderMenu() {
+ return (
+
+
+
+ )
+}
+
+export default function HomePage() {
+ const navigate = useNavigate()
+
+ useEffect(() => {
+ getStatus().then(({ data }) => {
+ if (data !== undefined) {
+ if (data.total_progress < 100 && data.err_msg === '') {
+ navigate('/status')
+ }
+ }
+ })
+ }, [navigate])
+
+ return (
+
+
+
+
+
+
+ )
+}
diff --git a/web-ui/src/pages/Status/index.tsx b/web-ui/src/pages/Status/index.tsx
new file mode 100644
index 0000000000..0ae4f53844
--- /dev/null
+++ b/web-ui/src/pages/Status/index.tsx
@@ -0,0 +1,40 @@
+import React, { useState, useEffect } from 'react'
+import { Root } from '../../components/Root'
+import OperationStatus, {
+ IOperationStatus,
+} from '../Deployment/OperationStatus'
+import { getStatus } from '../../utils/api'
+
+export default function StatusPage() {
+ const [operationStatus, setOperationStatus] = useState<
+ IOperationStatus | undefined
+ >(undefined)
+
+ useEffect(() => {
+ const id = setInterval(() => {
+ getStatus().then(({ data }) => {
+ if (data !== undefined) {
+ setOperationStatus(data)
+ if (
+ data.total_progress === 100 ||
+ data.err_msg ||
+ data.cluster_name === ''
+ ) {
+ clearInterval(id)
+ }
+ }
+ })
+ }, 2000)
+ return () => clearInterval(id)
+ }, [])
+
+ return (
+
+ {operationStatus ? (
+
+ ) : (
+ Loading...
+ )}
+
+ )
+}
From 6a5400a911dedc7ae830e57db56b3eb8e2859d77 Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 15:09:05 +0800
Subject: [PATCH 047/126] update status page
---
.../src/pages/Deployment/OperationStatus.tsx | 2 +-
web-ui/src/pages/Home/index.tsx | 19 ++++++++++-----
web-ui/src/pages/Status/index.tsx | 24 +++++++++++++++----
3 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/web-ui/src/pages/Deployment/OperationStatus.tsx b/web-ui/src/pages/Deployment/OperationStatus.tsx
index 2bc014e051..b709b94d4f 100644
--- a/web-ui/src/pages/Deployment/OperationStatus.tsx
+++ b/web-ui/src/pages/Deployment/OperationStatus.tsx
@@ -29,7 +29,7 @@ export default function OperationStatus({
if (err_msg) {
return '失败'
} else if (total_progress === 100) {
- return '成功 (请进入 "集群管理" 界面对该集群进行启动，停止，缩容，销毁等操作)'
+ return '成功'
} else {
return '进行中'
}
diff --git a/web-ui/src/pages/Home/index.tsx b/web-ui/src/pages/Home/index.tsx
index 75e342a39a..2f026327bd 100644
--- a/web-ui/src/pages/Home/index.tsx
+++ b/web-ui/src/pages/Home/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
import { NavLink, Outlet, useNavigate } from 'react-router-dom'
import { Layout, Menu } from 'antd'
import {
@@ -11,19 +11,26 @@ import { getStatus } from '../../utils/api'
const { Sider, Content } = Layout
function SiderMenu() {
+ const [curMenu, setCurMenu] = useState('')
+
+ useEffect(() => {
+ const path = window.location.pathname.split('/')[1]
+ setCurMenu(path || '')
+ })
+
return (
-
)
@@ -44,7 +41,11 @@ export default function HomePage() {
useEffect(() => {
getStatus().then(({ data }) => {
if (data !== undefined) {
- if (data.total_progress < 100 && data.err_msg === '') {
+ if (
+ data.cluster_name !== '' &&
+ data.total_progress < 100 &&
+ data.err_msg === ''
+ ) {
navigate('/status')
}
}
diff --git a/web-ui/src/pages/Status/index.tsx b/web-ui/src/pages/Status/index.tsx
index 559f03c2e9..55daad94f7 100644
--- a/web-ui/src/pages/Status/index.tsx
+++ b/web-ui/src/pages/Status/index.tsx
@@ -42,7 +42,8 @@ export default function StatusPage() {
)}
{operationStatus &&
(operationStatus.total_progress === 100 ||
- operationStatus.err_msg) && (
+ operationStatus.err_msg ||
+ operationStatus.cluster_name === '') && (
进入集群管理
From 18b657c286ad9505efbcd2cd5182cc24c336033d Mon Sep 17 00:00:00 2001
From: baurine <2008.hbl@gmail.com>
Date: Thu, 27 Aug 2020 16:19:24 +0800
Subject: [PATCH 049/126] add scale out page
---
web-ui/src/App.tsx | 7 ++++++-
web-ui/src/pages/Clusters/ClusterDetail.tsx | 5 +++++
web-ui/src/pages/Clusters/ClusterScaleOut.tsx | 9 +++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 web-ui/src/pages/Clusters/ClusterScaleOut.tsx
diff --git a/web-ui/src/App.tsx b/web-ui/src/App.tsx
index 5ad02a45fe..f7fb8c70e8 100644
--- a/web-ui/src/App.tsx
+++ b/web-ui/src/App.tsx
@@ -5,9 +5,10 @@ import MachinesPage from './pages/Machines'
import DeploymentPage from './pages/Deployment'
import ClustersPage from './pages/Clusters'
-import ClusterDetailPage from './pages/Clusters/ClusterDetail'
import StatusPage from './pages/Status'
import HomePage from './pages/Home'
+import ClusterScaleOutPage from './pages/Clusters/ClusterScaleOut'
+import ClusterDetailPage from './pages/Clusters/ClusterDetail'
import './App.less'
@@ -20,6 +21,10 @@ function App() {
}>
}>
} />
+ }
+ />
} />
} />
diff --git a/web-ui/src/pages/Clusters/ClusterDetail.tsx b/web-ui/src/pages/Clusters/ClusterDetail.tsx
index 052b7f18cd..6feefd0a9a 100644
--- a/web-ui/src/pages/Clusters/ClusterDetail.tsx
+++ b/web-ui/src/pages/Clusters/ClusterDetail.tsx
@@ -127,6 +127,10 @@ export default function ClusterDetailPage() {
navigate('/status')
}
+ function handleScaleOutCluster() {
+ navigate(`/clusters/${clusterName}/scaleout`)
+ }
+
if (cluster === undefined) {
return
}
@@ -151,6 +155,7 @@ export default function ClusterDetailPage() {
>
+