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

PBCKP-155#514

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
dlepikhova merged 6 commits intoREL_2_5fromPBCKP-155
Aug 4, 2022
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
15 changes: 9 additions & 6 deletionstests/backup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1929,6 +1929,7 @@ def test_backup_with_least_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)
# >= 10
else:
Expand DownExpand Up@@ -1967,6 +1968,7 @@ def test_backup_with_least_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)

if self.ptrack:
Expand All@@ -1980,9 +1982,6 @@ def test_backup_with_least_privileges_role(self):
"GRANT EXECUTE ON FUNCTION ptrack.ptrack_init_lsn() TO backup;")

if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")

node.safe_psql(
"backupdb",
Expand DownExpand Up@@ -3068,7 +3067,9 @@ def test_missing_replication_permission(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)
# >= 10
else:
node.safe_psql(
Expand All@@ -3091,12 +3092,12 @@ def test_missing_replication_permission(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)

if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")

sleep(2)
Expand DownExpand Up@@ -3201,6 +3202,7 @@ def test_missing_replication_permission_1(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)
# >= 10
else:
Expand All@@ -3224,12 +3226,13 @@ def test_missing_replication_permission_1(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"

)

if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")

replica.promote()
Expand Down
11 changes: 6 additions & 5 deletionstests/checkdb.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -697,6 +697,7 @@ def test_checkdb_with_least_privileges(self):
'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anyarray, anyelement) TO backup; '
# 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
)
# PG 10
elif self.get_version(node) > 100000 and self.get_version(node) < 110000:
Expand DownExpand Up@@ -725,6 +726,9 @@ def test_checkdb_with_least_privileges(self):
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; '
'GRANT EXECUTE ON FUNCTION pg_catalog.string_to_array(text, text) TO backup; '
'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anyarray, anyelement) TO backup;'
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
)
if ProbackupTest.enterprise:
# amcheck-1.1
Expand DownExpand Up@@ -765,6 +769,7 @@ def test_checkdb_with_least_privileges(self):
'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anyarray, anyelement) TO backup; '
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
)
# checkunique parameter
if ProbackupTest.enterprise:
Expand DownExpand Up@@ -803,18 +808,14 @@ def test_checkdb_with_least_privileges(self):
'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anycompatiblearray, anycompatible) TO backup; '
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
)
# checkunique parameter
if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool, bool) TO backup")

if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")

# checkdb
try:
self.checkdb_node(
Expand Down
6 changes: 2 additions & 4 deletionstests/helpers/ptrack_helpers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,11 +96,9 @@ def is_enterprise():
stdout=subprocess.PIPE,
stderr=subprocess.PIPE
)
if b'postgrespro.ru' in p.communicate()[0]:
return True
else:
return False
return b'postgrespro.ru' in p.communicate()[0]


def is_nls_enabled():
cmd = [os.environ['PG_CONFIG'], '--configure']

Expand Down
11 changes: 7 additions & 4 deletionstests/pgpro560.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,15 +32,16 @@ def test_pgpro560_control_file_loss(self):
node.slow_start()

file = os.path.join(node.base_dir, 'data', 'global', 'pg_control')
os.remove(file)
# Not delete this file permanently
os.rename(file, os.path.join(node.base_dir, 'data', 'global', 'pg_control_copy'))

try:
self.backup_node(backup_dir, 'node', node, options=['--stream'])
# we should die here because exception is what we expect to happen
self.assertEqual(
1, 0,
"Expecting Error because pg_control was deleted.\n "
"Output: {0} \n CMD: {1}".format(repr(self.output), self.cmd))
1, 0,
"Expecting Error because pg_control was deleted.\n "
"Output: {0} \n CMD: {1}".format(repr(self.output), self.cmd))
except ProbackupException as e:
self.assertTrue(
'ERROR: Could not open file' in e.message and
Expand All@@ -49,6 +50,8 @@ def test_pgpro560_control_file_loss(self):
repr(e.message), self.cmd))

# Clean after yourself
# Return this file to avoid Postger fail
os.rename(os.path.join(node.base_dir, 'data', 'global', 'pg_control_copy'), file)
self.del_test_dir(module_name, fname)

def test_pgpro560_systemid_mismatch(self):
Expand Down
6 changes: 2 additions & 4 deletionstests/ptrack.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -582,6 +582,7 @@ def test_ptrack_unprivileged(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
)
# >= 10
else:
Expand DownExpand Up@@ -618,6 +619,7 @@ def test_ptrack_unprivileged(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
)

node.safe_psql(
Expand All@@ -635,10 +637,6 @@ def test_ptrack_unprivileged(self):
"GRANT SELECT ON TABLE pg_catalog.pg_extension TO backup")

if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")

node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")
Expand Down
5 changes: 2 additions & 3 deletionstests/restore.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3270,6 +3270,7 @@ def test_missing_database_map(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)
# >= 10
else:
Expand DownExpand Up@@ -3307,6 +3308,7 @@ def test_missing_database_map(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;"
)

if self.ptrack:
Expand All@@ -3321,9 +3323,6 @@ def test_missing_database_map(self):
"CREATE EXTENSION ptrack WITH SCHEMA ptrack")

if ProbackupTest.enterprise:
node.safe_psql(
"backupdb",
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup")

node.safe_psql(
"backupdb",
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp