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.

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

Optimize tenant backup and restore #83

Merged
merged 11 commits into from
Oct 18, 2023

Conversation

powerfooI
Copy link
Collaborator

Summary

  1. Change the meaning of backupPolicy.tenantName from tenant_name of DBA_OB_TENANT database view to tenantName of OBTenant CRD
  2. If type of backup destination is OSS, ossAccessSecret field become required in destination which reference a k8s secret resource containing access_id and access_key that will be used in accessing OSS
  3. Change Makefile an entry of a few building target groups by include make/*.mk

Copy link
Member

@chris-sun-star chris-sun-star left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some type modification, is it capable with the previous release

@@ -30,8 +30,8 @@ type OBTenantBackupPolicySpec struct {
// Important: Run "make" to regenerate code after modifying this file

ObClusterName string `json:"obClusterName"`
TenantName string `json:"tenantName"`
TenantSecret string `json:"tenantSecret"`
TenantName string `json:"tenantName"` // Name of obtenant resource
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this the tenant name in obcluster or cr's name, the previous implementation is tenant name in obcluster

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The field had been changed to refer to name of CR in commit 6966330

@@ -69,6 +69,10 @@ func (c *Coordinator) Coordinate() (ctrl.Result, error) {
return result, errors.Wrapf(err, "Check and update finalizer failed")
}
}
err = c.cleanTaskResultMap(f)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is already fixed in the release branch, maybe it's better to merge the branch before develop next time

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I will merge the branch 2.0.0_relase

@powerfooI
Copy link
Collaborator Author

There's some type modification, is it capable with the previous release

It SHOULD NOT be compatible with branch 2.0.0_release branch now. I will fix the compatibility problem in next PR after thorough tests.

@chris-sun-star chris-sun-star merged commit 1ed4147 into oceanbase:2.0.x_dev Oct 18, 2023
@powerfooI powerfooI deleted the opt/backup branch October 26, 2023 08:34
@powerfooI
Copy link
Collaborator Author

Optimize backup and restore progress #41

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants