rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-04 20:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add wal_acceptor binary in Dockerfile

Browse Source
This commit is contained in:
Stas Kelvich
2021-06-12 18:09:01 +03:00
parent 2b66049b21
commit 19602dc88a
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -94,3 +94,4 @@ ENV POSTGRES_DISTRIB_DIR /usr/local
EXPOSE 6400
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["pageserver"]

14
docker-entrypoint.sh
View File

@@ -1,7 +1,11 @@
#!/bin/sh
if [ ! -d "/data/timelines" ]; then
echo "Initializing pageserver data directory"
pageserver --init --workdir $ZENITH_REPO_DIR
if [ "$1" = 'pageserver' ]; then
if [ ! -d "/data/timelines" ]; then
echo "Initializing pageserver data directory"
pageserver --init --workdir $ZENITH_REPO_DIR
fi
echo "Staring pageserver at 0.0.0.0:6400"
pageserver -l 0.0.0.0:6400 --workdir $ZENITH_REPO_DIR
else
"$@"
fi
echo "Staring pageserver at 0.0.0.0:6400"
pageserver -l 0.0.0.0:6400 --workdir $ZENITH_REPO_DIR

11
walkeeper/src/bin/wal_acceptor.rs
View File

@@ -8,6 +8,7 @@ use log::*;
use parse_duration::parse;
use slog::Drain;
use std::io;
use std::net::ToSocketAddrs;
use std::path::{Path, PathBuf};
use std::thread;
use std::time::Duration;
@@ -94,11 +95,17 @@ fn main() -> Result<()> {
}
if let Some(addr) = arg_matches.value_of("listen") {
conf.listen_addr = addr.parse().unwrap();
// TODO: keep addr vector in config and listen them all
// XXX: with our callmemaybe approach we need to set 'advertised address'
// as it is not always possible to listen it. Another reason to ditch callmemaybe.
let addrs: Vec<_> = addr.to_socket_addrs().unwrap().collect();
conf.listen_addr = addrs[0];
}
if let Some(addr) = arg_matches.value_of("pageserver") {
conf.pageserver_addr = Some(addr.parse().unwrap());
// TODO: keep addr vector in config and check them all while connecting
let addrs: Vec<_> = addr.to_socket_addrs().unwrap().collect();
conf.pageserver_addr = Some(addrs[0]);
}
if let Some(ttl) = arg_matches.value_of("ttl") {