Backported CORE-6541: Restore backup on RawDevice

AlexPeshkoff · AlexPeshkoff · commit d5bcc6484078 · 2021-04-23T17:57:03.000+03:00
diff --git a/src/jrd/os/posix/unix.cpp b/src/jrd/os/posix/unix.cpp
@@ -724,6 +724,7 @@ jrd_file* PIO_open(thread_db* tdbb,
 		raw = true;
 		if (!raw_devices_validate_database(desc, file_name))
 		{
+			maybeCloseFile(desc);
 			ERR_post(Arg::Gds(isc_io_error) << Arg::Str("open") << Arg::Str(file_name) <<
 					 Arg::Gds(isc_io_open_err) << Arg::Unix(ENOENT));
 		}

Original file line number	Diff line number	Diff line change
`@@ -724,6 +724,7 @@ jrd_file* PIO_open(thread_db* tdbb,`
`724`	`724`	`raw = true;`
`725`	`725`	`if (!raw_devices_validate_database(desc, file_name))`
`726`	`726`	`{`
	`727`	`+ maybeCloseFile(desc);`
`727`	`728`	`ERR_post(Arg::Gds(isc_io_error) << Arg::Str("open") << Arg::Str(file_name) <<`
`728`	`729`	`Arg::Gds(isc_io_open_err) << Arg::Unix(ENOENT));`
`729`	`730`	`}`