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

feat: Doris Cluster Addon #183

Merged
merged 3 commits into from
Jan 5, 2024
Merged

Conversation

yuqun20230302
Copy link
Contributor

@yuqun20230302 yuqun20230302 commented Jan 4, 2024

Doris Cluster Addon Support

@shanshanying shanshanying changed the title Doris Cluster Addon feat: Doris Cluster Addon Jan 4, 2024

if [[ -n "$FE_SERVERS" && -n "$BE_ADDR" ]]; then
RUN_TYPE="ELECTION"
if [[ $FE_SERVERS =~ ^.+:[1-2]{0,1}[0-9]{0,1}[0-9]{1}(\.[1-2]{0,1}[0-9]{0,1}[0-9]{1}){3}:[1-6]{0,1}[0-9]{1,4}(,.+:[1-2]{0,1}[0-9]{0,1}[0-9]{1}(\.[1-2]{0,1}[0-9]{0,1}[0-9]{1}){3}:[1-6]{0,1}[0-9]{1,4})*$ || $FE_SERVERS =~ ^.+:([0-9a-fA-F]{1,4}:){7,7}([0-9a-fA-F]{1,4}|:)|([0-9a-fA-F]{1,4}:){1,6}(:[0-9a-fA-F]{1,4}|:)|([0-9a-fA-F]{1,4}:){1,5}((:[0-9a-fA-F]{1,4}){1,2}|:)|([0-9a-fA-F]{1,4}:){1,4}((:[0-9a-fA-F]{1,4}){1,3}|:)|([0-9a-fA-F]{1,4}:){1,3}((:[0-9a-fA-F]{1,4}){1,4}|:)|([0-9a-fA-F]{1,4}:){1,2}((:[0-9a-fA-F]{1,4}){1,5}|:)|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6}|:)|:((:[0-9a-fA-F]{1,4}){1,7}|:)$ ]]; then
Copy link
Collaborator

Choose a reason for hiding this comment

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

please don't copy the code and move this check to a separate function

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry,Do you mean that this part of the doris script changes should be written in the mirror instead of exposed changes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

entry_point.sh is doris official be and cn execute scripts, these codes are not exactly the same, I just reduce some redundant judgment, speed up the startup

metadata:
name: {{ include "doris.name" . }}-backup-policy-template
labels:
clusterdefinition.kubeblocks.io/name: doris # 通过 label 指定作用域,必须填
Copy link
Collaborator

@iziang iziang Jan 4, 2024

Choose a reason for hiding this comment

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

please use English and check others similar.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, I have checked the Doris-related parts of the code and modified all of them which is not using English

@iziang
Copy link
Collaborator

iziang commented Jan 4, 2024

It would be even better if screenshots of the tests for each feature could be provided.

// The port of the brpc on the BE, used for communication between the BE default 9060
brpc_port: int
// Whether https is supported. If yes, configure ssl_certificate_path and ssl_private_key_path in be.conf default false
enable_https: bool
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe format the cue files: cue fmt addons/doris/configs/*.cue

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks,I have formatted the cue files

@shanshanying shanshanying merged commit 1656658 into apecloud:main Jan 5, 2024
1 check passed
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.

[Features] Support Apache Doris
4 participants