Fixed bug #8509 : "Error creating private namespace" message in firebird.log

Author: hvlad

src/common/utils.cpp

@@ -59,6 +59,7 @@
 #include "../common/StatusArg.h"
 #include "../common/TimeZoneUtil.h"
 #include "../common/config/config.h"
+#include "../common/ThreadStart.h"
 
 #ifdef WIN_NT
 #include <direct.h>
@@ -667,28 +668,41 @@ class PrivateNamespace
 		if (!AddSIDToBoundaryDescriptor(&hBoundaryDesc, &sid))
 			raiseError("AddSIDToBoundaryDescriptor");
 
-		m_hNamespace = CreatePrivateNamespace(&sa, hBoundaryDesc, sPrivateNameSpace);
-
-		if (m_hNamespace == NULL)
+		int retry = 0;
+		while (true)
 		{
-			DWORD err = GetLastError();
-			if (err != ERROR_ALREADY_EXISTS)
-				raiseError("CreatePrivateNamespace");
+			m_hNamespace = CreatePrivateNamespace(&sa, hBoundaryDesc, sPrivateNameSpace);
 
-			m_hNamespace = OpenPrivateNamespace(hBoundaryDesc, sPrivateNameSpace);
 			if (m_hNamespace == NULL)
 			{
-				err = GetLastError();
-				if (err != ERROR_DUP_NAME)
-					raiseError("OpenPrivateNamespace");
-
-				Firebird::string name(sPrivateNameSpace);
-				name.append("\\test");
+				DWORD err = GetLastError();
+				if (err != ERROR_ALREADY_EXISTS)
+					raiseError("CreatePrivateNamespace");
 
-				m_hTestEvent = CreateEvent(ISC_get_security_desc(), TRUE, TRUE, name.c_str());
-				if (m_hTestEvent == NULL)
-					raiseError("CreateEvent");
+				m_hNamespace = OpenPrivateNamespace(hBoundaryDesc, sPrivateNameSpace);
+				if (m_hNamespace == NULL)
+				{
+					err = GetLastError();
+					if ((err == ERROR_PATH_NOT_FOUND) && (retry++ < 100))
+					{
+						// Namespace was closed by its last holder, wait a bit and try again
+						Thread::sleep(10);
+						continue;
+					}
+
+					if (err != ERROR_DUP_NAME)
+						raiseError("OpenPrivateNamespace");
+
+					Firebird::string name(sPrivateNameSpace);
+					name.append("\\test");
+
+					m_hTestEvent = CreateEvent(ISC_get_security_desc(), TRUE, TRUE, name.c_str());
+					if (m_hTestEvent == NULL)
+						raiseError("CreateEvent");
+				}
 			}
+
+			break;
 		}
 	}