[DPE-4066] HA interface #317

dragomirp · 2024-08-08T12:10:51Z

Adds hacluster interface
Adds a vip config option
Updates charm libs

Related to #212

codecov · 2024-08-08T12:23:05Z

Codecov Report

Attention: Patch coverage is 85.88235% with 12 lines in your changes missing coverage. Please review.

Project coverage is 72.96%. Comparing base (74775ba) to head (fe09777).
Report is 1 commits behind head on main.

Files	Patch %	Lines
src/charm.py	78.12%	3 Missing and 4 partials ⚠️
src/relations/pgbouncer_provider.py	0.00%	4 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #317      +/-   ##
==========================================
+ Coverage   71.47%   72.96%   +1.48%     
==========================================
  Files           7        8       +1     
  Lines        1206     1276      +70     
  Branches      211      223      +12     
==========================================
+ Hits          862      931      +69     
  Misses        266      266              
- Partials       78       79       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

gustavosr98 · 2024-08-08T23:41:46Z

Hey @dragomirp (cc @taurus-forever)

I tried the bundle you send to me
With Juju 3.4.5 on top of LXD 5.21

description: PGB VIP bundle
name: vip-bundle
series: jammy
applications:
  data-integrator:
    charm: data-integrator
    channel: latest/stable
    num_units: 3
    options:
      database-name: testdb
  postgresql:
    charm: postgresql
    channel: 14/stable
    num_units: 3
    #options:
    #  profile: testing
  pgbouncer:
    channel: 1/edge/hacluster
    revision: 347
    charm: pgbouncer
    series: jammy
    num_units: 0
    options:
      max_db_connections: 30
      vip: 10.58.159.250
relations:
    - [pgbouncer:backend-database, postgresql:database]
    - [pgbouncer:database, data-integrator:postgresql]

# blue@blue:~$ juju status
Model   Controller  Cloud/Region         Version  SLA          Timestamp
pg-vip  overlord    localhost/localhost  3.4.5    unsupported  23:39:19Z

App              Version  Status  Scale  Charm            Channel           Rev  Exposed  Message
data-integrator           active      3  data-integrator  latest/stable      27  no
pgbouncer        1.21.0   active      3  pgbouncer        1/edge/hacluster  347  no
postgresql       14.11    active      3  postgresql       14/stable         429  no

Unit                Workload  Agent  Machine  Public address  Ports     Message
data-integrator/0*  active    idle   0        10.58.159.146
  pgbouncer/0*      active    idle            10.58.159.146   6432/tcp
data-integrator/1   active    idle   1        10.58.159.150
  pgbouncer/1       active    idle            10.58.159.150   6432/tcp
data-integrator/2   active    idle   2        10.58.159.212
  pgbouncer/2       active    idle            10.58.159.212   6432/tcp
postgresql/0        active    idle   3        10.58.159.13    5432/tcp
postgresql/1*       active    idle   4        10.58.159.203   5432/tcp
postgresql/2        active    idle   5        10.58.159.20    5432/tcp  Primary

Machine  State    Address        Inst id        Base          AZ  Message
0        started  10.58.159.146  juju-fc0f0d-0  [email protected]      Running
1        started  10.58.159.150  juju-fc0f0d-1  [email protected]      Running
2        started  10.58.159.212  juju-fc0f0d-2  [email protected]      Running
3        started  10.58.159.13   juju-fc0f0d-3  [email protected]      Running
4        started  10.58.159.203  juju-fc0f0d-4  [email protected]      Running
5        started  10.58.159.20   juju-fc0f0d-5  [email protected]      Running

But It does not seem to be assigning the VIP to any machine

# blue@blue:~$ juju exec -a  data-integrator -- 'ip -o -c -4 a'
data-integrator/0:
1: lo    inet 127.0.0.1/8 scope host lo\       valid_lft forever preferred_lft forever
9: eth0    inet 10.58.159.146/24 metric 100 brd 10.58.159.255 scope global dynamic eth0\       valid_lft 3140sec preferred_lft 3140sec

data-integrator/1:
1: lo    inet 127.0.0.1/8 scope host lo\       valid_lft forever preferred_lft forever
11: eth0    inet 10.58.159.150/24 metric 100 brd 10.58.159.255 scope global dynamic eth0\       valid_lft 3273sec preferred_lft 3273sec

data-integrator/2:
1: lo    inet 127.0.0.1/8 scope host lo\       valid_lft forever preferred_lft forever
13: eth0    inet 10.58.159.212/24 metric 100 brd 10.58.159.255 scope global dynamic eth0\       valid_lft 3128sec preferred_lft 3128sec

# blue@blue:~$ juju exec -a  data-integrator -- 'sudo crm_mon'
data-integrator/0:
sudo: crm_mon: command not found

data-integrator/1:
sudo: crm_mon: command not found

data-integrator/2:
sudo: crm_mon: command not found

ERROR the following tasks failed:
 - id "6" with return code 1
 - id "7" with return code 1
 - id "8" with return code 1

use 'juju show-task' to inspect the failures

gustavosr98 · 2024-08-08T23:52:48Z

Adding some more

juju deploy hacluster --channel 2.4/stable
juju relate hacluster data-integrator
juju relate hacluster:juju-info data-integrator:juju-info

Ok now it looks it is there

# blue@blue:~$ ping 10.58.159.250
PING 10.58.159.250 (10.58.159.250) 56(84) bytes of data.
64 bytes from 10.58.159.250: icmp_seq=1 ttl=64 time=575 ms
64 bytes from 10.58.159.250: icmp_seq=2 ttl=64 time=0.099 ms
64 bytes from 10.58.159.250: icmp_seq=3 ttl=64 time=0.083 ms
^C
--- 10.58.159.250 ping statistics ---
3 packets transmitted, 3 received, 0% packet loss, time 2006ms
rtt min/avg/max/mdev = 0.083/191.571/574.533/270.794 ms
blue@blue:~$ juju exec -a  data-integrator -- 'ip -o -c -4 a'
data-integrator/0:
1: lo    inet 127.0.0.1/8 scope host lo\       valid_lft forever preferred_lft forever
9: eth0    inet 10.58.159.146/24 metric 100 brd 10.58.159.255 scope global dynamic eth0\       valid_lft 2195sec preferred_lft 2195sec
9: eth0    inet 10.58.159.250/24 scope global secondary eth0\       valid_lft forever preferred_lft forever

data-integrator/1:
1: lo    inet 127.0.0.1/8 scope host lo\       valid_lft forever preferred_lft forever
11: eth0    inet 10.58.159.150/24 metric 100 brd 10.58.159.255 scope global dynamic eth0\       valid_lft 2327sec preferred_lft 2327sec

data-integrator/2:
1: lo    inet 127.0.0.1/8 scope host lo\       valid_lft forever preferred_lft forever
13: eth0    inet 10.58.159.212/24 metric 100 brd 10.58.159.255 scope global dynamic eth0\       valid_lft 2183sec preferred_lft 2183sec

gustavosr98 · 2024-08-09T00:02:19Z

Looks working

# juju run data-integrator/leader get-credentials
Running operation 19 with 1 task
  - task 20 on unit-data-integrator-0

Waiting for task 20...
ok: "True"
postgresql:
  data: '{"database": "testdb", "external-node-connectivity": "true", "requested-secrets":
    "[\"username\", \"password\", \"tls\", \"tls-ca\", \"uris\"]"}'
  database: testdb
  endpoints: 10.58.159.250:6432
  password: REDACTED
  subordinated: "true"
  username: relation_id_7
  version: "14.11"

# psql --host 10.58.159.250 --port 6432 --username relation_id_7  --password --database testdb
psql (14.12 (Ubuntu 14.12-0ubuntu0.22.04.1), server 14.11 (Ubuntu 14.11-0ubuntu0.22.04.1))
Type "help" for help.
testdb=>

dragomirp · 2024-08-09T00:03:17Z

Ok now it looks it is there

Hi, @gustavosr98, yes on LXD you need hacluster to get the vip. Adding an LXD bundle here for completeness:

description: PGB VIP bundle LXD
name: vip-bundle
series: jammy
applications:
  data-integrator:
    charm: data-integrator
    channel: latest/stable
    num_units: 3
    options:
      database-name: testdb
  postgresql:
    charm: postgresql
    channel: 14/stable
    num_units: 3
    #options:
    #  profile: testing
  pgbouncer:
    channel: 1/edge/hacluster
    revision: 347
    charm: pgbouncer
    series: jammy
    num_units: 0
    options:
      max_db_connections: 30
      #vip: "1.2.3.4"
  hacluster:
    charm: hacluster
    channel: 2.4/stable
    num_units: 0
relations:
    - [pgbouncer:backend-database, postgresql:database]
    - [pgbouncer:database, data-integrator:postgresql]
    - [hacluster:juju-info, data-integrator:juju-info]
    - [hacluster:ha, pgbouncer:ha]

taurus-forever · 2024-08-09T09:58:05Z

Hi @gustavosr98 , thank you for the instant testing here!
I have tested it from my side as well, and it works.
The only noticed error has been reported hacluster: https://bugs.launchpad.net/charm-hacluster/+bug/2076410

Great work @dragomirp !

dragomirp · 2024-08-09T11:15:09Z

src/charm.py

-    def update_client_connection_info(self, port: Optional[str] = None):
+    def update_client_connection_info(self):


Not really passed anywhere

dragomirp · 2024-08-09T12:41:08Z

src/relations/hacluster.py

Mostly following the implementation in https://github.com/openstack/charm-interface-hacluster

dragomirp · 2024-08-09T12:42:25Z

src/charm.py

        if self.check_pgb_running():
-            self.unit.status = ActiveStatus()
+            if self.unit.is_leader() and vip:
+                self.unit.status = ActiveStatus(f"VIP: {vip}")


Setting just the app status message here didn't show when testing locally, while setting a proper app status didn't clear up when blocking.

src/charm.py

taurus-forever

Tested with HAcluster from stable. Work well.
Also tested by Gustavo to ensure OpenStack case works the same as legacy pgbouncer.

Adding Mohamed to approve the config name.

dragomirp · 2024-08-15T16:17:54Z

Got approval from @7annaba3l for the config name.

dragomirp added 3 commits August 8, 2024 14:39

Initial hacluster implementation

8eb8edf

Merge branch 'main' into dpe-4066-ha-interface

134a321

Fix clustered check

aefb45f

github-actions bot added the Libraries: Out of sync label Aug 8, 2024

Check for relation in set_vip

72ef2da

Hacluster test

d847fd8

dragomirp changed the title ~~[Dpe-4066] HA interface~~ [DPE-4066] HA interface Aug 8, 2024

dragomirp added 6 commits August 8, 2024 21:55

Fix test

799f983

Add remove test

521f8c8

Merge branch 'main' into dpe-4066-ha-interface

fcabb83

Merge branch 'main' into dpe-4066-ha-interface

e9bfbda

Update libs

9e71a30

Update client info on config change

9ba5893

github-actions bot added Libraries: OK and removed Libraries: Out of sync labels Aug 8, 2024

dragomirp added 2 commits August 9, 2024 02:05

Cache vip in peer data

b4dcd2f

Block on edge cases

6c8542f

dragomirp added 3 commits August 9, 2024 03:15

Bump coverage

a670cbb

Blocking check

fa85efa

Fix integration test

13f0033

App status with VIP

2a3d907

dragomirp commented Aug 9, 2024

View reviewed changes

dragomirp added 2 commits August 9, 2024 15:32

Move vip to leader status

22ff7e3

Merge branch 'main' into dpe-4066-ha-interface

fa284b1

dragomirp commented Aug 9, 2024

View reviewed changes

dragomirp marked this pull request as ready for review August 9, 2024 12:42

dragomirp requested review from marceloneppel, taurus-forever and lucasgameiroborges August 9, 2024 12:42

marceloneppel approved these changes Aug 9, 2024

View reviewed changes

src/charm.py Outdated Show resolved Hide resolved

Clear up vip caching

6243066

github-actions bot added Libraries: Out of sync and removed Libraries: OK labels Aug 9, 2024

marceloneppel approved these changes Aug 9, 2024

View reviewed changes

Forgotten None

674d07e

taurus-forever approved these changes Aug 12, 2024

View reviewed changes

taurus-forever requested a review from 7annaba3l August 12, 2024 09:53

Bump libs

ec9ef66

github-actions bot added Libraries: OK and removed Libraries: Out of sync labels Aug 12, 2024

Merge branch 'main' into dpe-4066-ha-interface

fe09777

dragomirp merged commit a2bb1b4 into main Aug 15, 2024
55 checks passed

dragomirp deleted the dpe-4066-ha-interface branch August 15, 2024 16:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DPE-4066] HA interface #317

[DPE-4066] HA interface #317

dragomirp commented Aug 8, 2024 •

edited

Loading

codecov bot commented Aug 8, 2024 •

edited

Loading

gustavosr98 commented Aug 8, 2024 •

edited

Loading

gustavosr98 commented Aug 8, 2024

gustavosr98 commented Aug 9, 2024

dragomirp commented Aug 9, 2024

taurus-forever commented Aug 9, 2024

dragomirp Aug 9, 2024

dragomirp Aug 9, 2024

dragomirp Aug 9, 2024

taurus-forever left a comment

dragomirp commented Aug 15, 2024

		def update_client_connection_info(self, port: Optional[str] = None):
		def update_client_connection_info(self):

[DPE-4066] HA interface #317

[DPE-4066] HA interface #317

Conversation

dragomirp commented Aug 8, 2024 • edited Loading

codecov bot commented Aug 8, 2024 • edited Loading

Codecov Report

gustavosr98 commented Aug 8, 2024 • edited Loading

gustavosr98 commented Aug 8, 2024

gustavosr98 commented Aug 9, 2024

dragomirp commented Aug 9, 2024

taurus-forever commented Aug 9, 2024

dragomirp Aug 9, 2024

Choose a reason for hiding this comment

dragomirp Aug 9, 2024

Choose a reason for hiding this comment

dragomirp Aug 9, 2024

Choose a reason for hiding this comment

taurus-forever left a comment

Choose a reason for hiding this comment

dragomirp commented Aug 15, 2024

dragomirp commented Aug 8, 2024 •

edited

Loading

codecov bot commented Aug 8, 2024 •

edited

Loading

gustavosr98 commented Aug 8, 2024 •

edited

Loading