NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit174bbc5

committed

pathman: concurrent config initialization issue fixed

1 parent657ac2b commit174bbc5Copy full SHA for 174bbc5

File tree

2 files changed

-14

lines changed

contrib/pg_pathman
- dsm_array.c
- init.c

2 files changed

-14

lines changed

`‎contrib/pg_pathman/dsm_array.c`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,6 @@ init_dsm_segment(size_t blocks_count, size_t block_size)`
`79`	`79`	`{`
`80`	`80`	`boolret;`
`81`	`81`
`82`		`-/* lock here */`
`83`		`-LWLockAcquire(pmstate->dsm_init_lock,LW_EXCLUSIVE);`
`84`		`-`
`85`	`82`	`/* if there is already an existing segment then attach to it */`
`86`	`83`	`if (dsm_cfg->segment_handle!=0)`
`87`	`84`	`{`
`@@ -110,8 +107,6 @@ init_dsm_segment(size_t blocks_count, size_t block_size)`
`110`	`107`	`* destroyed by the end of transaction`
`111`	`108`	`*/`
`112`	`109`	`dsm_pin_mapping(segment);`
`113`		`-/* unlock here */`
`114`		`-LWLockRelease(pmstate->dsm_init_lock);`
`115`	`110`
`116`	`111`	`returnret;`
`117`	`112`	`}`

`‎contrib/pg_pathman/init.c`

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ load_config(void)`
`78`	`78`	`Oid*databases;`
`79`	`79`
`80`	`80`	`initialization_needed= false;`
	`81`	`+`
	`82`	`+LWLockAcquire(pmstate->dsm_init_lock,LW_EXCLUSIVE);`
`81`	`83`	`new_segment_created=init_dsm_segment(INITIAL_BLOCKS_COUNT,32);`
`82`	`84`
`83`	`85`	`/* If dsm segment just created */`
`@@ -88,29 +90,22 @@ load_config(void)`
`88`	`90`	`* oid into it. This array contains databases oids`
`89`	`91`	`* that have already been cached (to prevent repeat caching)`
`90`	`92`	`*/`
`91`		`-LWLockAcquire(pmstate->dsm_init_lock,LW_EXCLUSIVE);`
`92`		`-`
`93`	`93`	`if (&pmstate->databases.length>0)`
`94`	`94`	`free_dsm_array(&pmstate->databases);`
`95`	`95`	`alloc_dsm_array(&pmstate->databases,sizeof(Oid),1);`
`96`	`96`	`databases= (Oid*)dsm_array_get_pointer(&pmstate->databases);`
`97`	`97`	`databases[0]=MyDatabaseId;`
`98`		`-`
`99`		`-LWLockRelease(pmstate->dsm_init_lock);`
`100`	`98`	`}`
`101`	`99`	`else`
`102`	`100`	`{`
`103`	`101`	`intdatabases_count=pmstate->databases.length;`
`104`	`102`	`inti;`
`105`	`103`
`106`	`104`	`/* Check if we already cached config for current database */`
`107`		`-LWLockAcquire(pmstate->dsm_init_lock,LW_EXCLUSIVE);`
`108`		`-`
`109`	`105`	`databases= (Oid*)dsm_array_get_pointer(&pmstate->databases);`
`110`	`106`	`for(i=0;i<databases_count;i++)`
`111`	`107`	`if (databases[i]==MyDatabaseId)`
`112`	`108`	`{`
`113`		`-// LWLockRelease(pmstate->load_config_lock);`
`114`	`109`	`LWLockRelease(pmstate->dsm_init_lock);`
`115`	`110`	`return;`
`116`	`111`	`}`
`@@ -119,14 +114,13 @@ load_config(void)`
`119`	`114`	`resize_dsm_array(&pmstate->databases,sizeof(Oid),databases_count+1);`
`120`	`115`	`databases= (Oid*)dsm_array_get_pointer(&pmstate->databases);`
`121`	`116`	`databases[databases_count]=MyDatabaseId;`
`122`		`-`
`123`		`-LWLockRelease(pmstate->dsm_init_lock);`
`124`	`117`	`}`
`125`	`118`
`126`	`119`	`/* Load cache */`
`127`	`120`	`LWLockAcquire(pmstate->load_config_lock,LW_EXCLUSIVE);`
`128`	`121`	`load_relations_hashtable(new_segment_created);`
`129`	`122`	`LWLockRelease(pmstate->load_config_lock);`
	`123`	`+LWLockRelease(pmstate->dsm_init_lock);`
`130`	`124`	`}`
`131`	`125`
`132`	`126`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit174bbc5

File tree

2 files changed

2 files changed

`‎contrib/pg_pathman/dsm_array.c`

`‎contrib/pg_pathman/init.c`

0 commit comments