add binlog deploy and check process #329
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
weekface
reviewed
Mar 20, 2019
| defer func() { | ||
| glog.Infof("deploy incremental backup end cluster[%s] namespace[%s]", to.ClusterName, to.Namespace) | ||
| }() | ||
| sets := map[string]string{ |
There was a problem hiding this comment.
merge these with from sets
tests/actions.go
Outdated
| cmd := fmt.Sprintf("helm install /charts/%s/tidb-cluster --name %s --namespace %s --set-string %s", | ||
| info.OperatorTag, info.ClusterName, info.Namespace, info.HelmSetString()) | ||
| info.OperatorTag, info.ClusterName, info.Namespace, info.HelmSetString(map[string]string{})) |
There was a problem hiding this comment.
map[string]string{} -> nil
tests/actions.go
Outdated
| @@ -414,7 +428,7 @@ func chartPath(name string, tag string) string { | |||
|
|
|||
| func (oa *operatorActions) ScaleTidbCluster(info *TidbClusterInfo) error { | |||
| cmd := fmt.Sprintf("helm upgrade %s %s --set-string %s", | |||
| info.ClusterName, chartPath("tidb-cluster", info.OperatorTag), info.HelmSetString()) | |||
| info.ClusterName, chartPath("tidb-cluster", info.OperatorTag), info.HelmSetString(map[string]string{})) | |||
tests/actions.go
Outdated
| @@ -425,7 +439,7 @@ func (oa *operatorActions) ScaleTidbCluster(info *TidbClusterInfo) error { | |||
|
|
|||
| func (oa *operatorActions) UpgradeTidbCluster(info *TidbClusterInfo) error { | |||
| cmd := fmt.Sprintf("helm upgrade %s %s --set-string %s", | |||
| info.ClusterName, chartPath("tidb-cluster", info.OperatorTag), info.HelmSetString()) | |||
| info.ClusterName, chartPath("tidb-cluster", info.OperatorTag), info.HelmSetString(map[string]string{})) | |||
aylei
reviewed
Mar 20, 2019
tests/actions.go
Outdated
| return nil, err | ||
| } | ||
|
|
||
| if err != nil { |
There was a problem hiding this comment.
It seems you are right
aylei
reviewed
Mar 20, 2019
| @@ -1458,13 +1448,19 @@ func (oa *operatorActions) getBackupDir(info *TidbClusterInfo) ([]string, error) | |||
| } | |||
|
|
|||
| cmd := fmt.Sprintf("kubectl exec %s -n %s ls /data", getBackupDirPodName, info.Namespace) | |||
| glog.Infof(cmd) | |||
|
|
|||
| time.Sleep(20 * time.Second) | |||
There was a problem hiding this comment.
Can we poll the following condition so we can proceed on earlier if condition meet?
There was a problem hiding this comment.
I try to poll at first but the time is hard to controller in one minute. for every minute generate a cronjob to backup. At last we have to check the backup number.
weekface
approved these changes
Mar 20, 2019
tests/actions.go
Outdated
| initSecretName := "set-secret" | ||
| backupSecretName := "backup-secret" | ||
| func (oa *operatorActions) CreateSecret(info *TidbClusterInfo) (string, string, error) { | ||
| initSecretName := fmt.Sprintf("%s-set-secret", info.ClusterName) |
There was a problem hiding this comment.
the field should be set when info created
xiaojingchen
approved these changes
Mar 20, 2019
weekface
pushed a commit
to weekface/tidb-operator
that referenced
this pull request
Mar 21, 2019
tennix
pushed a commit
that referenced
this pull request
Mar 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1 add binlog deployment
2 add binlog check
3 change the main process
@weekface @xiaojingchen @zyguan @cwen0 PTAL