Fix error handling in the directory iterator on Windows. Fix incorrect timeout setting for no-space retries in the changelog. Thanks to Vlad Khorsun.

dyemanov · dyemanov · commit f3bc4dc8d5b9 · 2025-09-28T11:44:07.000+03:00
diff --git a/src/common/os/win32/path_utils.cpp b/src/common/os/win32/path_utils.cpp
@@ -56,7 +56,8 @@ void Win32DirIterator::init()
 
 	if (dir == INVALID_HANDLE_VALUE)
 	{
-		if (GetLastError() != ERROR_FILE_NOT_FOUND)
+		auto const last_error = GetLastError();
+		if (last_error != ERROR_FILE_NOT_FOUND && last_error != ERROR_PATH_NOT_FOUND)
 			system_call_failed::raise("FindFirstFile");
 
 		dir = 0;
diff --git a/src/jrd/replication/ChangeLog.cpp b/src/jrd/replication/ChangeLog.cpp
@@ -66,9 +66,9 @@ using namespace Replication;
 
 namespace
 {
-	inline constexpr unsigned FLUSH_WAIT_INTERVAL = 1; // milliseconds
+	inline constexpr unsigned FLUSH_WAIT_INTERVAL = 1;	// milliseconds
 
-	inline constexpr unsigned NO_SPACE_TIMEOUT = 10;	// seconds
+	inline constexpr unsigned NO_SPACE_TIMEOUT = 10000;	// milliseconds
 	inline constexpr unsigned NO_SPACE_RETRIES = 6;		// up to one minute
 
 	inline constexpr unsigned COPY_BLOCK_SIZE = 64 * 1024; // 64 KB

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ void Win32DirIterator::init()`
`56`	`56`
`57`	`57`	`if (dir == INVALID_HANDLE_VALUE)`
`58`	`58`	`{`
`59`		`- if (GetLastError() != ERROR_FILE_NOT_FOUND)`
	`59`	`+ auto const last_error = GetLastError();`
	`60`	`+ if (last_error != ERROR_FILE_NOT_FOUND && last_error != ERROR_PATH_NOT_FOUND)`
`60`	`61`	`system_call_failed::raise("FindFirstFile");`
`61`	`62`
`62`	`63`	`dir = 0;`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ using namespace Replication;`
`66`	`66`
`67`	`67`	`namespace`
`68`	`68`	`{`
`69`		`- inline constexpr unsigned FLUSH_WAIT_INTERVAL = 1; // milliseconds`
	`69`	`+ inline constexpr unsigned FLUSH_WAIT_INTERVAL = 1; // milliseconds`
`70`	`70`
`71`		`- inline constexpr unsigned NO_SPACE_TIMEOUT = 10; // seconds`
	`71`	`+ inline constexpr unsigned NO_SPACE_TIMEOUT = 10000; // milliseconds`
`72`	`72`	`inline constexpr unsigned NO_SPACE_RETRIES = 6; // up to one minute`
`73`	`73`
`74`	`74`	`inline constexpr unsigned COPY_BLOCK_SIZE = 64 * 1024; // 64 KB`