Replace LOG with WARNING for CFS IO errors

knizhnik · knizhnik · commit dd77f5536829 · 2017-02-27T12:36:20.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -591,7 +591,7 @@ void cfs_lock_file(FileMap* map, char const* file_path)
 				{
 					/* Recover map. */
 					if (!cfs_read_file(md2, map, sizeof(FileMap)))
-						elog(LOG, "CFS failed to read file %s: %m", map_bck_path);
+						elog(WARNING, "CFS failed to read file %s: %m", map_bck_path);
 
 					close(md2);
 				}
@@ -681,15 +681,15 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 	if (md < 0)
 	{ 
 		if (!noerror) { 
-			elog(LOG, "CFS failed to open map file %s: %m", map_path);
+			elog(WARNING, "CFS failed to open map file %s: %m", map_path);
 		}
 		goto FinishGC;
 	}
 
 	map = cfs_mmap(md);
 	if (map == MAP_FAILED)
 	{
-		elog(LOG, "CFS failed to map file %s: %m", map_path);
+		elog(WARNING, "CFS failed to map file %s: %m", map_path);
 		close(md);
 		goto FinishGC;
 	}
@@ -751,7 +751,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 						/* Recover map */
 						if (!cfs_read_file(md2, newMap, sizeof(FileMap)))
 						{
-							elog(LOG, "CFS failed to read file %s: %m", map_bck_path);
+							elog(WARNING, "CFS failed to read file %s: %m", map_bck_path);
 							goto Cleanup;
 						}
 						close(md2);
@@ -823,14 +823,14 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 
 				if (!cfs_read_file(fd, block, size))
 				{
-					elog(LOG, "CFS GC failed to read block %d of file %s at position %d size %d: %m",
+					elog(WARNING, "CFS GC failed to read block %d of file %s at position %d size %d: %m",
 							   i, file_path, offs, size);
 					goto Cleanup;
 				}
 
 				if (!cfs_write_file(fd2, block, size))
 				{
-					elog(LOG, "CFS failed to write file %s: %m", file_bck_path);
+					elog(WARNING, "CFS failed to write file %s: %m", file_bck_path);
 					goto Cleanup;
 				}
 				cfs_state->gc_stat.processedBytes += size;
@@ -844,38 +844,38 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 
 		if (close(fd) < 0)
 		{
-			elog(LOG, "CFS failed to close file %s: %m", file_path);
+			elog(WARNING, "CFS failed to close file %s: %m", file_path);
 			goto Cleanup;
 		}
 		fd = -1;
 
 		/* Persist copy of data file */
 		if (pg_fsync(fd2) < 0)
 		{
-			elog(LOG, "CFS failed to sync file %s: %m", file_bck_path);
+			elog(WARNING, "CFS failed to sync file %s: %m", file_bck_path);
 			goto Cleanup;
 		}
 		if (close(fd2) < 0)
 		{
-			elog(LOG, " CFS failed to close file %s: %m", file_bck_path);
+			elog(WARNING, "CFS failed to close file %s: %m", file_bck_path);
 			goto Cleanup;
 		}
 		fd2 = -1;
 
 		/* Persist copy of map file */
 		if (!cfs_write_file(md2, &newMap, sizeof(newMap)))
 		{
-			elog(LOG, "CFS failed to write file %s: %m", map_bck_path);
+			elog(WARNING, "CFS failed to write file %s: %m", map_bck_path);
 			goto Cleanup;
 		}
 		if (pg_fsync(md2) < 0)
 		{
-			elog(LOG, "CFS failed to sync file %s: %m", map_bck_path);
+			elog(WARNING, "CFS failed to sync file %s: %m", map_bck_path);
 			goto Cleanup;
 		}
 		if (close(md2) < 0)
 		{
-			elog(LOG, "CFS failed to close file %s: %m", map_bck_path);
+			elog(WARNING, "CFS failed to close file %s: %m", map_bck_path);
 			goto Cleanup;
 		}
 		md2 = -1;
@@ -886,12 +886,12 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 		 */
 		if (cfs_msync(map) < 0)
 		{
-			elog(LOG, "CFS failed to sync map %s: %m", map_path);
+			elog(WARNING, "CFS failed to sync map %s: %m", map_path);
 			goto Cleanup;
 		}
 		if (pg_fsync(md) < 0)
 		{
-			elog(LOG, "CFS failed to sync file %s: %m", map_path);
+			elog(WARNING, "CFS failed to sync file %s: %m", map_path);
 			goto Cleanup;
 		}
 
@@ -937,7 +937,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 		remove_backups = false;
 		if (rename(file_bck_path, file_path) < 0)
 		{
-			elog(LOG, "CFS failed to rename file %s: %m", file_path);
+			elog(WARNING, "CFS failed to rename file %s: %m", file_path);
 			goto Cleanup;
 		}
 
@@ -956,12 +956,12 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 		 * we need to flush updated map file */
 		if (cfs_msync(map) < 0)
 		{
-			elog(LOG, "CFS failed to sync map %s: %m", map_path);
+			elog(WARNING, "CFS failed to sync map %s: %m", map_path);
 			goto Cleanup;
 		}
 		if (pg_fsync(md) < 0)
 		{
-			elog(LOG, "CFS failed to sync file %s: %m", map_path);
+			elog(WARNING, "CFS failed to sync file %s: %m", map_path);
 
 			Cleanup:
 			if (fd >= 0) close(fd);
@@ -983,7 +983,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 		/* remove map backup file */
 		if (remove_backups && unlink(map_bck_path))
 		{
-			elog(LOG, "CFS failed to unlink file %s: %m", map_bck_path);
+			elog(WARNING, "CFS failed to unlink file %s: %m", map_bck_path);
 			succeed = false;
 		}
 
@@ -992,7 +992,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 
 		if (succeed)
 		{
-			elog(LOG, "%d: defragment file %s: old size %d, new size %d, logical size %d, used %d, compression ratio %f, time %ld usec",
+			elog(LOG, "CFS GC worker %d: defragment file %s: old size %d, new size %d, logical size %d, used %d, compression ratio %f, time %ld usec",
 				 MyProcPid, file_path, physSize, newSize, virtSize, usedSize, (double)virtSize/newSize,
 				 secs*USECS_PER_SEC + usecs);
 		}
@@ -1013,17 +1013,17 @@ static bool cfs_gc_file(char* map_path, bool noerror)
 		}
 	}
 	else if (cfs_state->max_iterations == 1)
-		elog(LOG, "%d: file %.*s: physical size %d, logical size %d, used %d, compression ratio %f",
+		elog(LOG, "CFS GC worker %d: file %.*s: physical size %d, logical size %d, used %d, compression ratio %f",
 			 MyProcPid, suf, map_path, physSize, virtSize, usedSize, (double)virtSize/physSize);
 
 	if (cfs_munmap(map) < 0)
 	{
-		elog(LOG, "CFS failed to unmap file %s: %m", map_path);
+		elog(WARNING, "CFS failed to unmap file %s: %m", map_path);
 		succeed = false;
 	}
 	if (close(md) < 0)
 	{
-		elog(LOG, "CFS failed to close file %s: %m", map_path);
+		elog(WARNING, "CFS failed to close file %s: %m", map_path);
 		succeed = false;
 	}
 
@@ -1316,7 +1316,7 @@ Datum cfs_compression_ratio(PG_FUNCTION_ARGS)
 			map = cfs_mmap(md);
 			if (map == MAP_FAILED)
 			{
-				elog(LOG, "cfs_compression_ration failed to map file %s: %m", map_path);
+				elog(WARNING, "CFS compression_ratio failed to map file %s: %m", map_path);
 				close(md);
 				break;
 			}
@@ -1325,9 +1325,9 @@ Datum cfs_compression_ratio(PG_FUNCTION_ARGS)
 			physSize += pg_atomic_read_u32(&map->physSize);
 
 			if (cfs_munmap(map) < 0)
-				elog(LOG, "CFS failed to unmap file %s: %m", map_path);
+				elog(WARNING, "CFS failed to unmap file %s: %m", map_path);
 			if (close(md) < 0)
-				elog(LOG, "CFS failed to close file %s: %m", map_path);
+				elog(WARNING, "CFS failed to close file %s: %m", map_path);
 
 			i += 1;
 		}
@@ -1368,17 +1368,17 @@ Datum cfs_fragmentation(PG_FUNCTION_ARGS)
 			map = cfs_mmap(md);
 			if (map == MAP_FAILED)
 			{
-				elog(LOG, "cfs_compression_ration failed to map file %s: %m", map_path);
+				elog(WARNING, "CFS compression_ratio failed to map file %s: %m", map_path);
 				close(md);
 				break;
 			}
 			usedSize += pg_atomic_read_u32(&map->usedSize);
 			physSize += pg_atomic_read_u32(&map->physSize);
 
 			if (cfs_munmap(map) < 0)
-				elog(LOG, "CFS failed to unmap file %s: %m", map_path);
+				elog(WARNING, "CFS failed to unmap file %s: %m", map_path);
 			if (close(md) < 0)
-				elog(LOG, "CFS failed to close file %s: %m", map_path);
+				elog(WARNING, "CFS failed to close file %s: %m", map_path);
 
 			i += 1;
 		}

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ void cfs_lock_file(FileMap* map, char const* file_path)`
`591`	`591`	`{`
`592`	`592`	`/* Recover map. */`
`593`	`593`	`if (!cfs_read_file(md2, map, sizeof(FileMap)))`
`594`		`- elog(LOG, "CFS failed to read file %s: %m", map_bck_path);`
	`594`	`+ elog(WARNING, "CFS failed to read file %s: %m", map_bck_path);`
`595`	`595`
`596`	`596`	`close(md2);`
`597`	`597`	`}`
`@@ -681,15 +681,15 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`681`	`681`	`if (md < 0)`
`682`	`682`	`{`
`683`	`683`	`if (!noerror) {`
`684`		`- elog(LOG, "CFS failed to open map file %s: %m", map_path);`
	`684`	`+ elog(WARNING, "CFS failed to open map file %s: %m", map_path);`
`685`	`685`	`}`
`686`	`686`	`goto FinishGC;`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`map = cfs_mmap(md);`
`690`	`690`	`if (map == MAP_FAILED)`
`691`	`691`	`{`
`692`		`- elog(LOG, "CFS failed to map file %s: %m", map_path);`
	`692`	`+ elog(WARNING, "CFS failed to map file %s: %m", map_path);`
`693`	`693`	`close(md);`
`694`	`694`	`goto FinishGC;`
`695`	`695`	`}`
`@@ -751,7 +751,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`751`	`751`	`/* Recover map */`
`752`	`752`	`if (!cfs_read_file(md2, newMap, sizeof(FileMap)))`
`753`	`753`	`{`
`754`		`- elog(LOG, "CFS failed to read file %s: %m", map_bck_path);`
	`754`	`+ elog(WARNING, "CFS failed to read file %s: %m", map_bck_path);`
`755`	`755`	`goto Cleanup;`
`756`	`756`	`}`
`757`	`757`	`close(md2);`
`@@ -823,14 +823,14 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`823`	`823`
`824`	`824`	`if (!cfs_read_file(fd, block, size))`
`825`	`825`	`{`
`826`		`- elog(LOG, "CFS GC failed to read block %d of file %s at position %d size %d: %m",`
	`826`	`+ elog(WARNING, "CFS GC failed to read block %d of file %s at position %d size %d: %m",`
`827`	`827`	`i, file_path, offs, size);`
`828`	`828`	`goto Cleanup;`
`829`	`829`	`}`
`830`	`830`
`831`	`831`	`if (!cfs_write_file(fd2, block, size))`
`832`	`832`	`{`
`833`		`- elog(LOG, "CFS failed to write file %s: %m", file_bck_path);`
	`833`	`+ elog(WARNING, "CFS failed to write file %s: %m", file_bck_path);`
`834`	`834`	`goto Cleanup;`
`835`	`835`	`}`
`836`	`836`	`cfs_state->gc_stat.processedBytes += size;`
`@@ -844,38 +844,38 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`844`	`844`
`845`	`845`	`if (close(fd) < 0)`
`846`	`846`	`{`
`847`		`- elog(LOG, "CFS failed to close file %s: %m", file_path);`
	`847`	`+ elog(WARNING, "CFS failed to close file %s: %m", file_path);`
`848`	`848`	`goto Cleanup;`
`849`	`849`	`}`
`850`	`850`	`fd = -1;`
`851`	`851`
`852`	`852`	`/* Persist copy of data file */`
`853`	`853`	`if (pg_fsync(fd2) < 0)`
`854`	`854`	`{`
`855`		`- elog(LOG, "CFS failed to sync file %s: %m", file_bck_path);`
	`855`	`+ elog(WARNING, "CFS failed to sync file %s: %m", file_bck_path);`
`856`	`856`	`goto Cleanup;`
`857`	`857`	`}`
`858`	`858`	`if (close(fd2) < 0)`
`859`	`859`	`{`
`860`		`- elog(LOG, " CFS failed to close file %s: %m", file_bck_path);`
	`860`	`+ elog(WARNING, "CFS failed to close file %s: %m", file_bck_path);`
`861`	`861`	`goto Cleanup;`
`862`	`862`	`}`
`863`	`863`	`fd2 = -1;`
`864`	`864`
`865`	`865`	`/* Persist copy of map file */`
`866`	`866`	`if (!cfs_write_file(md2, &newMap, sizeof(newMap)))`
`867`	`867`	`{`
`868`		`- elog(LOG, "CFS failed to write file %s: %m", map_bck_path);`
	`868`	`+ elog(WARNING, "CFS failed to write file %s: %m", map_bck_path);`
`869`	`869`	`goto Cleanup;`
`870`	`870`	`}`
`871`	`871`	`if (pg_fsync(md2) < 0)`
`872`	`872`	`{`
`873`		`- elog(LOG, "CFS failed to sync file %s: %m", map_bck_path);`
	`873`	`+ elog(WARNING, "CFS failed to sync file %s: %m", map_bck_path);`
`874`	`874`	`goto Cleanup;`
`875`	`875`	`}`
`876`	`876`	`if (close(md2) < 0)`
`877`	`877`	`{`
`878`		`- elog(LOG, "CFS failed to close file %s: %m", map_bck_path);`
	`878`	`+ elog(WARNING, "CFS failed to close file %s: %m", map_bck_path);`
`879`	`879`	`goto Cleanup;`
`880`	`880`	`}`
`881`	`881`	`md2 = -1;`
`@@ -886,12 +886,12 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`886`	`886`	`*/`
`887`	`887`	`if (cfs_msync(map) < 0)`
`888`	`888`	`{`
`889`		`- elog(LOG, "CFS failed to sync map %s: %m", map_path);`
	`889`	`+ elog(WARNING, "CFS failed to sync map %s: %m", map_path);`
`890`	`890`	`goto Cleanup;`
`891`	`891`	`}`
`892`	`892`	`if (pg_fsync(md) < 0)`
`893`	`893`	`{`
`894`		`- elog(LOG, "CFS failed to sync file %s: %m", map_path);`
	`894`	`+ elog(WARNING, "CFS failed to sync file %s: %m", map_path);`
`895`	`895`	`goto Cleanup;`
`896`	`896`	`}`
`897`	`897`
`@@ -937,7 +937,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`937`	`937`	`remove_backups = false;`
`938`	`938`	`if (rename(file_bck_path, file_path) < 0)`
`939`	`939`	`{`
`940`		`- elog(LOG, "CFS failed to rename file %s: %m", file_path);`
	`940`	`+ elog(WARNING, "CFS failed to rename file %s: %m", file_path);`
`941`	`941`	`goto Cleanup;`
`942`	`942`	`}`
`943`	`943`
`@@ -956,12 +956,12 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`956`	`956`	`* we need to flush updated map file */`
`957`	`957`	`if (cfs_msync(map) < 0)`
`958`	`958`	`{`
`959`		`- elog(LOG, "CFS failed to sync map %s: %m", map_path);`
	`959`	`+ elog(WARNING, "CFS failed to sync map %s: %m", map_path);`
`960`	`960`	`goto Cleanup;`
`961`	`961`	`}`
`962`	`962`	`if (pg_fsync(md) < 0)`
`963`	`963`	`{`
`964`		`- elog(LOG, "CFS failed to sync file %s: %m", map_path);`
	`964`	`+ elog(WARNING, "CFS failed to sync file %s: %m", map_path);`
`965`	`965`
`966`	`966`	`Cleanup:`
`967`	`967`	`if (fd >= 0) close(fd);`
`@@ -983,7 +983,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`983`	`983`	`/* remove map backup file */`
`984`	`984`	`if (remove_backups && unlink(map_bck_path))`
`985`	`985`	`{`
`986`		`- elog(LOG, "CFS failed to unlink file %s: %m", map_bck_path);`
	`986`	`+ elog(WARNING, "CFS failed to unlink file %s: %m", map_bck_path);`
`987`	`987`	`succeed = false;`
`988`	`988`	`}`
`989`	`989`
`@@ -992,7 +992,7 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`992`	`992`
`993`	`993`	`if (succeed)`
`994`	`994`	`{`
`995`		`- elog(LOG, "%d: defragment file %s: old size %d, new size %d, logical size %d, used %d, compression ratio %f, time %ld usec",`
	`995`	`+ elog(LOG, "CFS GC worker %d: defragment file %s: old size %d, new size %d, logical size %d, used %d, compression ratio %f, time %ld usec",`
`996`	`996`	`MyProcPid, file_path, physSize, newSize, virtSize, usedSize, (double)virtSize/newSize,`
`997`	`997`	`secs*USECS_PER_SEC + usecs);`
`998`	`998`	`}`
`@@ -1013,17 +1013,17 @@ static bool cfs_gc_file(char* map_path, bool noerror)`
`1013`	`1013`	`}`
`1014`	`1014`	`}`
`1015`	`1015`	`else if (cfs_state->max_iterations == 1)`
`1016`		`- elog(LOG, "%d: file %.*s: physical size %d, logical size %d, used %d, compression ratio %f",`
	`1016`	`+ elog(LOG, "CFS GC worker %d: file %.*s: physical size %d, logical size %d, used %d, compression ratio %f",`
`1017`	`1017`	`MyProcPid, suf, map_path, physSize, virtSize, usedSize, (double)virtSize/physSize);`
`1018`	`1018`
`1019`	`1019`	`if (cfs_munmap(map) < 0)`
`1020`	`1020`	`{`
`1021`		`- elog(LOG, "CFS failed to unmap file %s: %m", map_path);`
	`1021`	`+ elog(WARNING, "CFS failed to unmap file %s: %m", map_path);`
`1022`	`1022`	`succeed = false;`
`1023`	`1023`	`}`
`1024`	`1024`	`if (close(md) < 0)`
`1025`	`1025`	`{`
`1026`		`- elog(LOG, "CFS failed to close file %s: %m", map_path);`
	`1026`	`+ elog(WARNING, "CFS failed to close file %s: %m", map_path);`
`1027`	`1027`	`succeed = false;`
`1028`	`1028`	`}`
`1029`	`1029`
`@@ -1316,7 +1316,7 @@ Datum cfs_compression_ratio(PG_FUNCTION_ARGS)`
`1316`	`1316`	`map = cfs_mmap(md);`
`1317`	`1317`	`if (map == MAP_FAILED)`
`1318`	`1318`	`{`
`1319`		`- elog(LOG, "cfs_compression_ration failed to map file %s: %m", map_path);`
	`1319`	`+ elog(WARNING, "CFS compression_ratio failed to map file %s: %m", map_path);`
`1320`	`1320`	`close(md);`
`1321`	`1321`	`break;`
`1322`	`1322`	`}`
`@@ -1325,9 +1325,9 @@ Datum cfs_compression_ratio(PG_FUNCTION_ARGS)`
`1325`	`1325`	`physSize += pg_atomic_read_u32(&map->physSize);`
`1326`	`1326`
`1327`	`1327`	`if (cfs_munmap(map) < 0)`
`1328`		`- elog(LOG, "CFS failed to unmap file %s: %m", map_path);`
	`1328`	`+ elog(WARNING, "CFS failed to unmap file %s: %m", map_path);`
`1329`	`1329`	`if (close(md) < 0)`
`1330`		`- elog(LOG, "CFS failed to close file %s: %m", map_path);`
	`1330`	`+ elog(WARNING, "CFS failed to close file %s: %m", map_path);`
`1331`	`1331`
`1332`	`1332`	`i += 1;`
`1333`	`1333`	`}`
`@@ -1368,17 +1368,17 @@ Datum cfs_fragmentation(PG_FUNCTION_ARGS)`
`1368`	`1368`	`map = cfs_mmap(md);`
`1369`	`1369`	`if (map == MAP_FAILED)`
`1370`	`1370`	`{`
`1371`		`- elog(LOG, "cfs_compression_ration failed to map file %s: %m", map_path);`
	`1371`	`+ elog(WARNING, "CFS compression_ratio failed to map file %s: %m", map_path);`
`1372`	`1372`	`close(md);`
`1373`	`1373`	`break;`
`1374`	`1374`	`}`
`1375`	`1375`	`usedSize += pg_atomic_read_u32(&map->usedSize);`
`1376`	`1376`	`physSize += pg_atomic_read_u32(&map->physSize);`
`1377`	`1377`
`1378`	`1378`	`if (cfs_munmap(map) < 0)`
`1379`		`- elog(LOG, "CFS failed to unmap file %s: %m", map_path);`
	`1379`	`+ elog(WARNING, "CFS failed to unmap file %s: %m", map_path);`
`1380`	`1380`	`if (close(md) < 0)`
`1381`		`- elog(LOG, "CFS failed to close file %s: %m", map_path);`
	`1381`	`+ elog(WARNING, "CFS failed to close file %s: %m", map_path);`
`1382`	`1382`
`1383`	`1383`	`i += 1;`
`1384`	`1384`	`}`