Merge branch 'PGPROEE9_6_CFS_385' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6_CFS_385

vbwagner · vbwagner · commit 48d4a135d2c3 · 2017-06-29T15:04:35.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1161,23 +1161,34 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 
 		if (cfs_gc_verify_file)
 		{
+			off_t soff = -1;
 			fd = open(file_bck_path, O_RDONLY|PG_BINARY, 0);
 			Assert(fd >= 0);
 
 			for (i = 0; i < n_pages; i++)
 			{
-				inode_t inode = newMap->inodes[i];
+				inodes[i] = &newMap->inodes[i];
+			}
+			qsort(inodes, n_pages, sizeof(inode_t*), cfs_cmp_page_offs);
+
+			for (i = 0; i < n_pages; i++)
+			{
+				inode_t inode = *inodes[i];
 				int size = CFS_INODE_SIZE(inode);
 				if (size != 0 && size < BLCKSZ)
 				{
 					char block[BLCKSZ];
 					char decomressedBlock[BLCKSZ];
 					off_t res PG_USED_FOR_ASSERTS_ONLY;
 					bool rc PG_USED_FOR_ASSERTS_ONLY;
-					res = lseek(fd, CFS_INODE_OFFS(inode), SEEK_SET);
-					Assert(res == (off_t)CFS_INODE_OFFS(inode));
+					if (soff != CFS_INODE_OFFS(inode))
+					{
+						soff = lseek(fd, CFS_INODE_OFFS(inode), SEEK_SET);
+						Assert(soff == (off_t)CFS_INODE_OFFS(inode));
+					}
 					rc = cfs_read_file(fd, block, size);
 					Assert(rc);
+					soff += size;
 					cfs_decrypt(file_bck_path, block, (off_t)i*BLCKSZ, size);
 					res = cfs_decompress(decomressedBlock, BLCKSZ, block, size);
 
@@ -1480,21 +1491,18 @@ void cfs_gc_start_bgworkers()
 /* Disable garbage collection. */
 void cfs_control_gc_lock(void)
 {
-	uint32 was_disabled = pg_atomic_fetch_add_u32(&cfs_state->gc_disabled, 1);
-	if (!was_disabled)
+	pg_atomic_fetch_add_u32(&cfs_state->gc_disabled, 1);
+	/* Wait until there are no active GC workers */
+	while (pg_atomic_read_u32(&cfs_state->n_active_gc) != 0)
 	{
-		/* Wait until there are no active GC workers */
-		while (pg_atomic_read_u32(&cfs_state->n_active_gc) != 0)
-		{
-			int rc = WaitLatch(MyLatch,
-							   WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
-							   CFS_DISABLE_TIMEOUT /* ms */);
-			if (rc & WL_POSTMASTER_DEATH)
-				exit(1);
+		int rc = WaitLatch(MyLatch,
+						   WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
+						   CFS_DISABLE_TIMEOUT /* ms */);
+		if (rc & WL_POSTMASTER_DEATH)
+			exit(1);
 
-			ResetLatch(MyLatch);
-			CHECK_FOR_INTERRUPTS();
-		}
+		ResetLatch(MyLatch);
+		CHECK_FOR_INTERRUPTS();
 	}
 }
 
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
@@ -477,6 +477,7 @@ mdunlink(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)
 				mdunlinkfork(rnode, forkNum, isRedo);
 		}
 		else
+		{
 			mdunlinkfork(rnode, forkNum, isRedo);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -477,6 +477,7 @@ mdunlink(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)`
`477`	`477`	`mdunlinkfork(rnode, forkNum, isRedo);`
`478`	`478`	`}`
`479`	`479`	`else`
	`480`	`+ {`
`480`	`481`	`mdunlinkfork(rnode, forkNum, isRedo);`
`481`	`482`	`}`
`482`	`483`	`}`