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

K8SPXC-1071: Add Percona scheduler for ProxySQL #1436

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
+1,438 −1,228
Draft

K8SPXC-1071: Add Percona scheduler for ProxySQL #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e437f0f
K8SPXC-1071 - Replace proxysql-admin with percona-scheduler-admin for…
tplavcic Aug 3, 2022
bddcc85
fix syncusers
egegunes May 12, 2023
9096554
Merge branch 'main' into K8SPXC-1071
tplavcic May 19, 2023
93e75db
Merge branch 'main' into K8SPXC-1071
egegunes Jun 13, 2023
2fe51f1
run syncusers only on server has the lock
egegunes Jun 14, 2023
f10763c
add telemetry for scheduler
egegunes Jun 14, 2023
b0cae12
address review comments
egegunes Jun 14, 2023
dc30831
add constants for pxc handler
egegunes Jun 14, 2023
1de6526
fix upgrade-consistency and upgrade-proxysql test
hors Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4080,6 +4080,11 @@ spec:
type: object
priorityClassName:
type: string
pxchandler:
enum:
- internal
- scheduler
type: string
readinessDelaySec:
format: int32
type: integer
Expand Down
5 changes: 5 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4817,6 +4817,11 @@ spec:
type: object
priorityClassName:
type: string
pxchandler:
enum:
- internal
- scheduler
type: string
readinessDelaySec:
format: int32
type: integer
Expand Down
1 change: 1 addition & 0 deletions deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ spec:
gracePeriod: 30
proxysql:
enabled: false
pxchandler: internal
size: 3
image: perconalab/percona-xtradb-cluster-operator:main-proxysql
# imagePullPolicy: Always
Expand Down
5 changes: 5 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4817,6 +4817,11 @@ spec:
type: object
priorityClassName:
type: string
pxchandler:
enum:
- internal
- scheduler
type: string
readinessDelaySec:
format: int32
type: integer
Expand Down
5 changes: 5 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4817,6 +4817,11 @@ spec:
type: object
priorityClassName:
type: string
pxchandler:
enum:
- internal
- scheduler
type: string
readinessDelaySec:
format: int32
type: integer
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-custom
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: custom-env-vars-proxysql
Expand Down Expand Up @@ -142,6 +144,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-custom
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: custom-env-vars-proxysql
Expand Down Expand Up @@ -175,6 +179,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-custom
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: custom-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_custom-proxysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-custom
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: custom-env-vars-proxysql
Expand Down Expand Up @@ -142,6 +144,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-custom
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: custom-env-vars-proxysql
Expand Down Expand Up @@ -175,6 +179,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-custom
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: custom-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-hostname
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: hostname-env-vars-proxysql
Expand Down Expand Up @@ -115,6 +117,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-hostname
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: hostname-env-vars-proxysql
Expand Down Expand Up @@ -148,6 +152,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-hostname
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: hostname-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-hostname
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: hostname-env-vars-proxysql
Expand Down Expand Up @@ -115,6 +117,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-hostname
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: hostname-env-vars-proxysql
Expand Down Expand Up @@ -148,6 +152,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-hostname
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: hostname-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-region
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: region-env-vars-proxysql
Expand Down Expand Up @@ -115,6 +117,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-region
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: region-env-vars-proxysql
Expand Down Expand Up @@ -148,6 +152,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-region
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: region-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_region-proxysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-region
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: region-env-vars-proxysql
Expand Down Expand Up @@ -115,6 +117,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-region
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: region-env-vars-proxysql
Expand Down Expand Up @@ -148,6 +152,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-region
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: region-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-zone
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: zone-env-vars-proxysql
Expand Down Expand Up @@ -115,6 +117,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-zone
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: zone-env-vars-proxysql
Expand Down Expand Up @@ -148,6 +152,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-zone
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: zone-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/affinity/compare/statefulset_zone-proxysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-zone
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: zone-env-vars-proxysql
Expand Down Expand Up @@ -115,6 +117,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-zone
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: zone-env-vars-proxysql
Expand Down Expand Up @@ -148,6 +152,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-zone
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: zone-env-vars-proxysql
Expand Down
8 changes: 5 additions & 3 deletions e2e-tests/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,12 +561,14 @@ compare_mysql_cmd_local() {

get_proxy_primary() {
local uri="$1"
local pod="$2"
local ip=$(run_mysql_local "SELECT hostname FROM runtime_mysql_servers WHERE hostgroup_id=11 AND status='ONLINE';" "$uri" "$pod" 'proxysql')
local cluster_name="$2"
local hostgroup=11

local ip=$(run_mysql_local "SELECT hostname FROM runtime_mysql_servers WHERE hostgroup_id='$hostgroup' AND status='ONLINE';" "$uri" "$cluster_name-proxysql-0" 'proxysql')

while [ $(echo "$ip" | wc -l) != 1 ]; do
sleep 1
ip=$(run_mysql_local "SELECT hostname FROM runtime_mysql_servers WHERE hostgroup_id=11 AND status='ONLINE';" "$uri" "$pod" 'proxysql')
ip=$(run_mysql_local "SELECT hostname FROM runtime_mysql_servers WHERE hostgroup_id='$hostgroup' AND status='ONLINE';" "$uri" "$cluster_name-proxysql-0" 'proxysql')
done

echo $ip | cut -d'.' -f1
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -117,6 +119,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -150,6 +154,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -117,6 +119,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -150,6 +154,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -117,6 +119,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -150,6 +154,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down
6 changes: 6 additions & 0 deletions e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -117,6 +119,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down Expand Up @@ -150,6 +154,8 @@ spec:
secretKeyRef:
key: monitor
name: internal-haproxy
- name: PXC_HANDLER
value: internal
envFrom:
- secretRef:
name: haproxy-env-vars-proxysql
Expand Down
Loading