Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Add **kwargs to append_conf()#48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletionstestgres/backup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,8 +149,9 @@ def spawn_primary(self, name=None, destroy=True):
# New nodes should always remove dir tree
node._should_rm_dirs = True

node.append_conf(PG_CONF_FILE, "\n")
node.append_conf(PG_CONF_FILE, "port = {}".format(node.port))
# Set a new port
node.append_conf(filename=PG_CONF_FILE, line='\n')
node.append_conf(filename=PG_CONF_FILE, port=node.port)

return node

Expand Down
4 changes: 3 additions & 1 deletiontestgres/consts.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,9 +26,11 @@
BACKUP_LOG_FILE = "backup.log"

# defaults for node settings
MAX_LOGICAL_REPLICATION_WORKERS = 5
MAX_REPLICATION_SLOTS = 10
MAX_WAL_SENDERS = 10
MAX_WORKER_PROCESSES = 10
WAL_KEEP_SEGMENTS = 20
MAX_WAL_SENDERS = 10

# logical replication settings
LOGICAL_REPL_MAX_CATCHUP_ATTEMPTS = 60
107 changes: 63 additions & 44 deletionstestgres/node.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
import time

from shutil import rmtree
from six import raise_from, iteritems
from six import raise_from, iteritems, text_type
from tempfile import mkstemp, mkdtemp

from .enums import \
Expand DownExpand Up@@ -38,8 +38,10 @@
PG_PID_FILE

from .consts import \
MAX_WAL_SENDERS, \
MAX_LOGICAL_REPLICATION_WORKERS, \
MAX_REPLICATION_SLOTS, \
MAX_WORKER_PROCESSES, \
MAX_WAL_SENDERS, \
WAL_KEEP_SEGMENTS

from .decorators import \
Expand DownExpand Up@@ -329,25 +331,27 @@ def _create_recovery_conf(self, username, slot=None):
# Connect to master for some additional actions
with master.connect(username=username) as con:
# check if slot already exists
res = con.execute("""
res = con.execute(
"""
select exists (
select from pg_catalog.pg_replication_slots
where slot_name = %s
)
""", slot)
""", slot)

if res[0][0]:
raise TestgresException(
"Slot '{}' already exists".format(slot))

# TODO: we should drop this slot after replica's cleanup()
con.execute("""
con.execute(
"""
select pg_catalog.pg_create_physical_replication_slot(%s)
""", slot)
""", slot)

line += "primary_slot_name={}\n".format(slot)

self.append_conf(RECOVERY_CONF_FILE, line)
self.append_conf(filename=RECOVERY_CONF_FILE,line=line)

def _maybe_start_logger(self):
if testgres_config.use_python_logging:
Expand DownExpand Up@@ -475,65 +479,80 @@ def get_auth_method(t):

# overwrite config file
with io.open(postgres_conf, "w") as conf:
# remove old lines
conf.truncate()

if not fsync:
conf.write(u"fsync = off\n")
self.append_conf(fsync=fsync,
max_worker_processes=MAX_WORKER_PROCESSES,
log_statement=log_statement,
listen_addresses=self.host,
port=self.port) # yapf:disable

conf.write(u"log_statement = {}\n"
u"listen_addresses = '{}'\n"
u"port = {}\n".format(log_statement,
self.host,
self.port)) # yapf: disable
# common replication settings
if allow_streaming or allow_logical:
Copy link
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Had to fix settings according tothis page.

self.append_conf(max_replication_slots=MAX_REPLICATION_SLOTS,
max_wal_senders=MAX_WAL_SENDERS) # yapf: disable

# replication-related settings
if allow_streaming:
# binary replication
if allow_streaming:
# select a proper wal_level for PostgreSQL
wal_level = 'replica' if self._pg_version >= '9.6' else 'hot_standby'

# select a proper wal_level for PostgreSQL
if self._pg_version >= '9.6':
wal_level = "replica"
else:
wal_level = "hot_standby"

conf.write(u"hot_standby = on\n"
u"max_wal_senders = {}\n"
u"max_replication_slots = {}\n"
u"wal_keep_segments = {}\n"
u"wal_level = {}\n".format(MAX_WAL_SENDERS,
MAX_REPLICATION_SLOTS,
WAL_KEEP_SEGMENTS,
wal_level)) # yapf: disable

if allow_logical:
if self._pg_version < '10':
raise InitNodeException(
"Logical replication is only available for Postgres 10 "
"and newer")
conf.write(u"wal_level = logical\n")

# disable UNIX sockets if asked to
if not unix_sockets:
conf.write(u"unix_socket_directories = ''\n")
self.append_conf(hot_standby=True,
wal_keep_segments=WAL_KEEP_SEGMENTS,
wal_level=wal_level) # yapf: disable

# logical replication
if allow_logical:
if self._pg_version < '10':
raise InitNodeException("Logical replication is only "
"available on PostgreSQL 10 and newer")

self.append_conf(
max_logical_replication_workers=MAX_LOGICAL_REPLICATION_WORKERS,
wal_level='logical')

# disable UNIX sockets if asked to
if not unix_sockets:
self.append_conf(unix_socket_directories='')

return self

@method_decorator(positional_args_hack(['filename', 'line']))
def append_conf(self, line, filename=PG_CONF_FILE):
def append_conf(self, line='', filename=PG_CONF_FILE, **kwargs):
"""
Append line to a config file.

Args:
line: string to be appended to config.
filename: config file (postgresql.conf by default).
**kwargs: named config options.

Returns:
This instance of :class:`.PostgresNode`.

Examples:
append_conf(fsync=False)
append_conf('log_connections = yes')
append_conf(random_page_cost=1.5, fsync=True, ...)
append_conf('postgresql.conf', 'synchronous_commit = off')
"""

lines = [line]

for option, value in iteritems(kwargs):
if isinstance(value, bool):
value = 'on' if value else 'off'
elif not str(value).replace('.', '', 1).isdigit():
value = "'{}'".format(value)

# format a new config line
lines.append('{} = {}'.format(option, value))

config_name = os.path.join(self.data_dir, filename)
with io.open(config_name, 'a') as conf:
conf.write(u''.join([line, '\n']))
for line in lines:
conf.write(text_type(line))
conf.write(text_type('\n'))

return self

Expand Down
2 changes: 1 addition & 1 deletiontests/test_simple.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,7 +195,7 @@ def test_reload(self):

# change client_min_messages and save old value
cmm_old = node.execute('show client_min_messages')
node.append_conf('client_min_messages =DEBUG1')
node.append_conf(client_min_messages='DEBUG1')

# reload config
node.reload()
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp