Compare commits
44 commits
debian/2.1
...
master
Author | SHA1 | Date | |
---|---|---|---|
941e358015 | |||
e3e474e941 | |||
a20c84dccc | |||
237a471872 | |||
1696b49173 | |||
6080e04541 | |||
3fa4d74c3d | |||
fc47254fde | |||
8325643e03 | |||
f27a4dcb87 | |||
9a65ac8b54 | |||
2a3aed8b82 | |||
e33cc5df37 | |||
2f75f4a6fe | |||
0528d0d46c | |||
cc4a79a666 | |||
783a564fbd | |||
edaa60c5be | |||
60c9d2c9de | |||
d1ffa2f934 | |||
b4db543273 | |||
46ccaa2b8e | |||
3db79981f8 | |||
8de2bb7462 | |||
769889707d | |||
0a71194a9b | |||
9a33c75cc9 | |||
efd23c9778 | |||
0153ff40e6 | |||
6e267093c7 | |||
c0a458a620 | |||
5681786be3 | |||
cb31e3dce3 | |||
e879c212ea | |||
64a5a762c5 | |||
9761d8f991 | |||
6481cfe02c | |||
80f2dfcc3f | |||
c8548c1499 | |||
d53c5a55b0 | |||
6870df7681 | |||
e15c7c0b60 | |||
bb19fd1462 | |||
cefbea9eb6 |
88
debian/changelog
vendored
88
debian/changelog
vendored
|
@ -1,3 +1,91 @@
|
||||||
|
patroni (3.0.1-2) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
|
||||||
|
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Fri, 17 Feb 2023 09:34:22 +0100
|
||||||
|
|
||||||
|
patroni (3.0.1-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* New upstream release.
|
||||||
|
* debian/control (Uploaders): Updated.
|
||||||
|
|
||||||
|
-- Michael Banck <mbanck@debian.org> Fri, 17 Feb 2023 09:33:48 +0100
|
||||||
|
|
||||||
|
patroni (3.0.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* New major upstream release.
|
||||||
|
* debian/patches/acceptance_tests_system_patroni.patch: Refreshed.
|
||||||
|
* debian/patches/avoid_overwriting_configuration_during_boostrap.patch:
|
||||||
|
Likewise.
|
||||||
|
* debian/tests/control: Add procps as dependency and skip DCS failsafe mode
|
||||||
|
acceptance tests on zookeeper.
|
||||||
|
* debian/patches/regression_tests_skip_citus_test.patch: New patch, skips
|
||||||
|
the citus unit test for now as it fails on some configurations.
|
||||||
|
* debian/control (Depends): Removed obsolete lsb-base.
|
||||||
|
|
||||||
|
-- Michael Banck <michael.banck@credativ.de> Tue, 31 Jan 2023 22:27:24 +0100
|
||||||
|
|
||||||
|
patroni (2.1.7-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* New upstream release.
|
||||||
|
* debian/patches/acceptance_tests_reenable_etcdv2.patch: Removed, no longer
|
||||||
|
needed.
|
||||||
|
* debian/patches/compatibility_with_old_modules.patch: Likewise.
|
||||||
|
|
||||||
|
-- Michael Banck <michael.banck@credativ.de> Mon, 23 Jan 2023 21:24:46 +0100
|
||||||
|
|
||||||
|
patroni (2.1.6-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
[ Shengjing Zhu ]
|
||||||
|
* debian/tests/acceptance: Ensure no etcd server is running before acceptance
|
||||||
|
tests. Otherwise, acceptance tests can't spin up a new etcd server which
|
||||||
|
uses the same port (Closes: #1027707).
|
||||||
|
|
||||||
|
-- Michael Banck <michael.banck@credativ.de> Sun, 08 Jan 2023 22:06:02 +0100
|
||||||
|
|
||||||
|
patroni (2.1.6-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* New upstream release.
|
||||||
|
* debian/patches/acceptance_tests_system_patroni.patch: Refreshed.
|
||||||
|
* debian/patches/acceptance_tests_reenable_etcdv2.patch: New patch,
|
||||||
|
re-enables V2 API on etcd-3.4 and later.
|
||||||
|
* debian/tests/control: Add etcd3 behave test.
|
||||||
|
* debian/patches/compatibility_with_old_modules.patch: New patch, fixes
|
||||||
|
unit test failures with older modules, taken from upstream commit 442bd3f.
|
||||||
|
|
||||||
|
-- Michael Banck <michael.banck@credativ.de> Wed, 04 Jan 2023 10:51:02 +0100
|
||||||
|
|
||||||
|
patroni (2.1.5-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Team upload.
|
||||||
|
* New upstream release.
|
||||||
|
* Mark Consul test as skip-not-installable (not in testing, see #1017982).
|
||||||
|
|
||||||
|
-- Christoph Berg <myon@debian.org> Mon, 28 Nov 2022 13:07:28 +0100
|
||||||
|
|
||||||
|
patroni (2.1.4-3) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Enable RAFT support and add python3-pysyncobj to dep alternatives.
|
||||||
|
|
||||||
|
-- Christoph Berg <myon@debian.org> Thu, 17 Nov 2022 16:14:33 +0100
|
||||||
|
|
||||||
|
patroni (2.1.4-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Team upload.
|
||||||
|
|
||||||
|
[ Michael Banck ]
|
||||||
|
* debian/patches/avoid_overwriting_configuration_during_boostrap.patch: New
|
||||||
|
patch, avoids streaming a backup of the primary's postgresql.conf file
|
||||||
|
during bootstrap, overwriting the standby's postgresql.base.conf and
|
||||||
|
possible preventing PostgreSQL to start up.
|
||||||
|
* debian/patches/acceptance_tests_speedup.patch: New patch, reduces loop_wait
|
||||||
|
to 2 thus speeding up the behave tests, taken from upstream commit ead798.
|
||||||
|
|
||||||
|
[ Christoph Berg ]
|
||||||
|
* Add a test using etcd running basic_replication.feature only, and mark the
|
||||||
|
full tests as flaky. (Closes: #1017527)
|
||||||
|
|
||||||
|
-- Christoph Berg <myon@debian.org> Thu, 08 Sep 2022 17:04:35 +0200
|
||||||
|
|
||||||
patroni (2.1.4-1) unstable; urgency=medium
|
patroni (2.1.4-1) unstable; urgency=medium
|
||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
|
|
6
debian/control
vendored
6
debian/control
vendored
|
@ -2,7 +2,7 @@ Source: patroni
|
||||||
Section: database
|
Section: database
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
|
Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
|
||||||
Uploaders: Michael Banck <michael.banck@credativ.de>,
|
Uploaders: Michael Banck <mbanck@debian.org>,
|
||||||
Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
|
Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
|
||||||
Build-Depends:
|
Build-Depends:
|
||||||
debhelper (>= 10),
|
debhelper (>= 10),
|
||||||
|
@ -46,9 +46,9 @@ Homepage: https://github.com/zalando/patroni
|
||||||
|
|
||||||
Package: patroni
|
Package: patroni
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2,
|
Depends: ${misc:Depends}, ${python3:Depends}, python3-psycopg2,
|
||||||
python3-etcd (>= 0.4.3) | python3-consul (>= 0.7.0) | python3-kazoo |
|
python3-etcd (>= 0.4.3) | python3-consul (>= 0.7.0) | python3-kazoo |
|
||||||
python3-kubernetes, python3-cdiff
|
python3-kubernetes | python3-pysyncobj, python3-cdiff
|
||||||
Recommends: iproute2
|
Recommends: iproute2
|
||||||
Suggests: postgresql, etcd-server | consul | zookeeperd, vip-manager, haproxy, patroni-doc
|
Suggests: postgresql, etcd-server | consul | zookeeperd, vip-manager, haproxy, patroni-doc
|
||||||
Description: PostgreSQL High Availability with ZooKeeper, etcd, Consul, or Kubernetes
|
Description: PostgreSQL High Availability with ZooKeeper, etcd, Consul, or Kubernetes
|
||||||
|
|
|
@ -2,13 +2,12 @@ Index: patroni/features/environment.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- patroni.orig/features/environment.py
|
--- patroni.orig/features/environment.py
|
||||||
+++ patroni/features/environment.py
|
+++ patroni/features/environment.py
|
||||||
@@ -141,8 +141,7 @@ class PatroniController(AbstractControll
|
@@ -150,7 +150,7 @@ class PatroniController(AbstractControll
|
||||||
if isinstance(self._context.dcs_ctl, KubernetesController):
|
if os.name == 'nt':
|
||||||
self._context.dcs_ctl.create_pod(self._name[8:], self._scope)
|
env['BEHAVE_DEBUG'] = 'true'
|
||||||
os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1]
|
patroni = subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
|
||||||
- return subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
|
- '--source=patroni', '-p', 'patroni.py', self._config], env=env,
|
||||||
- '--source=patroni', '-p', 'patroni.py', self._config],
|
+ '-p', '/usr/bin/patroni', self._config], env=env,
|
||||||
+ return subprocess.Popen([sys.executable, '-m', 'coverage', 'run', '-p', '/usr/bin/patroni', self._config],
|
stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
|
||||||
stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
|
if os.name == 'nt':
|
||||||
|
patroni.terminate = self.terminate
|
||||||
def stop(self, kill=False, timeout=15, postgres=False):
|
|
||||||
|
|
41
debian/patches/avoid_overwriting_configuration_during_boostrap.patch
vendored
Normal file
41
debian/patches/avoid_overwriting_configuration_during_boostrap.patch
vendored
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
commit a3776e0dfb2f0c5a9e5174f948122b8fb33ceebc
|
||||||
|
Author: Michael Banck <michael.banck@credativ.de>
|
||||||
|
Date: Fri Jul 29 14:55:15 2022 +0200
|
||||||
|
|
||||||
|
Make backup copies of configuration files in config_dir.
|
||||||
|
|
||||||
|
Before, the .backup files were always done in the data directory. However, if
|
||||||
|
there is a distinct configuration directory, it seems logical to put them
|
||||||
|
there. If config_dir is not configured, it defaults back to the data directory,
|
||||||
|
so this will not change things for setups where postgresql.conf is in the data
|
||||||
|
directory.
|
||||||
|
|
||||||
|
On the other hand, it will help with setups where postgresql.conf is outside
|
||||||
|
the data directory and has local changes. In this case, those no longer get
|
||||||
|
overwritten on boostrap/clone from the primary's backup configuration file that
|
||||||
|
is streamed to the boostrapped node.
|
||||||
|
|
||||||
|
Close #2370
|
||||||
|
|
||||||
|
Index: patroni/patroni/postgresql/config.py
|
||||||
|
===================================================================
|
||||||
|
--- patroni.orig/patroni/postgresql/config.py
|
||||||
|
+++ patroni/patroni/postgresql/config.py
|
||||||
|
@@ -355,7 +355,7 @@ class ConfigHandler(object):
|
||||||
|
try:
|
||||||
|
for f in self._configuration_to_save:
|
||||||
|
config_file = os.path.join(self._config_dir, f)
|
||||||
|
- backup_file = os.path.join(self._postgresql.data_dir, f + '.backup')
|
||||||
|
+ backup_file = os.path.join(self._config_dir, f + '.backup')
|
||||||
|
if os.path.isfile(config_file):
|
||||||
|
shutil.copy(config_file, backup_file)
|
||||||
|
except IOError:
|
||||||
|
@@ -367,7 +367,7 @@ class ConfigHandler(object):
|
||||||
|
try:
|
||||||
|
for f in self._configuration_to_save:
|
||||||
|
config_file = os.path.join(self._config_dir, f)
|
||||||
|
- backup_file = os.path.join(self._postgresql.data_dir, f + '.backup')
|
||||||
|
+ backup_file = os.path.join(self._config_dir, f + '.backup')
|
||||||
|
if not os.path.isfile(config_file):
|
||||||
|
if os.path.isfile(backup_file):
|
||||||
|
shutil.copy(backup_file, config_file)
|
|
@ -1,102 +0,0 @@
|
||||||
Index: patroni/patroni/validator.py
|
|
||||||
===================================================================
|
|
||||||
--- patroni.orig/patroni/validator.py
|
|
||||||
+++ patroni/patroni/validator.py
|
|
||||||
@@ -341,13 +341,6 @@ schema = Schema({
|
|
||||||
"port": lambda i: assert_(int(i) <= 65535),
|
|
||||||
Optional("pool_interval"): int
|
|
||||||
},
|
|
||||||
- "raft": {
|
|
||||||
- "self_addr": validate_connect_address,
|
|
||||||
- Optional("bind_addr"): validate_host_port_listen,
|
|
||||||
- "partner_addrs": validate_host_port_list,
|
|
||||||
- Optional("data_dir"): str,
|
|
||||||
- Optional("password"): str
|
|
||||||
- },
|
|
||||||
"zookeeper": {
|
|
||||||
"hosts": Or(comma_separated_host_port, [validate_host_port]),
|
|
||||||
},
|
|
||||||
Index: patroni/tests/test_validator.py
|
|
||||||
===================================================================
|
|
||||||
--- patroni.orig/tests/test_validator.py
|
|
||||||
+++ patroni/tests/test_validator.py
|
|
||||||
@@ -41,13 +41,6 @@ config = {
|
|
||||||
"port": 4000,
|
|
||||||
"pool_interval": 1000
|
|
||||||
},
|
|
||||||
- "raft": {
|
|
||||||
- "self_addr": "127.0.0.1:2222",
|
|
||||||
- "bind_addr": "0.0.0.0:2222",
|
|
||||||
- "partner_addrs": ["127.0.0.1:2223", "127.0.0.1:2224"],
|
|
||||||
- "data_dir": "/",
|
|
||||||
- "password": "12345"
|
|
||||||
- },
|
|
||||||
"zookeeper": {
|
|
||||||
"hosts": "127.0.0.1:3379,127.0.0.1:3380"
|
|
||||||
},
|
|
||||||
@@ -149,7 +142,7 @@ class TestValidator(unittest.TestCase):
|
|
||||||
def test_complete_config(self, mock_out, mock_err):
|
|
||||||
schema(config)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
- self.assertEqual(['postgresql.bin_dir', 'raft.bind_addr', 'raft.self_addr'], parse_output(output))
|
|
||||||
+ self.assertEqual(['postgresql.bin_dir'], parse_output(output))
|
|
||||||
|
|
||||||
def test_bin_dir_is_file(self, mock_out, mock_err):
|
|
||||||
files.append(config["postgresql"]["data_dir"])
|
|
||||||
@@ -161,8 +154,7 @@ class TestValidator(unittest.TestCase):
|
|
||||||
schema(c)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
self.assertEqual(['etcd.hosts.1', 'etcd.hosts.2', 'kubernetes.pod_ip', 'postgresql.bin_dir',
|
|
||||||
- 'postgresql.data_dir', 'raft.bind_addr', 'raft.self_addr',
|
|
||||||
- 'restapi.connect_address'], parse_output(output))
|
|
||||||
+ 'postgresql.data_dir', 'restapi.connect_address'], parse_output(output))
|
|
||||||
|
|
||||||
@patch('socket.inet_pton', Mock(), create=True)
|
|
||||||
def test_bin_dir_is_empty(self, mock_out, mock_err):
|
|
||||||
@@ -178,8 +170,8 @@ class TestValidator(unittest.TestCase):
|
|
||||||
with patch('patroni.validator.open', mock_open(read_data='9')):
|
|
||||||
schema(c)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
- self.assertEqual(['consul.host', 'etcd.host', 'postgresql.bin_dir', 'postgresql.data_dir', 'postgresql.listen',
|
|
||||||
- 'raft.bind_addr', 'raft.self_addr', 'restapi.connect_address'], parse_output(output))
|
|
||||||
+ self.assertEqual(['consul.host', 'etcd.host', 'postgresql.bin_dir', 'postgresql.data_dir',
|
|
||||||
+ 'postgresql.listen', 'restapi.connect_address'], parse_output(output))
|
|
||||||
|
|
||||||
@patch('subprocess.check_output', Mock(return_value=b"postgres (PostgreSQL) 12.1"))
|
|
||||||
def test_data_dir_contains_pg_version(self, mock_out, mock_err):
|
|
||||||
@@ -197,7 +189,7 @@ class TestValidator(unittest.TestCase):
|
|
||||||
with patch('patroni.validator.open', mock_open(read_data='12')):
|
|
||||||
schema(config)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
- self.assertEqual(['raft.bind_addr', 'raft.self_addr'], parse_output(output))
|
|
||||||
+ self.assertEqual([], parse_output(output))
|
|
||||||
|
|
||||||
@patch('subprocess.check_output', Mock(return_value=b"postgres (PostgreSQL) 12.1"))
|
|
||||||
def test_pg_version_missmatch(self, mock_out, mock_err):
|
|
||||||
@@ -212,8 +204,7 @@ class TestValidator(unittest.TestCase):
|
|
||||||
with patch('patroni.validator.open', mock_open(read_data='11')):
|
|
||||||
schema(c)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
- self.assertEqual(['etcd.hosts', 'postgresql.data_dir',
|
|
||||||
- 'raft.bind_addr', 'raft.self_addr'], parse_output(output))
|
|
||||||
+ self.assertEqual(['etcd.hosts', 'postgresql.data_dir'], parse_output(output))
|
|
||||||
|
|
||||||
@patch('subprocess.check_output', Mock(return_value=b"postgres (PostgreSQL) 12.1"))
|
|
||||||
def test_pg_wal_doesnt_exist(self, mock_out, mock_err):
|
|
||||||
@@ -226,7 +217,7 @@ class TestValidator(unittest.TestCase):
|
|
||||||
with patch('patroni.validator.open', mock_open(read_data='11')):
|
|
||||||
schema(c)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
- self.assertEqual(['postgresql.data_dir', 'raft.bind_addr', 'raft.self_addr'], parse_output(output))
|
|
||||||
+ self.assertEqual(['postgresql.data_dir'], parse_output(output))
|
|
||||||
|
|
||||||
def test_data_dir_is_empty_string(self, mock_out, mock_err):
|
|
||||||
directories.append(config["postgresql"]["data_dir"])
|
|
||||||
@@ -238,5 +229,5 @@ class TestValidator(unittest.TestCase):
|
|
||||||
c["postgresql"]["bin_dir"] = ""
|
|
||||||
schema(c)
|
|
||||||
output = mock_out.getvalue()
|
|
||||||
- self.assertEqual(['kubernetes', 'postgresql.bin_dir', 'postgresql.data_dir',
|
|
||||||
- 'postgresql.pg_hba', 'raft.bind_addr', 'raft.self_addr'], parse_output(output))
|
|
||||||
+ self.assertEqual(['kubernetes', 'postgresql.bin_dir',
|
|
||||||
+ 'postgresql.data_dir', 'postgresql.pg_hba'], parse_output(output))
|
|
13
debian/patches/regression_tests_skip_citus_test.patch
vendored
Normal file
13
debian/patches/regression_tests_skip_citus_test.patch
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
--- ./tests/test_citus.py.orig 2023-01-31 09:22:20.849730475 +0100
|
||||||
|
+++ ./tests/test_citus.py 2023-01-31 09:22:46.673632646 +0100
|
||||||
|
@@ -4,7 +4,10 @@
|
||||||
|
from . import BaseTestPostgresql, MockCursor, psycopg_connect, SleepException
|
||||||
|
from .test_ha import get_cluster_initialized_with_leader
|
||||||
|
|
||||||
|
+import unittest
|
||||||
|
|
||||||
|
+
|
||||||
|
+@unittest.skipIf(True, "Citus not tested")
|
||||||
|
@patch('patroni.postgresql.citus.Thread', Mock())
|
||||||
|
@patch('patroni.psycopg.connect', psycopg_connect)
|
||||||
|
class TestCitus(BaseTestPostgresql):
|
3
debian/patches/series
vendored
3
debian/patches/series
vendored
|
@ -3,4 +3,5 @@ acceptance_tests_system_patroni.patch
|
||||||
requirements_setuptools.patch
|
requirements_setuptools.patch
|
||||||
offline_intersphinx.patch
|
offline_intersphinx.patch
|
||||||
requirements_cdiff.patch
|
requirements_cdiff.patch
|
||||||
regression_tests_disable_raft_tests.py
|
avoid_overwriting_configuration_during_boostrap.patch
|
||||||
|
regression_tests_skip_citus_test.patch
|
||||||
|
|
14
debian/patches/startup_scripts.patch
vendored
14
debian/patches/startup_scripts.patch
vendored
|
@ -1,7 +1,5 @@
|
||||||
Index: patroni/extras/startup-scripts/patroni
|
--- a/extras/startup-scripts/patroni
|
||||||
===================================================================
|
+++ b/extras/startup-scripts/patroni
|
||||||
--- patroni.orig/extras/startup-scripts/patroni
|
|
||||||
+++ patroni/extras/startup-scripts/patroni
|
|
||||||
@@ -18,7 +18,7 @@ USER="postgres"
|
@@ -18,7 +18,7 @@ USER="postgres"
|
||||||
GROUP="postgres"
|
GROUP="postgres"
|
||||||
|
|
||||||
|
@ -33,10 +31,8 @@ Index: patroni/extras/startup-scripts/patroni
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
Index: patroni/extras/startup-scripts/patroni.service
|
--- a/extras/startup-scripts/patroni.service
|
||||||
===================================================================
|
+++ b/extras/startup-scripts/patroni.service
|
||||||
--- patroni.orig/extras/startup-scripts/patroni.service
|
|
||||||
+++ patroni/extras/startup-scripts/patroni.service
|
|
||||||
@@ -1,9 +1,7 @@
|
@@ -1,9 +1,7 @@
|
||||||
-# This is an example systemd config file for Patroni
|
-# This is an example systemd config file for Patroni
|
||||||
-# You can copy it to "/etc/systemd/system/patroni.service",
|
-# You can copy it to "/etc/systemd/system/patroni.service",
|
||||||
|
@ -50,7 +46,7 @@ Index: patroni/extras/startup-scripts/patroni.service
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
@@ -17,17 +15,13 @@ EnvironmentFile=-/etc/patroni_env.conf
|
@@ -17,17 +15,13 @@ EnvironmentFile=-/etc/patroni_env.conf
|
||||||
# the default is the user's home directory, and if you want to change it, you must provide an absolute path.
|
# The default is the user's home directory, and if you want to change it, you must provide an absolute path.
|
||||||
# WorkingDirectory=/home/sameuser
|
# WorkingDirectory=/home/sameuser
|
||||||
|
|
||||||
-# Where to send early-startup messages from the server
|
-# Where to send early-startup messages from the server
|
||||||
|
|
34
debian/tests/acceptance
vendored
34
debian/tests/acceptance
vendored
|
@ -1,11 +1,12 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -e
|
set -eu
|
||||||
|
|
||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
export LANG=C.UTF-8
|
export LANG=C.UTF-8
|
||||||
export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',)
|
export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',)
|
||||||
DCS=$1
|
DCS=$1
|
||||||
|
shift
|
||||||
|
|
||||||
if [ $(id -u) -eq 0 ]
|
if [ $(id -u) -eq 0 ]
|
||||||
then
|
then
|
||||||
|
@ -25,7 +26,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# clean up afterwards
|
# clean up afterwards
|
||||||
trap 'rm -f /tmp/pgpass?; if [ $(id -u) -eq 0 ] && [ -x /etc/init.d/zookeeper ]; then /etc/init.d/zookeeper stop; fi' 0 2 3 15
|
trap 'rm -f /tmp/pgpass?; if [ $(id -u) -eq 0 ] && [ -x /etc/init.d/zookeeper ]; then /etc/init.d/zookeeper stop; fi' EXIT
|
||||||
|
|
||||||
# set ETCD_ARCH for ETCD_UNSUPPORTED_ARCH
|
# set ETCD_ARCH for ETCD_UNSUPPORTED_ARCH
|
||||||
# see https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/supported-platform.md#current-support
|
# see https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/supported-platform.md#current-support
|
||||||
|
@ -35,10 +36,7 @@ case $DEB_HOST_ARCH in
|
||||||
arm64)
|
arm64)
|
||||||
ETCD_ARCH=arm64
|
ETCD_ARCH=arm64
|
||||||
;;
|
;;
|
||||||
armel)
|
armel|armhf)
|
||||||
ETCD_ARCH=arm
|
|
||||||
;;
|
|
||||||
armhf)
|
|
||||||
ETCD_ARCH=arm
|
ETCD_ARCH=arm
|
||||||
;;
|
;;
|
||||||
i386)
|
i386)
|
||||||
|
@ -46,15 +44,33 @@ case $DEB_HOST_ARCH in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# ensure no etcd server is running.
|
||||||
|
if [ $(id -u) -eq 0 ]
|
||||||
|
then
|
||||||
|
if [ "$DCS" = "etcd" -o "$DCS" = "etcd3" ]
|
||||||
|
then
|
||||||
|
service etcd stop
|
||||||
|
service etcd status || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
for PG_VERSION in $(ls -1r /usr/lib/postgresql/); do
|
for PG_VERSION in $(ls -1r /usr/lib/postgresql/); do
|
||||||
|
echo "### PostgreSQL $PG_VERSION acceptance-$DCS $@ ###"
|
||||||
if [ "${PG_VERSION}" == "10" ]; then
|
if [ "${PG_VERSION}" == "10" ]; then
|
||||||
SKIP=--tags=-skip
|
SKIP=--tags=-skip
|
||||||
else
|
else
|
||||||
SKIP=
|
SKIP=
|
||||||
fi
|
fi
|
||||||
$SU "set -o pipefail; ETCD_UNSUPPORTED_ARCH=$ETCD_ARCH DCS=$DCS \
|
if ! $SU "set -o pipefail; ETCD_UNSUPPORTED_ARCH=$ETCD_ARCH DCS=$DCS \
|
||||||
PATH=/usr/lib/postgresql/${PG_VERSION}/bin:$PATH \
|
PATH=/usr/lib/postgresql/${PG_VERSION}/bin:$PATH \
|
||||||
behave ${SKIP} | ts" || \
|
behave ${SKIP} $@ | ts"; then
|
||||||
(for file in $(ls features/output/*_failed/*); do echo "$file:"; cat $file; done && exit 1)
|
for file in features/output/*_failed/*; do
|
||||||
|
case $file in *.journal*) continue ;; esac # skip RAFT journal files
|
||||||
|
echo "$file:"
|
||||||
|
cat $file
|
||||||
|
done
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "### End $PG_VERSION acceptance-$DCS $@ ###"
|
||||||
done
|
done
|
||||||
|
|
47
debian/tests/control
vendored
47
debian/tests/control
vendored
|
@ -1,4 +1,29 @@
|
||||||
|
# etc3
|
||||||
|
Features: test-name=acceptance-etcd3
|
||||||
|
Depends:
|
||||||
|
etcd-server,
|
||||||
|
moreutils,
|
||||||
|
postgresql,
|
||||||
|
python3-behave,
|
||||||
|
python3-coverage,
|
||||||
|
python3-etcd,
|
||||||
|
@,
|
||||||
|
Test-Command: debian/tests/acceptance etcd3
|
||||||
|
Restrictions: allow-stderr, flaky
|
||||||
|
|
||||||
# etcd
|
# etcd
|
||||||
|
Features: test-name=acceptance-etcd-basic
|
||||||
|
Depends:
|
||||||
|
etcd-server,
|
||||||
|
moreutils,
|
||||||
|
postgresql,
|
||||||
|
python3-behave,
|
||||||
|
python3-coverage,
|
||||||
|
python3-etcd (>= 0.4.3),
|
||||||
|
@,
|
||||||
|
Test-Command: debian/tests/acceptance etcd features/basic_replication.feature
|
||||||
|
Restrictions: needs-root, allow-stderr
|
||||||
|
|
||||||
Features: test-name=acceptance-etcd
|
Features: test-name=acceptance-etcd
|
||||||
Depends:
|
Depends:
|
||||||
etcd-server,
|
etcd-server,
|
||||||
|
@ -9,7 +34,7 @@ Depends:
|
||||||
python3-etcd (>= 0.4.3),
|
python3-etcd (>= 0.4.3),
|
||||||
@,
|
@,
|
||||||
Test-Command: debian/tests/acceptance etcd
|
Test-Command: debian/tests/acceptance etcd
|
||||||
Restrictions: allow-stderr
|
Restrictions: needs-root, allow-stderr, flaky
|
||||||
|
|
||||||
# consul
|
# consul
|
||||||
Features: test-name=acceptance-consul
|
Features: test-name=acceptance-consul
|
||||||
|
@ -22,7 +47,7 @@ Depends:
|
||||||
python3-coverage,
|
python3-coverage,
|
||||||
@,
|
@,
|
||||||
Test-Command: debian/tests/acceptance consul
|
Test-Command: debian/tests/acceptance consul
|
||||||
Restrictions: allow-stderr
|
Restrictions: allow-stderr, flaky, skip-not-installable
|
||||||
|
|
||||||
# zookeeper
|
# zookeeper
|
||||||
Features: test-name=acceptance-zookeeper
|
Features: test-name=acceptance-zookeeper
|
||||||
|
@ -33,9 +58,22 @@ Depends:
|
||||||
python3-behave,
|
python3-behave,
|
||||||
python3-coverage,
|
python3-coverage,
|
||||||
python3-kazoo,
|
python3-kazoo,
|
||||||
|
procps,
|
||||||
@,
|
@,
|
||||||
Test-Command: debian/tests/acceptance zookeeper
|
Test-Command: debian/tests/acceptance zookeeper "-e dcs_failsafe_mode"
|
||||||
Restrictions: needs-root, allow-stderr, skip-not-installable
|
Restrictions: needs-root, allow-stderr, flaky, skip-not-installable
|
||||||
|
|
||||||
|
# raft
|
||||||
|
Features: test-name=acceptance-raft
|
||||||
|
Depends:
|
||||||
|
moreutils,
|
||||||
|
postgresql,
|
||||||
|
python3-behave,
|
||||||
|
python3-coverage,
|
||||||
|
python3-pysyncobj,
|
||||||
|
@,
|
||||||
|
Test-Command: debian/tests/acceptance raft
|
||||||
|
Restrictions: allow-stderr, flaky
|
||||||
|
|
||||||
# regression tests
|
# regression tests
|
||||||
Depends:
|
Depends:
|
||||||
|
@ -46,6 +84,7 @@ Depends:
|
||||||
python3-kazoo,
|
python3-kazoo,
|
||||||
python3-kubernetes,
|
python3-kubernetes,
|
||||||
python3-mock,
|
python3-mock,
|
||||||
|
python3-pysyncobj,
|
||||||
python3-pytest-cov,
|
python3-pytest-cov,
|
||||||
@,
|
@,
|
||||||
Tests: test
|
Tests: test
|
||||||
|
|
4
debian/tests/test
vendored
4
debian/tests/test
vendored
|
@ -9,8 +9,4 @@ export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',)
|
||||||
# clean up afterwards
|
# clean up afterwards
|
||||||
trap 'rm -f /tmp/pgpass?' 0 2 3 15
|
trap 'rm -f /tmp/pgpass?' 0 2 3 15
|
||||||
|
|
||||||
# remove raft tests for now
|
|
||||||
rm -f tests/test_raft*py
|
|
||||||
rm -f patroni/dcs/raft.py patroni/raft_controller.py
|
|
||||||
|
|
||||||
python3 setup.py test
|
python3 setup.py test
|
||||||
|
|
Loading…
Reference in a new issue