Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zalando/spilo
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Kukushkin committed Apr 29, 2015
2 parents 41db096 + 630945d commit 745111d
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 43 deletions.
67 changes: 27 additions & 40 deletions docs/DESIGN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Architecture: VPC
| |
| etcd |
| O DNS Service Record (SRV) |
| +-----> O O +-------> _etcd+server._tcp.example.com |
| +-----> O O +-------> _etcd-server._tcp.example.com |
| | O O<+ |
| | ^ | |
| | | | +-----+ |
Expand Down Expand Up @@ -62,50 +62,37 @@ The results of its discovery will also be stored in etcd, so other tools can eas
Architecture: PostgreSQL High Available cluster
================

+-----------------------+
| Elastic Load Balancer |
+-----------+-----------+
|
+-------+----------------------------+
EC2 Instance | EC2 Instance |
+--------------------------------+ +--------------------------------+
| | | | | |
| +--------------+ | | | +--------------+ | |
| | | | | | | | | |
| | etcd (proxy) | | | | | etcd (proxy) | | |
| | +----+ | | | | +----+ | |
| +--^-----------+ | | | | +--^-----------+ | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| +--v-------+ +-v----v--+ | | +--v-------+ +-v---v---+ |
| | | | | | | | | | | |
| | Governor | | HAProxy | | | | Governor | | HAProxy | |
| | | | | | | | | | | |
| +--+-------+ +-+-------+ | | +--+-------+ +-+-------+ |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| +---v--------+ | | | +---v--------+ | |
| | PostgreSQL | | | | | PostgreSQL | | |
| +------------+ | | | +------------+ | |
| | Slave | +----------------> Master <-------+ |
| +------------+ | | +------------+ |
| | | | | | | |
| +------------+ | | +------------+ |
| | | |
+--------------------------------+ +--------------------------------+


Healthcheck +-----------------------+
+-----------> Elastic Load Balancer <---+
| +-------------+---------+ |
| | |
| | +-------+
| | |
EC2 |nstance | | EC2 Instance
+----------------------------------+ | +----------------------------------+
| | | | | | |
| | | | | | |
| +--------+-+ +--------------+ | | | +-+--------+ +--------------+ |
| | | | | | | | | | | | |
| | Governor <----> etcd (proxy) | | | | | Governor <----> etcd (proxy) | |
| | | | | | | | | | | | |
| +--------^-+ +--------------+ | | | +--------^-+ +--------------+ |
| | | | | | |
| | | | | | |
| +-v----------+ | | | +-v----------+ |
| | PostgreSQL | | | | | PostgreSQL | |
| +------------+ | | | +------------+ |
| | Master <--------------+ | | Slave | |
| +------------+ | | +------------+ |
| | | | | | | |
| +------------+ | | +------------+ |
| | | |
+----------------------------------+ +----------------------------------+

etcd proxy
----
We assume a Higly Available etcd-cluster to be available for spilo when it is bootstrapped; we will use a etcd-proxy running on localhost to be a bridge between a HA-cluster member and the etcd-cluster.

HAProxy
----
As Yx

Governor
----

Expand Down
3 changes: 0 additions & 3 deletions docs/components/HAProxy.md
View file

This file was deleted.

1 change: 1 addition & 0 deletions postgres-appliance/postgres_ha.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ function write_postgres_yaml
local_address=$(cat /etc/hosts |grep ${HOSTNAME}|cut -f1)
cat >> postgres.yml <<__EOF__
loop_wait: 10
aws_use_host_address: "on"
etcd:
scope: $SCOPE
ttl: 30
Expand Down

0 comments on commit 745111d

Please sign in to comment.