Skip to content

[PGPRO-5691] move mmapped ptrack map into shared postgres memory #19

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
kulaginm merged 6 commits into from
Feb 28, 2022
Merged

[PGPRO-5691] move mmapped ptrack map into shared postgres memory #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a148c5
[PGPRO-5691] move mmapped ptrack map into shared postgres memory
kulaginm Feb 8, 2022
3ab1107
[PGPRO-5691] remove pg_probackup tests workarounds
kulaginm Feb 9, 2022
dbf1435
[PGPRO-5691]
kulaginm Feb 10, 2022
8739e88
[PGPRO-5691] reviewers comments taken into account
kulaginm Feb 12, 2022
01ded43
[PGPRO-5691] fix expected tap-test checks count
kulaginm Feb 12, 2022
8b30346
Merge branch 'master' into pgpro-5691
kulaginm Feb 12, 2022
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
Prev Previous commit
Next Next commit
[PGPRO-5691] 
* fix tap test (remove checking of ptrack.map.mmap file)
* cosmetic change (minimize diff with master)
  • Loading branch information
@kulaginm
kulaginm committed Feb 10, 2022
commit dbf14355e1c49cd65ac5e3ebc7a27cfe86f7c811
3 changes: 1 addition & 2 deletions engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ extern PtrackMap ptrack_map;
* Size of ptrack map in bytes
* TODO: to be protected by PtrackResizeLock?
*/
extern uint64 ptrack_map_size;
extern uint64 *ptrack_map_size_requested_at_startup;
extern uint64 ptrack_map_size;
extern int ptrack_map_size_tmp;

extern void ptrackCheckpoint(void);
Expand Down
6 changes: 3 additions & 3 deletions ptrack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@

PG_MODULE_MAGIC;

PtrackMap ptrack_map = NULL;
uint64 ptrack_map_size = 0;
int ptrack_map_size_tmp;
PtrackMap ptrack_map = NULL;
uint64 ptrack_map_size = 0;
int ptrack_map_size_tmp;

static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
static copydir_hook_type prev_copydir_hook = NULL;
Expand Down
1 change: 0 additions & 1 deletion t/001_basic.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
# Check that we have lost everything
ok(! -f $node->data_dir . "/global/ptrack.map", "ptrack.map should be cleaned up");
ok(! -f $node->data_dir . "/global/ptrack.map.tmp", "ptrack.map.tmp should be cleaned up");
ok(! -f $node->data_dir . "/global/ptrack.map.mmap", "ptrack.map.mmap should be cleaned up");

($res, $res_stdout, $res_stderr) = $node->psql("postgres", "SELECT ptrack_get_pagemapset('0/0')");
is($res, 3, 'errors out if ptrack is disabled');
Expand Down