Backported CORE-6009: I/O error during "open" operation for file "/tm…

…p/firebird/fb_trace_*" in firebird.log

configure.ac

@@ -823,7 +823,7 @@ dnl HP-UX atomic routines are in atomic library, not standard C library.
 dnl If we can't find atomic routines in vendor library, look for atomic_ops.
 AC_SEARCH_LIBS(atomic_inc, atomic,,
 	AC_CHECK_LIB(atomic_ops, main))
-
+AC_CHECK_HEADERS(utime.h)
 
 dnl Check for libraries for static C++ runtime linking
 AC_CHECK_LIB(supc++, main, XE_APPEND(-lsupc++, STATIC_CXXSUPPORT_LIB))

src/common/os/posix/os_utils.cpp

@@ -73,6 +73,10 @@
 #include <sys/signal.h>
 #endif
 
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif
+
 using namespace Firebird;
 
 namespace os_utils
@@ -237,6 +241,7 @@ bool touchFile(const char* pathname)
 
 	return true;
 #else
+	errno = ENOSYS;
 	return false;
 #endif
 }

src/jrd/trace/TraceConfigStorage.cpp

@@ -29,6 +29,7 @@
 
 #include "../../common/classes/TempFile.h"
 #include "../../common/StatusArg.h"
+#include "../../common/ScanDir.h"
 #include "../../common/utils_proto.h"
 #include "../../jrd/err_proto.h"
 #include "../../common/isc_proto.h"
@@ -58,7 +59,7 @@ using namespace Firebird;
 
 namespace Jrd {
 
-static const FB_UINT64 TOUCH_INTERVAL = 60 * 60;      // in seconds, one hour should be enough
+static const FB_UINT64 TOUCH_INTERVAL = 60 * 60;	// in seconds, one hour should be enough
 
 void checkFileError(const char* filename, const char* operation, ISC_STATUS iscError)
 {
@@ -588,15 +589,41 @@ bool ConfigStorage::getItemLength(ITEM& tag, ULONG& len)
 
 void ConfigStorage::TouchFile::handler()
 {
-	os_utils::touchFile(fileName);
-	FbLocalStatus s;
-	TimerInterfacePtr()->start(&s, this, TOUCH_INTERVAL * 1000 * 1000);
-	// ignore error in handler
+	try
+	{
+		ScanDir dir(dirName.c_str(), "*");
+		while (dir.next())
+		{
+			PathName cur(dir.getFilePath());
+			if (cur == "." || cur == "..")
+				continue;
+
+			try
+			{
+				if (!os_utils::touchFile(cur.c_str()))
+					system_call_failed::raise("utime");
+			}
+			catch (const Exception& e)
+			{
+				iscLogException("touchFile", e);
+			}
+		}
+
+		FbLocalStatus s;
+		TimerInterfacePtr()->start(&s, this, TOUCH_INTERVAL * 1000 * 1000);
+		s.check();
+	}
+	catch (const Exception& e)
+	{
+		iscLogException("Start TouchFile timer failed", e);
+	}
 }
 
 void ConfigStorage::TouchFile::start(const char* fName)
 {
-	fileName = fName;
+	PathName dummy;
+	PathUtils::splitLastComponent(dirName, dummy, fName);
+
 	FbLocalStatus s;
 	TimerInterfacePtr()->start(&s, this, TOUCH_INTERVAL * 1000 * 1000);
 	check(&s);

src/jrd/trace/TraceConfigStorage.h

@@ -78,12 +78,16 @@ class ConfigStorage FB_FINAL : public Firebird::GlobalStorage, public Firebird::
 		public Firebird::RefCntIface<Firebird::ITimerImpl<TouchFile, Firebird::CheckStatusWrapper> >
 	{
 	public:
+		TouchFile()
+			: dirName(getPool())
+		{ }
 		void handler();
 		void start(const char* fName);
 		void stop();
 		int release();
+
 	private:
-		const char* fileName;
+		Firebird::PathName dirName;
 	};
 	Firebird::RefPtr<TouchFile> m_timer;