cleanup

alubennikova · alubennikova · commit 18c3bbeb4c19 · 2017-01-23T12:51:16.000+03:00
diff --git a/contrib/pg_probackup/backup.c b/contrib/pg_probackup/backup.c
@@ -1113,19 +1113,23 @@ backup_cleanup(bool fatal, void *userdata)
 static long
 file_size(const char *file)
 {
-	long		r;
-	FILE	   *f = fopen(file, "r");
-
-	if (!f)
-	{
-		elog(ERROR, "pg_probackup: could not open file \"%s\" for reading: %s\n",
-				file, strerror(errno));
-		return -1;
-	}
-	fseek(f, 0, SEEK_END);
-	r = ftell(f);
-	fclose(f);
-	return r;
+	struct stat st;
+	stat(file, &st);
+	elog(NOTICE, "file_size(). %lu", st.st_size);
+	return st.st_size;
+// 	long		r;
+// 	FILE	   *f = fopen(file, "r");
+//
+// 	if (!f)
+// 	{
+// 		elog(ERROR, "pg_probackup: could not open file \"%s\" for reading: %s\n",
+// 				file, strerror(errno));
+// 		return -1;
+// 	}
+// 	fseek(f, 0, SEEK_END);
+// 	r = ftell(f);
+// 	fclose(f);
+// 	return r;
 }
 
 bool
diff --git a/contrib/pg_probackup/data.c b/contrib/pg_probackup/data.c
@@ -491,7 +491,7 @@ restore_file_partly(const char *from_root,const char *to_root, pgFile *file)
 		write_size += read_len;
 	}
 
-	elog(NOTICE, "write_size %lu, file->write_size %lu", write_size, file->write_size);
+	elog(NOTICE, "restore_file_partly(). write_size %lu, file->write_size %lu", write_size, file->write_size);
 
 	/* update file permission */
 	if (chmod(to_path, file->mode) == -1)
@@ -529,14 +529,16 @@ restore_compressed_file(const char *from_root,
 		return;
 	}
 
+	elog(NOTICE, "restore_compressed_file(). map %s", tmp_file.path);
 	map = cfs_mmap(md);
 	if (map == MAP_FAILED)
 	{
 		elog(LOG, "restore_compressed_file(). cfs_compression_ration failed to map file %s: %m", tmp_file.path);
-		close(md);
+		if (close(md) < 0)
+			elog(LOG, "restore_compressed_file(). CFS failed to close file %s: %m", tmp_file.path);
+		pfree(tmp_file.path);
+		return;
 	}
-	elog(LOG, "restore_compressed_file(). %s", to_path);
-
 
 	if (map->generation != file->generation)
 		copy_file(from_root, to_root, file);

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ restore_file_partly(const char from_root,const char to_root, pgFile *file)`
`491`	`491`	`write_size += read_len;`
`492`	`492`	`}`
`493`	`493`
`494`		`- elog(NOTICE, "write_size %lu, file->write_size %lu", write_size, file->write_size);`
	`494`	`+ elog(NOTICE, "restore_file_partly(). write_size %lu, file->write_size %lu", write_size, file->write_size);`
`495`	`495`
`496`	`496`	`/* update file permission */`
`497`	`497`	`if (chmod(to_path, file->mode) == -1)`
`@@ -529,14 +529,16 @@ restore_compressed_file(const char *from_root,`
`529`	`529`	`return;`
`530`	`530`	`}`
`531`	`531`
	`532`	`+ elog(NOTICE, "restore_compressed_file(). map %s", tmp_file.path);`
`532`	`533`	`map = cfs_mmap(md);`
`533`	`534`	`if (map == MAP_FAILED)`
`534`	`535`	`{`
`535`	`536`	`elog(LOG, "restore_compressed_file(). cfs_compression_ration failed to map file %s: %m", tmp_file.path);`
`536`		`- close(md);`
	`537`	`+ if (close(md) < 0)`
	`538`	`+ elog(LOG, "restore_compressed_file(). CFS failed to close file %s: %m", tmp_file.path);`
	`539`	`+ pfree(tmp_file.path);`
	`540`	`+ return;`
`537`	`541`	`}`
`538`		`- elog(LOG, "restore_compressed_file(). %s", to_path);`
`539`		`-`
`540`	`542`
`541`	`543`	`if (map->generation != file->generation)`
`542`	`544`	`copy_file(from_root, to_root, file);`