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

Jump to bottom

fix: upgrade api and support sqlite with raft backend #567

Merged
merged 4 commits into from
May 23, 2024
Merged

fix: upgrade api and support sqlite with raft backend #567

merged 4 commits into from
May 23, 2024

Conversation

shanshanying
Copy link
Contributor

@shanshanying shanshanying commented May 21, 2024 •
edited
Loading

  • fix [Improvement] upgrade orchestrator addon #552
    in STS, podManagementPolicy and updateStrategy are used to deal with provision and update scenarios resp.
    the question here is how to provision multiple pod in parallel ( so that they form a valid peers as soon as possible) and update takes effects one by one.

supported two modes to provision an orc cluster, namely

  • raft mode
  • share-end mode

And add role proble, health check to each mode.
Both mode supports hscale, vscale, but no reconfiguration. (in RAFT mode, we'd better restart the cluster are hscale)

image

RAFT mode

To create such a cluster with RAFT mode, simply use

 helm install myorc-raft ./addons/orchestrator-cluster  --set mode=raft

Share-end mode

To create a cluster with SHARE-END mode,

  • step 1. firstly we provisioin a raft-group mysql cluster (Apecloud MySQL)
    with audilog and proxy enabled
helm install mycluster ./addons/apecloud-mysql-cluster --set auditLogEnabled=true,proxyEnabled=true,mode=raftGroup
  • step 2. then we create a shareend orc cluster:
 helm install myorc-raft ./addons/orchestrator-cluster  --set mode=shareend --set serviceReference.metadb.cluster="mycluster"

remember, the mycluster name refers to the apecloud-mysql cluster we created in step 1.



##  Open Orchestrator Dashboard
port-forward the svc to local
```bash
k port-forward svc/myorc-raft-orchestrator 3000:80

and go to address localhost:3000 in your browser.
image

@shanshanying shanshanying marked this pull request as draft May 21, 2024 14:39
@shanshanying shanshanying marked this pull request as ready for review May 22, 2024 13:16
@shanshanying
fix: upgrade api and support sqllit with raft backend
c0cfe3f 
use Paralle strategy to provision pods in parallel

support raft mode

use BestEfforParalle for both mode update svc

fixed user names to orchestrator
@shanshanying shanshanying merged commit d8374b5 into main May 23, 2024
2 checks passed
@shanshanying shanshanying deleted the bugfix/upgrade-orchestrator branch May 23, 2024 05:03
@shanshanying
Copy link
Contributor Author

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): addons/mysql/scripts/init-meta-database.sh deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/mysql/scripts/init-meta-database.sh left in tree.
CONFLICT (modify/delete): addons/orchestrator-cluster/Chart.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator-cluster/Chart.yaml left in tree.
CONFLICT (modify/delete): addons/orchestrator-cluster/templates/_helpers.tpl deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator-cluster/templates/_helpers.tpl left in tree.
CONFLICT (modify/delete): addons/orchestrator-cluster/templates/cluster.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator-cluster/templates/cluster.yaml left in tree.
CONFLICT (modify/delete): addons/orchestrator-cluster/values.schema.json deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator-cluster/values.schema.json left in tree.
CONFLICT (modify/delete): addons/orchestrator-cluster/values.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator-cluster/values.yaml left in tree.
CONFLICT (modify/delete): addons/orchestrator/Chart.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/Chart.yaml left in tree.
CONFLICT (rename/delete): addons/orchestrator/config/orchestrator.tpl renamed to addons/orchestrator/configs/orchestrator.tpl in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)), but deleted in HEAD.
CONFLICT (modify/delete): addons/orchestrator/configs/orchestrator.tpl deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/configs/orchestrator.tpl left in tree.
CONFLICT (modify/delete): addons/orchestrator/scripts/init-meta-database.sh deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/scripts/init-meta-database.sh left in tree.
CONFLICT (modify/delete): addons/orchestrator/templates/_helpers.tpl deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/templates/_helpers.tpl left in tree.
CONFLICT (modify/delete): addons/orchestrator/templates/clusterdefinition.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/templates/clusterdefinition.yaml left in tree.
CONFLICT (modify/delete): addons/orchestrator/templates/scripts.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/templates/scripts.yaml left in tree.
CONFLICT (modify/delete): addons/orchestrator/values.yaml deleted in HEAD and modified in d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)). Version d8374b5 (fix: upgrade api and support sqllit with raft backend (#567)) of addons/orchestrator/values.yaml left in tree.
error: could not apply d8374b5... fix: upgrade api and support sqllit with raft backend (#567)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks-addons/actions/runs/9202492365

@shanshanying shanshanying changed the title fix: upgrade api and support sqllit with raft backend fix: upgrade api and support sqlite with raft backend May 23, 2024
@shanshanying shanshanying mentioned this pull request May 23, 2024
Merged
This was referenced Jul 8, 2024
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xuriwuyun xuriwuyun xuriwuyun approved these changes

@leon-inf leon-inf leon-inf approved these changes

@nayutah nayutah Awaiting requested review from nayutah nayutah is a code owner

@ldming ldming Awaiting requested review from ldming ldming is a code owner

@heng4fun heng4fun Awaiting requested review from heng4fun heng4fun is a code owner

@free6om free6om Awaiting requested review from free6om free6om is a code owner

@wangyelei wangyelei Awaiting requested review from wangyelei wangyelei is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Improvement] upgrade orchestrator addon
4 participants
@shanshanying @apecloud-bot @xuriwuyun @leon-inf