Compare commits
32 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 |
56
debian/changelog
vendored
56
debian/changelog
vendored
|
@ -1,3 +1,59 @@
|
||||||
|
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
|
patroni (2.1.5-1) unstable; urgency=medium
|
||||||
|
|
||||||
* Team upload.
|
* Team upload.
|
||||||
|
|
4
debian/control
vendored
4
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,7 +46,7 @@ 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-pysyncobj, python3-cdiff
|
python3-kubernetes | python3-pysyncobj, python3-cdiff
|
||||||
Recommends: iproute2
|
Recommends: iproute2
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
--- a/features/environment.py
|
Index: patroni/features/environment.py
|
||||||
+++ b/features/environment.py
|
===================================================================
|
||||||
@@ -146,7 +146,7 @@ class PatroniController(AbstractControll
|
--- patroni.orig/features/environment.py
|
||||||
|
+++ patroni/features/environment.py
|
||||||
|
@@ -150,7 +150,7 @@ class PatroniController(AbstractControll
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
env['BEHAVE_DEBUG'] = 'true'
|
env['BEHAVE_DEBUG'] = 'true'
|
||||||
patroni = subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
|
patroni = subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
|
||||||
|
|
|
@ -17,11 +17,11 @@ Date: Fri Jul 29 14:55:15 2022 +0200
|
||||||
|
|
||||||
Close #2370
|
Close #2370
|
||||||
|
|
||||||
diff --git a/patroni/postgresql/config.py b/patroni/postgresql/config.py
|
Index: patroni/patroni/postgresql/config.py
|
||||||
index 9314315..976cf48 100644
|
===================================================================
|
||||||
--- a/patroni/postgresql/config.py
|
--- patroni.orig/patroni/postgresql/config.py
|
||||||
+++ b/patroni/postgresql/config.py
|
+++ patroni/patroni/postgresql/config.py
|
||||||
@@ -362,7 +362,7 @@ class ConfigHandler(object):
|
@@ -355,7 +355,7 @@ class ConfigHandler(object):
|
||||||
try:
|
try:
|
||||||
for f in self._configuration_to_save:
|
for f in self._configuration_to_save:
|
||||||
config_file = os.path.join(self._config_dir, f)
|
config_file = os.path.join(self._config_dir, f)
|
||||||
|
@ -30,7 +30,7 @@ index 9314315..976cf48 100644
|
||||||
if os.path.isfile(config_file):
|
if os.path.isfile(config_file):
|
||||||
shutil.copy(config_file, backup_file)
|
shutil.copy(config_file, backup_file)
|
||||||
except IOError:
|
except IOError:
|
||||||
@@ -374,7 +374,7 @@ class ConfigHandler(object):
|
@@ -367,7 +367,7 @@ class ConfigHandler(object):
|
||||||
try:
|
try:
|
||||||
for f in self._configuration_to_save:
|
for f in self._configuration_to_save:
|
||||||
config_file = os.path.join(self._config_dir, f)
|
config_file = os.path.join(self._config_dir, f)
|
||||||
|
|
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):
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -4,3 +4,4 @@ requirements_setuptools.patch
|
||||||
offline_intersphinx.patch
|
offline_intersphinx.patch
|
||||||
requirements_cdiff.patch
|
requirements_cdiff.patch
|
||||||
avoid_overwriting_configuration_during_boostrap.patch
|
avoid_overwriting_configuration_during_boostrap.patch
|
||||||
|
regression_tests_skip_citus_test.patch
|
||||||
|
|
10
debian/tests/acceptance
vendored
10
debian/tests/acceptance
vendored
|
@ -44,6 +44,16 @@ 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 $@ ###"
|
echo "### PostgreSQL $PG_VERSION acceptance-$DCS $@ ###"
|
||||||
|
|
20
debian/tests/control
vendored
20
debian/tests/control
vendored
|
@ -1,3 +1,16 @@
|
||||||
|
# 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
|
Features: test-name=acceptance-etcd-basic
|
||||||
Depends:
|
Depends:
|
||||||
|
@ -9,7 +22,7 @@ Depends:
|
||||||
python3-etcd (>= 0.4.3),
|
python3-etcd (>= 0.4.3),
|
||||||
@,
|
@,
|
||||||
Test-Command: debian/tests/acceptance etcd features/basic_replication.feature
|
Test-Command: debian/tests/acceptance etcd features/basic_replication.feature
|
||||||
Restrictions: allow-stderr
|
Restrictions: needs-root, allow-stderr
|
||||||
|
|
||||||
Features: test-name=acceptance-etcd
|
Features: test-name=acceptance-etcd
|
||||||
Depends:
|
Depends:
|
||||||
|
@ -21,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, flaky
|
Restrictions: needs-root, allow-stderr, flaky
|
||||||
|
|
||||||
# consul
|
# consul
|
||||||
Features: test-name=acceptance-consul
|
Features: test-name=acceptance-consul
|
||||||
|
@ -45,8 +58,9 @@ 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, flaky, skip-not-installable
|
Restrictions: needs-root, allow-stderr, flaky, skip-not-installable
|
||||||
|
|
||||||
# raft
|
# raft
|
||||||
|
|
Loading…
Reference in a new issue