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-258] fix multiple permission tests (revert a3ac7d5e7a8d6ebeafd…#527

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
kulaginm merged 2 commits intomasterfromPBCKP-258
Aug 27, 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
2 changes: 2 additions & 0 deletions.travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ env:
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=locking
Expand All@@ -52,6 +53,7 @@ env:
jobs:
allow_failures:
- if: env(PG_BRANCH) = master
- if: env(PG_BRANCH) = REL_15_STABLE
- if: env(PG_BRANCH) = REL9_5_STABLE
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)

Expand Down
58 changes: 18 additions & 40 deletionstests/backup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1889,8 +1889,7 @@ def test_backup_with_least_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() 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;")
# PG 9.6
elif self.get_version(node) > 90600 and self.get_version(node) < 100000:
node.safe_psql(
Expand DownExpand Up@@ -1928,9 +1927,7 @@ def test_backup_with_least_privileges_role(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.pgpro_edition() TO backup;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
# >= 10
else:
node.safe_psql(
Expand DownExpand Up@@ -1967,9 +1964,7 @@ def test_backup_with_least_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
"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;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")

if self.ptrack:
node.safe_psql(
Expand All@@ -1982,10 +1977,10 @@ 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_version() TO backup")
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;")

# FULL backup
self.backup_node(
Expand DownExpand Up@@ -2245,7 +2240,6 @@ def test_backup_with_less_privileges_role(self):
if self.get_version(node) < 90600:
node.safe_psql(
'backupdb',
"BEGIN; "
"CREATE ROLE backup WITH LOGIN; "
"GRANT USAGE ON SCHEMA pg_catalog TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
Expand All@@ -2256,14 +2250,11 @@ def test_backup_with_less_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() 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; "
"COMMIT;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
# PG 9.6
elif self.get_version(node) > 90600 and self.get_version(node) < 100000:
node.safe_psql(
'backupdb',
"BEGIN; "
"CREATE ROLE backup WITH LOGIN; "
"GRANT USAGE ON SCHEMA pg_catalog TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
Expand All@@ -2275,14 +2266,11 @@ def test_backup_with_less_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() 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; "
"COMMIT;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
# >= 10
else:
node.safe_psql(
'backupdb',
"BEGIN; "
"CREATE ROLE backup WITH LOGIN; "
"GRANT USAGE ON SCHEMA pg_catalog TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
Expand All@@ -2294,9 +2282,7 @@ def test_backup_with_less_privileges_role(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() 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; "
"COMMIT;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")

# enable STREAM backup
node.safe_psql(
Expand DownExpand Up@@ -3067,9 +3053,7 @@ 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.pgpro_edition() TO backup;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
# >= 10
else:
node.safe_psql(
Expand All@@ -3091,15 +3075,14 @@ def test_missing_replication_permission(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
"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;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")

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

"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;")

sleep(2)
replica.promote()

Expand DownExpand Up@@ -3177,8 +3160,7 @@ def test_missing_replication_permission_1(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() 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;")
# PG 9.6
elif self.get_version(node) > 90600 and self.get_version(node) < 100000:
node.safe_psql(
Expand All@@ -3201,9 +3183,7 @@ def test_missing_replication_permission_1(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.pgpro_edition() TO backup;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
# >= 10
else:
node.safe_psql(
Expand All@@ -3225,15 +3205,13 @@ def test_missing_replication_permission_1(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
"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;"

)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")

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

replica.promote()

Expand Down
31 changes: 16 additions & 15 deletionstests/checkdb.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -666,8 +666,8 @@ def test_checkdb_with_least_privileges(self):
'GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() 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, bool) TO backup;' # amcheck-next function
)
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;') # amcheck-next function

# PG 9.6
elif self.get_version(node) > 90600 and self.get_version(node) < 100000:
node.safe_psql(
Expand DownExpand Up@@ -696,9 +696,8 @@ def test_checkdb_with_least_privileges(self):
'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; '
)
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;')

# PG 10
elif self.get_version(node) > 100000 and self.get_version(node) < 110000:
node.safe_psql(
Expand DownExpand Up@@ -726,10 +725,8 @@ 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; '
)
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup;')

if ProbackupTest.enterprise:
# amcheck-1.1
node.safe_psql(
Expand DownExpand Up@@ -768,9 +765,8 @@ def test_checkdb_with_least_privileges(self):
'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; '
)
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;')

# checkunique parameter
if ProbackupTest.enterprise:
if (self.get_version(node) >= 111300 and self.get_version(node) < 120000
Expand DownExpand Up@@ -807,15 +803,20 @@ def test_checkdb_with_least_privileges(self):
'GRANT EXECUTE ON FUNCTION pg_catalog.string_to_array(text, text) TO backup; '
'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; '
)
'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) 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_version() TO backup; '
'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;')

# checkdb
try:
self.checkdb_node(
Expand Down
14 changes: 5 additions & 9 deletionstests/restore.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3230,8 +3230,7 @@ def test_missing_database_map(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup; "
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() 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;")
# PG 9.6
elif self.get_version(node) > 90600 and self.get_version(node) < 100000:
node.safe_psql(
Expand DownExpand Up@@ -3269,9 +3268,7 @@ def test_missing_database_map(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.pgpro_edition() TO backup;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")
# >= 10
else:
node.safe_psql(
Expand DownExpand Up@@ -3307,9 +3304,7 @@ def test_missing_database_map(self):
"GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup; "
"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;"
)
"GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;")

if self.ptrack:
# TODO why backup works without these grants ?
Expand All@@ -3326,7 +3321,8 @@ def test_missing_database_map(self):

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

# FULL backup without database_map
backup_id = self.backup_node(
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp