Thread: [Firebird-checkins] SF.net SVN: firebird:[62751] firebird/trunk (Page 61)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 62751
          http://sourceforge.net/p/firebird/code/62751
Author:   alexpeshkoff
Date:     2015-12-30 15:16:43 +0000 (Wed, 30 Dec 2015)
Log Message:
-----------
Fixed CORE-5056: Write-lock of database file is cleared ("W" disappears from output of lsof <db_name>) when remote machine obtains DB header running "fbsvcmgr <remote_host>/port:service_mgr action_db_stats <remote_dbname>"

Modified Paths:
--------------
    firebird/trunk/lang_helpers/gds_codes.ftn
    firebird/trunk/lang_helpers/gds_codes.pas
    firebird/trunk/src/include/gen/codetext.h
    firebird/trunk/src/include/gen/iberror.h
    firebird/trunk/src/include/gen/msgs.h
    firebird/trunk/src/include/gen/sql_code.h
    firebird/trunk/src/include/gen/sql_state.h
    firebird/trunk/src/jrd/os/posix/unix.cpp
    firebird/trunk/src/msgs/facilities2.sql
    firebird/trunk/src/msgs/messages2.sql
    firebird/trunk/src/msgs/system_errors2.sql

Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================

--- firebird/trunk/lang_helpers/gds_codes.ftn	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/lang_helpers/gds_codes.ftn	2015-12-30 15:16:43 UTC (rev 62751)
@@ -1624,6 +1624,8 @@
       PARAMETER (GDS__map_down                         = 335545105)
       INTEGER*4 GDS__login_error                     
       PARAMETER (GDS__login_error                      = 335545106)
+      INTEGER*4 GDS__already_opened                  
+      PARAMETER (GDS__already_opened                   = 335545107)
       INTEGER*4 GDS__gfix_db_name                    
       PARAMETER (GDS__gfix_db_name                     = 335740929)
       INTEGER*4 GDS__gfix_invalid_sw                 

Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/lang_helpers/gds_codes.pas	2015-12-30 15:16:43 UTC (rev 62751)
@@ -1619,6 +1619,8 @@
 	gds_map_down                         = 335545105;
 	isc_login_error                      = 335545106;
 	gds_login_error                      = 335545106;
+	isc_already_opened                   = 335545107;
+	gds_already_opened                   = 335545107;
 	isc_gfix_db_name                     = 335740929;
 	gds_gfix_db_name                     = 335740929;
 	isc_gfix_invalid_sw                  = 335740930;

Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/include/gen/codetext.h	2015-12-30 15:16:43 UTC (rev 62751)
@@ -808,6 +808,7 @@
 	{"invalid_attachment_charset", 335545104},
 	{"map_down", 335545105},
 	{"login_error", 335545106},
+	{"already_opened", 335545107},
 	{"gfix_db_name", 335740929},
 	{"gfix_invalid_sw", 335740930},
 	{"gfix_incmp_sw", 335740932},

Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/include/gen/iberror.h	2015-12-30 15:16:43 UTC (rev 62751)
@@ -842,6 +842,7 @@
 const ISC_STATUS isc_invalid_attachment_charset       = 335545104L;
 const ISC_STATUS isc_map_down                         = 335545105L;
 const ISC_STATUS isc_login_error                      = 335545106L;
+const ISC_STATUS isc_already_opened                   = 335545107L;
 const ISC_STATUS isc_gfix_db_name                     = 335740929L;
 const ISC_STATUS isc_gfix_invalid_sw                  = 335740930L;
 const ISC_STATUS isc_gfix_incmp_sw                    = 335740932L;
@@ -1305,7 +1306,7 @@
 const ISC_STATUS isc_trace_switch_param_miss          = 337182758L;
 const ISC_STATUS isc_trace_param_act_notcompat        = 337182759L;
 const ISC_STATUS isc_trace_mandatory_switch_miss      = 337182760L;
-const ISC_STATUS isc_err_max                          = 1249;
+const ISC_STATUS isc_err_max                          = 1250;
 
 #else /* c definitions */
 
@@ -2117,6 +2118,7 @@
 #define isc_invalid_attachment_charset       335545104L
 #define isc_map_down                         335545105L
 #define isc_login_error                      335545106L
+#define isc_already_opened                   335545107L
 #define isc_gfix_db_name                     335740929L
 #define isc_gfix_invalid_sw                  335740930L
 #define isc_gfix_incmp_sw                    335740932L
@@ -2580,7 +2582,7 @@
 #define isc_trace_switch_param_miss          337182758L
 #define isc_trace_param_act_notcompat        337182759L
 #define isc_trace_mandatory_switch_miss      337182760L
-#define isc_err_max                          1249
+#define isc_err_max                          1250
 
 #endif
 

Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/include/gen/msgs.h	2015-12-30 15:16:43 UTC (rev 62751)
@@ -811,6 +811,7 @@
 	{335545104, "CHARACTER SET @1 cannot be used as a attachment character set"},		/* invalid_attachment_charset */
 	{335545105, "Some database(s) were shutdown when trying to read mapping data"},		/* map_down */
 	{335545106, "Error occurred during login, please check server firebird.log for details"},		/* login_error */
+	{335545107, "Database already opened with engine instance, incompatible with current"},		/* already_opened */
 	{335740929, "data base file name (@1) already given"},		/* gfix_db_name */
 	{335740930, "invalid switch @1"},		/* gfix_invalid_sw */
 	{335740932, "incompatible switch combination"},		/* gfix_incmp_sw */

Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/include/gen/sql_code.h	2015-12-30 15:16:43 UTC (rev 62751)
@@ -807,6 +807,7 @@
 	{335545104, -204}, /* 784 invalid_attachment_charset */
 	{335545105, -901}, /* 785 map_down */
 	{335545106, -902}, /* 786 login_error */
+	{335545107, -902}, /* 787 already_opened */
 	{335740929, -901}, /*   1 gfix_db_name */
 	{335740930, -901}, /*   2 gfix_invalid_sw */
 	{335740932, -901}, /*   4 gfix_incmp_sw */

Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/include/gen/sql_state.h	2015-12-30 15:16:43 UTC (rev 62751)
@@ -807,6 +807,7 @@
 	{335545104, "2C000"}, // 784 invalid_attachment_charset
 	{335545105, "08004"}, // 785 map_down
 	{335545106, "08006"}, // 786 login_error
+	{335545107, "08006"}, // 787 already_opened
 	{335740929, "00000"}, //   1 gfix_db_name
 	{335740930, "00000"}, //   2 gfix_invalid_sw
 	{335740932, "00000"}, //   4 gfix_incmp_sw

Modified: firebird/trunk/src/jrd/os/posix/unix.cpp
===================================================================
--- firebird/trunk/src/jrd/os/posix/unix.cpp	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/jrd/os/posix/unix.cpp	2015-12-30 15:16:43 UTC (rev 62751)
@@ -112,7 +112,8 @@
 #define FCNTL_BROKEN
 static jrd_file* seek_file(jrd_file*, BufferDesc*, FB_UINT64*, FbStatusVector*);
 static jrd_file* setup_file(Database*, const PathName&, const int, const bool, const bool);
-static bool lockDatabaseFile(int desc, const bool shareMode, const bool temporary = false);
+static void lockDatabaseFile(int& desc, const bool shareMode, const bool temporary,
+							 const char* fileName, ISC_STATUS operation);
 static bool unix_error(const TEXT*, const jrd_file*, ISC_STATUS, FbStatusVector* = NULL);
 #if !(defined HAVE_PREAD && defined HAVE_PWRITE)
 static SLONG pread(int, SCHAR*, SLONG, SLONG);
@@ -217,7 +218,7 @@
 
 	Database* const dbb = tdbb->getDatabase();
 
-	const int desc = os_utils::open(file_name.c_str(), flag, 0666);
+	int desc = os_utils::open(file_name.c_str(), flag, 0666);
 	if (desc == -1)
 	{
 		ERR_post(Arg::Gds(isc_io_error) << Arg::Str("open O_CREAT") << Arg::Str(file_name) <<
@@ -225,15 +226,7 @@
 	}
 
 	const bool shareMode = dbb->dbb_config->getServerMode() != MODE_SUPER;
-	if (!lockDatabaseFile(desc, shareMode, temporary))
-	{
-		int lockErrno = errno;
-		close(desc);
-		// error when locking file almost always means it's locked by someone else
-		// therefore do not remove file here (contrary to chmod error)
-		ERR_post(Arg::Gds(isc_io_error) << Arg::Str("lock") << Arg::Str(file_name) <<
-				 Arg::Gds(isc_io_create_err) << Arg::Unix(lockErrno));
-	}
+	lockDatabaseFile(desc, shareMode, temporary, file_name.c_str(), isc_io_create_err);
 
 #ifdef HAVE_FCHMOD
 	if (fchmod(desc, MASK) < 0)
@@ -440,10 +433,7 @@
 			unix_error("re open() for SYNC/DIRECT", file, isc_io_open_err);
 		}
 
-		if (!lockDatabaseFile(file->fil_desc, file->fil_flags & FIL_sh_write))
-		{
-			unix_error("lock", file, isc_io_open_err);
-		}
+		lockDatabaseFile(file->fil_desc, file->fil_flags & FIL_sh_write, false, file->fil_string, isc_io_open_err);
 #endif //FCNTL_BROKEN
 
 #ifdef SOLARIS
@@ -677,11 +667,7 @@
 	}
 
 	const bool shareMode = dbb->dbb_config->getServerMode() != MODE_SUPER;
-	if (!lockDatabaseFile(desc, shareMode || readOnly))
-	{
-		ERR_post(Arg::Gds(isc_io_error) << Arg::Str("lock") << Arg::Str(file_name) <<
-				 Arg::Gds(isc_io_open_err) << Arg::Unix(errno));
-	}
+	lockDatabaseFile(desc, shareMode || readOnly, false, ptr, isc_io_open_err);
 
 	// posix_fadvise(desc, 0, 0, POSIX_FADV_RANDOM);
 
@@ -942,15 +928,41 @@
 }
 
 
-static bool lockDatabaseFile(int desc, const bool share, const bool temporary)
+static void lockDatabaseFile(int& desc, const bool share, const bool temporary,
+							 const char* fileName, ISC_STATUS operation)
 {
-	struct flock lck;
-	lck.l_type = (!temporary && share) ? F_RDLCK : F_WRLCK;
-	lck.l_whence = SEEK_SET;
-	lck.l_start = 0;
-	lck.l_len = 0;
+	bool shared = (!temporary) && share;
+	bool busy = false;
 
-	return fcntl(desc, F_SETLK, &lck) == 0;
+	do
+	{
+#ifndef HAVE_FLOCK
+		struct flock lck;
+		lck.l_type = shared ? F_RDLCK : F_WRLCK;
+		lck.l_whence = SEEK_SET;
+		lck.l_start = 0;
+		lck.l_len = 0;
+
+		if (fcntl(desc, F_SETLK, &lck) == 0)
+			return;
+		busy = (errno == EACCES) || (errno == EAGAIN);
+#else
+		if (flock(desc, (shared ? LOCK_SH : LOCK_EX) | LOCK_NB) == 0)
+			return;
+		busy = (errno == EWOULDBLOCK);
+#endif
+	}
+	while (errno == EINTR);
+
+	maybeCloseFile(desc);
+
+	Arg::Gds err(isc_io_error);
+	err << "lock" << fileName;
+	if (busy)
+		err << Arg::Gds(isc_already_opened);
+	else
+		err << Arg::Gds(operation) << Arg::Unix(errno);
+	ERR_post(err);
 }
 
 

Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/msgs/facilities2.sql	2015-12-30 15:16:43 UTC (rev 62751)
@@ -1,7 +1,7 @@
 /* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
 set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
 --
-('2015-12-22 20:33:22', 'JRD', 0, 787)
+('2015-12-30 17:52:25', 'JRD', 0, 788)
 ('2015-03-17 18:33:00', 'QLI', 1, 533)
 ('2015-01-07 18:01:51', 'GFIX', 3, 134)
 ('1996-11-07 13:39:40', 'GPRE', 4, 1)

Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/msgs/messages2.sql	2015-12-30 15:16:43 UTC (rev 62751)
@@ -894,6 +894,7 @@
 ('invalid_attachment_charset', NULL, NULL, NULL, 0, 784, NULL, 'CHARACTER SET @1 cannot be used as a attachment character set', NULL, NULL);
 ('map_down', NULL, 'Mapping.cpp', NULL, 0, 785, NULL, 'Some database(s) were shutdown when trying to read mapping data', NULL, NULL);
 ('login_error', NULL, 'server.cpp', NULL, 0, 786, NULL, 'Error occurred during login, please check server firebird.log for details', NULL, NULL);
+('already_opened', 'lockDatabaseFile', 'unix.cpp', NULL, 0, 787, NULL, 'Database already opened with engine instance, incompatible with current', NULL, NULL);
 -- QLI
 (NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
 (NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);

Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql	2015-12-30 10:11:26 UTC (rev 62750)
+++ firebird/trunk/src/msgs/system_errors2.sql	2015-12-30 15:16:43 UTC (rev 62751)
@@ -793,6 +793,7 @@
 (-204, '2C', '000', 0, 784, 'invalid_attachment_charset', NULL, NULL)
 (-901, '08', '004', 0, 785, 'map_down', NULL, NULL)
 (-902, '08', '006', 0, 786, 'login_error', NULL, NULL)
+(-902, '08', '006', 0, 787, 'already_opened', NULL, NULL)
 -- GFIX
 (-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
 (-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Firebird-checkins] SF.net SVN: firebird:[62751] firebird/trunk (Page 61)

A powerful, cross platform, SQL database system

firebird-checkins