Fixed bug CORE-2917 : Sever Hangs on I/O error during "open" operation for file "/tmp/firebird/fb_trace_ksVDoc".

hvlad · hvlad · commit f7f1defb488f · 2010-04-18T18:06:09.000Z
Posix part will follow soon (by Alex).
diff --git a/src/jrd/os/os_utils.h b/src/jrd/os/os_utils.h
@@ -43,6 +43,7 @@ namespace os_utils
 
 	void createLockDirectory(const char* pathname);
 	int openCreateSharedFile(const char* pathname, int flags);
+	bool touchFile(const char* pathname);
 
 } // namespace os_utils
 
diff --git a/src/jrd/os/win32/os_utils.cpp b/src/jrd/os/win32/os_utils.cpp
@@ -241,4 +241,27 @@ int openCreateSharedFile(const char* pathname, int flags)
 	return ::open(pathname, flags | O_RDWR | O_CREAT, S_IREAD | S_IWRITE);
 }
 
+// set file's last access and modification time to current time
+bool touchFile(const char* pathname)
+{
+    FILETIME ft;
+    SYSTEMTIME st;
+
+	HANDLE hFile = CreateFile(pathname, 
+		GENERIC_READ | FILE_WRITE_ATTRIBUTES, 
+		FILE_SHARE_READ | FILE_SHARE_WRITE, 
+		ISC_get_security_desc(), 
+		OPEN_EXISTING, 
+		FILE_ATTRIBUTE_NORMAL, 
+		0);
+	if (hFile == INVALID_HANDLE_VALUE)
+		return false;
+
+    GetSystemTime(&st);
+	const bool ret = SystemTimeToFileTime(&st, &ft) && SetFileTime(hFile, NULL, &ft, &ft);
+	CloseHandle(hFile);
+
+	return ret;
+}
+
 } // namespace os_utils
diff --git a/src/jrd/trace/TraceConfigStorage.cpp b/src/jrd/trace/TraceConfigStorage.cpp
@@ -59,6 +59,7 @@ using namespace Firebird;
 
 namespace Jrd {
 
+static const int TOUCH_INTERVAL = 60 * 60;		// in seconds, one hour should be enough
 
 void checkFileError(const char* filename, const char* operation, ISC_STATUS iscError)
 {
@@ -123,10 +124,15 @@ ConfigStorage::ConfigStorage()
 	StorageGuard guard(this);
 	checkFile();
 	++m_base->cnt_uses;
+
+	gds__thread_start(touchThread, (void*) this, THREAD_medium, 0, 0);
 }
 
 ConfigStorage::~ConfigStorage()
 {
+	// signal touchThread to finish
+	m_touchSemaphore.release();
+
 	::close(m_cfg_file);
 	m_cfg_file = -1;
 
@@ -177,6 +183,7 @@ void ConfigStorage::initShMem(void* arg, sh_mem* shmemData, bool initialize)
 		header->change_number = 0;
 		header->session_number = 1;
 		header->cnt_uses = 0;
+		header->touch_time = 0;
 		memset(header->cfg_file_name, 0, sizeof(header->cfg_file_name));
 #ifndef WIN_NT
 		checkMutex("init", ISC_mutex_init(&header->mutex));
@@ -281,6 +288,43 @@ void ConfigStorage::checkFile()
 			fclose(cfgFile);
 		}
 	}
+
+	touchFile();
+}
+
+
+void ConfigStorage::touchFile()
+{
+	os_utils::touchFile(m_base->cfg_file_name);
+}
+
+
+THREAD_ENTRY_DECLARE ConfigStorage::touchThread(THREAD_ENTRY_PARAM arg)
+{
+	ConfigStorage* storage = (ConfigStorage*) arg;
+	storage->touchThreadFunc();
+	return 0;
+}
+
+
+void ConfigStorage::touchThreadFunc()
+{
+	int delay = TOUCH_INTERVAL / 2;
+	while (!m_touchSemaphore.tryEnter(delay))
+	{
+		StorageGuard guard(this);
+
+		time_t now;
+		time(&now);
+
+		if (!m_base->touch_time || m_base->touch_time < now)
+		{
+			touchFile();
+			m_base->touch_time = now + TOUCH_INTERVAL;
+		}
+
+		delay = difftime(m_base->touch_time, now);
+	} 
 }
 
 
diff --git a/src/jrd/trace/TraceConfigStorage.h b/src/jrd/trace/TraceConfigStorage.h
@@ -31,18 +31,24 @@
 #include "../../common/classes/array.h"
 #include "../../common/classes/fb_string.h"
 #include "../../common/classes/init.h"
+#include "../../common/classes/semaphore.h"
 #include "../../jrd/isc.h"
+#include "../../jrd/threaddata.h"
 #include "../../jrd/trace/TraceSession.h"
 
 namespace Jrd {
 
+class StorageInstance;
 
 class ConfigStorage : public Firebird::GlobalStorage
 {
-public:
+friend class StorageInstance;
+
+private:
 	ConfigStorage();
 	~ConfigStorage();
 
+public:
 	void addSession(Firebird::TraceSession& session);
 	bool getNextSession(Firebird::TraceSession& session);
 	void removeSession(ULONG id);
@@ -60,6 +66,10 @@ class ConfigStorage : public Firebird::GlobalStorage
 	static void initShMem(void*, sh_mem*, bool);
 
 	void checkFile();
+	void touchFile();
+
+	static THREAD_ENTRY_DECLARE touchThread(THREAD_ENTRY_PARAM arg);
+	void touchThreadFunc();
 
 	void checkDirty()
 	{
@@ -85,6 +95,7 @@ class ConfigStorage : public Firebird::GlobalStorage
 		volatile ULONG change_number;
 		volatile ULONG session_number;
 		ULONG cnt_uses;
+		time_t touch_time;
 		char  cfg_file_name[MAXPATHLEN];
 #ifndef WIN_NT
 		struct mtx mutex;
@@ -114,6 +125,7 @@ class ConfigStorage : public Firebird::GlobalStorage
 #endif
 	int  m_cfg_file;
 	bool m_dirty;
+	Firebird::Semaphore m_touchSemaphore;
 };
 
 
