NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit78afcf9

committed

Merge branch 'PGPROEE9_6' into PGPROEE9_6_RDMA

2 parents96ec1c1 +cca00d5 commit78afcf9Copy full SHA for 78afcf9

File tree

3 files changed

+40

-10

lines changed

src
- backend/storage
  - file
    - cfs.c
  - smgr
    - md.c
- include/storage
  - cfs.h

3 files changed

+40

-10

lines changed

`‎src/backend/storage/file/cfs.c‎`

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -987,13 +987,16 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`987`	`987`	`cfs_state->gc_stat.processedFiles+=1;`
`988`	`988`	`cfs_gc_processed_segments+=1;`
`989`	`989`
	`990`	`+retry:`
`990`	`991`	`/* temporary lock file for fetching map snapshot */`
`991`	`992`	`cfs_gc_lock(lock);`
`992`	`993`
`993`	`994`	`/* Reread variables after locking file */`
	`995`	`+physSize=pg_atomic_read_u32(&map->hdr.physSize);`
`994`	`996`	`virtSize=pg_atomic_read_u32(&map->hdr.virtSize);`
`995`	`997`	`n_pages=virtSize /BLCKSZ;`
`996`		`-retry:`
	`998`	`+if (physSize >=CFS_RED_LINE)`
	`999`	`+gotoforceWhole;`
`997`	`1000`	`for (i=0;i<n_pages;i++)`
`998`	`1001`	`{`
`999`	`1002`	`newMap->inodes[i]=map->inodes[i];`
`@@ -1026,10 +1029,9 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1026`	`1029`
`1027`	`1030`	`/* Reread variables after locking file */`
`1028`	`1031`	`n_pages1=n_pages;`
	`1032`	`+physSize=pg_atomic_read_u32(&map->hdr.physSize);`
`1029`	`1033`	`virtSize=pg_atomic_read_u32(&map->hdr.virtSize);`
`1030`	`1034`	`n_pages=virtSize /BLCKSZ;`
`1031`		`-second_pass=0;`
`1032`		`-second_pass_bytes=0;`
`1033`	`1035`
`1034`	`1036`	`for (i=0;i<n_pages;i++)`
`1035`	`1037`	`{`
`@@ -1074,10 +1076,16 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1074`	`1076`	`memset(newMap->inodes,0,sizeof(newMap->inodes));`
`1075`	`1077`	`elog(LOG,"CFS: retry %d whole gc file %s",second_pass_whole,`
`1076`	`1078`	`file_path);`
`1077`		`-if (second_pass_whole==1)`
	`1079`	`+if (second_pass_whole==1&&physSize<CFS_RETRY_GC_THRESHOLD)`
`1078`	`1080`	`{`
	`1081`	`+cfs_gc_unlock(lock);`
	`1082`	`+/* sleep, cause there is possibly checkpoint is on a way */`
	`1083`	`+pg_usleep(CFS_LOCK_MAX_TIMEOUT);`
	`1084`	`+second_pass=0;`
	`1085`	`+second_pass_bytes=0;`
`1079`	`1086`	`gotoretry;`
`1080`	`1087`	`}`
	`1088`	`+forceWhole:`
`1081`	`1089`	`for (i=0;i<n_pages;i++)`
`1082`	`1090`	`{`
`1083`	`1091`	`newMap->inodes[i]=map->inodes[i];`
`@@ -1275,7 +1283,7 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1275`	`1283`	`{`
`1276`	`1284`	`elog(LOG,"CFS GC worker %d: defragment file %s: old size %u, new size %u, logical size %u, used %u, compression ratio %f, time %ld usec; second pass: pages %u, bytes %u, time %ld"`
`1277`	`1285`	`,`
`1278`		`-MyProcPid,file_path,physSize,newSize,virtSize,usedSize, (double)virtSize/newSize,`
	`1286`	`+MyProcPid,file_path,physSize,newSize,virtSize,newUsed, (double)virtSize/newSize,`
`1279`	`1287`	`secs*USECS_PER_SEC+usecs,second_pass,second_pass_bytes,`
`1280`	`1288`	`secs2*USECS_PER_SEC+usecs2);`
`1281`	`1289`	`}`

`‎src/backend/storage/smgr/md.c‎`

Lines changed: 26 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -451,6 +451,7 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo)`
`451`	`451`	`void`
`452`	`452`	`mdunlink(RelFileNodeBackendrnode,ForkNumberforkNum,boolisRedo)`
`453`	`453`	`{`
	`454`	`+boolcfs_gc_locked= false;`
`454`	`455`	`/*`
`455`	`456`	`* We have to clean out any pending fsync requests for the doomed`
`456`	`457`	`* relation, else the next mdsync() will fail. There can't be any such`
`@@ -461,14 +462,34 @@ mdunlink(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)`
`461`	`462`	`if (!RelFileNodeBackendIsTemp(rnode))`
`462`	`463`	`ForgetRelationFsyncRequests(rnode.node,forkNum);`
`463`	`464`
`464`		`-/* Now do the per-fork work */`
`465`		`-if (forkNum==InvalidForkNumber)`
	`465`	`+if (md_use_compression(rnode,forkNum==InvalidForkNumber ?MAIN_FORKNUM :forkNum))`
`466`	`466`	`{`
`467`		`-for (forkNum=0;forkNum <=MAX_FORKNUM;forkNum++)`
	`467`	`+cfs_gc_locked= true;`
	`468`	`+cfs_control_gc_lock();`
	`469`	`+}`
	`470`	`+`
	`471`	`+PG_TRY();`
	`472`	`+{`
	`473`	`+/* Now do the per-fork work */`
	`474`	`+if (forkNum==InvalidForkNumber)`
	`475`	`+{`
	`476`	`+for (forkNum=0;forkNum <=MAX_FORKNUM;forkNum++)`
	`477`	`+mdunlinkfork(rnode,forkNum,isRedo);`
	`478`	`+}`
	`479`	`+else`
	`480`	`+{`
`468`	`481`	`mdunlinkfork(rnode,forkNum,isRedo);`
	`482`	`+}`
`469`	`483`	`}`
`470`		`-else`
`471`		`-mdunlinkfork(rnode,forkNum,isRedo);`
	`484`	`+PG_CATCH();`
	`485`	`+{`
	`486`	`+if (cfs_gc_locked)`
	`487`	`+cfs_control_gc_unlock();`
	`488`	`+PG_RE_THROW();`
	`489`	`+}`
	`490`	`+PG_END_TRY();`
	`491`	`+if (cfs_gc_locked)`
	`492`	`+cfs_control_gc_unlock();`
`472`	`493`	`}`
`473`	`494`
`474`	`495`	`staticvoid`

`‎src/include/storage/cfs.h‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ typedef uint64 inode_t;`
`53`	`53`	`#defineCFS_INODE_CLEAN_FLAG ((inode_t)1 << 63)`
`54`	`54`
`55`	`55`	`#defineCFS_IMPLICIT_GC_THRESHOLD 0x80000000U/* 2Gb */`
	`56`	`+#defineCFS_RETRY_GC_THRESHOLD 0x60000000U/* 1.5Gb */`
`56`	`57`	`#defineCFS_RED_LINE 0xC0000000U/* 3Gb */`
`57`	`58`
`58`	`59`	`size_tcfs_compress(voiddst,size_tdst_size,voidconstsrc,size_tsrc_size);`

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!

Commit78afcf9

File tree

3 files changed

3 files changed

`‎src/backend/storage/file/cfs.c‎`

`‎src/backend/storage/smgr/md.c‎`

`‎src/include/storage/cfs.h‎`

0 commit comments