improved error message printing on filesystem refuse signals (c2252e45) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/include/kernel/signaldata/FsRef.hpp

+1 −21

Original line number	Diff line number	Diff line
		@@ -31,25 +31,7 @@
		* SENDER: Ndbfs
		* RECIVER:
		*/
		class FsRef {
		/**
		* Reciver(s)
		*/
		friend class Dbdict;
		friend class Backup;

		/**
		* Sender(s)
		*/
		friend class Ndbfs;
		friend class VoidFs;

		/**
		* For printing
		*/
		friend bool printFSREF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo);

		public:
		struct FsRef {
		/**
		* Enum type for errorCode
		*/
		@@ -73,8 +55,6 @@ public:
		*/
		STATIC_CONST( SignalLength = 4 );

		private:

		/**
		* DATA VARIABLES
		*/

ndb/src/kernel/blocks/backup/BackupInit.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -150,16 +150,16 @@ Backup::Backup(const Configuration & conf) :
		addRecSignal(GSN_DI_FCOUNTCONF, &Backup::execDI_FCOUNTCONF);
		addRecSignal(GSN_DIGETPRIMCONF, &Backup::execDIGETPRIMCONF);

		addRecSignal(GSN_FSOPENREF, &Backup::execFSOPENREF);
		addRecSignal(GSN_FSOPENREF, &Backup::execFSOPENREF, true);
		addRecSignal(GSN_FSOPENCONF, &Backup::execFSOPENCONF);

		addRecSignal(GSN_FSCLOSEREF, &Backup::execFSCLOSEREF);
		addRecSignal(GSN_FSCLOSEREF, &Backup::execFSCLOSEREF, true);
		addRecSignal(GSN_FSCLOSECONF, &Backup::execFSCLOSECONF);

		addRecSignal(GSN_FSAPPENDREF, &Backup::execFSAPPENDREF);
		addRecSignal(GSN_FSAPPENDREF, &Backup::execFSAPPENDREF, true);
		addRecSignal(GSN_FSAPPENDCONF, &Backup::execFSAPPENDCONF);

		addRecSignal(GSN_FSREMOVEREF, &Backup::execFSREMOVEREF);
		addRecSignal(GSN_FSREMOVEREF, &Backup::execFSREMOVEREF, true);
		addRecSignal(GSN_FSREMOVECONF, &Backup::execFSREMOVECONF);

		/*****/

ndb/src/kernel/blocks/dbacc/Dbacc.hpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -949,17 +949,12 @@ private:
		void execACC_TO_REQ(Signal* signal);
		void execACC_LOCKREQ(Signal* signal);
		void execFSOPENCONF(Signal* signal);
		void execFSOPENREF(Signal* signal);
		void execFSCLOSECONF(Signal* signal);
		void execFSCLOSEREF(Signal* signal);
		void execFSWRITECONF(Signal* signal);
		void execFSWRITEREF(Signal* signal);
		void execFSREADCONF(Signal* signal);
		void execFSREADREF(Signal* signal);
		void execNDB_STTOR(Signal* signal);
		void execDROP_TAB_REQ(Signal* signal);
		void execFSREMOVECONF(Signal* signal);
		void execFSREMOVEREF(Signal* signal);
		void execREAD_CONFIG_REQ(Signal* signal);
		void execSET_VAR_REQ(Signal* signal);
		void execDUMP_STATE_ORD(Signal* signal);

ndb/src/kernel/blocks/dbacc/DbaccInit.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -187,17 +187,12 @@ Dbacc::Dbacc(const class Configuration & conf):
		addRecSignal(GSN_ACC_TO_REQ, &Dbacc::execACC_TO_REQ);
		addRecSignal(GSN_ACC_LOCKREQ, &Dbacc::execACC_LOCKREQ);
		addRecSignal(GSN_FSOPENCONF, &Dbacc::execFSOPENCONF);
		addRecSignal(GSN_FSOPENREF, &Dbacc::execFSOPENREF);
		addRecSignal(GSN_FSCLOSECONF, &Dbacc::execFSCLOSECONF);
		addRecSignal(GSN_FSCLOSEREF, &Dbacc::execFSCLOSEREF);
		addRecSignal(GSN_FSWRITECONF, &Dbacc::execFSWRITECONF);
		addRecSignal(GSN_FSWRITEREF, &Dbacc::execFSWRITEREF);
		addRecSignal(GSN_FSREADCONF, &Dbacc::execFSREADCONF);
		addRecSignal(GSN_FSREADREF, &Dbacc::execFSREADREF);
		addRecSignal(GSN_NDB_STTOR, &Dbacc::execNDB_STTOR);
		addRecSignal(GSN_DROP_TAB_REQ, &Dbacc::execDROP_TAB_REQ);
		addRecSignal(GSN_FSREMOVECONF, &Dbacc::execFSREMOVECONF);
		addRecSignal(GSN_FSREMOVEREF, &Dbacc::execFSREMOVEREF);
		addRecSignal(GSN_READ_CONFIG_REQ, &Dbacc::execREAD_CONFIG_REQ, true);
		addRecSignal(GSN_SET_VAR_REQ, &Dbacc::execSET_VAR_REQ);

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+0 −42

Original line number	Diff line number	Diff line
		@@ -248,15 +248,6 @@ void Dbacc::execFSCLOSECONF(Signal* signal)
		return;
		}//Dbacc::execFSCLOSECONF()

		/* *****************--------------------------------------------------------------- /
		/* FSCLOSEREF OPENFILE CONF */
		/* *****************------------------------------+ /
		/* SENDER: FS, LEVEL B */
		void Dbacc::execFSCLOSEREF(Signal* signal)
		{
		jamEntry();
		ndbrequire(false);
		}//Dbacc::execFSCLOSEREF()

		/* *****************--------------------------------------------------------------- /
		/* FSOPENCONF OPENFILE CONF */
		@@ -304,15 +295,6 @@ void Dbacc::execFSOPENCONF(Signal* signal)
		return;
		}//Dbacc::execFSOPENCONF()

		/* *****************--------------------------------------------------------------- /
		/* FSOPENREF OPENFILE REF */
		/* *****************------------------------------+ /
		/* SENDER: FS, LEVEL B */
		void Dbacc::execFSOPENREF(Signal* signal)
		{
		jamEntry();
		ndbrequire(false);
		}//Dbacc::execFSOPENREF()

		/* *****************--------------------------------------------------------------- /
		/* FSREADCONF OPENFILE CONF */
		@@ -366,16 +348,6 @@ void Dbacc::execFSREADCONF(Signal* signal)
		return;
		}//Dbacc::execFSREADCONF()

		/* *****************--------------------------------------------------------------- /
		/* FSREADRREF OPENFILE CONF */
		/* *****************------------------------------+ /
		/* SENDER: FS, LEVEL B */
		void Dbacc::execFSREADREF(Signal* signal)
		{
		jamEntry();
		progError(0, __LINE__, "Read of file refused");
		return;
		}//Dbacc::execFSREADREF()

		/* *****************--------------------------------------------------------------- /
		/* FSWRITECONF OPENFILE CONF */
		@@ -479,16 +451,6 @@ void Dbacc::execFSWRITECONF(Signal* signal)
		return;
		}//Dbacc::execFSWRITECONF()

		/* *****************--------------------------------------------------------------- /
		/* FSWRITEREF OPENFILE CONF */
		/* *****************------------------------------+ /
		/* SENDER: FS, LEVEL B */
		void Dbacc::execFSWRITEREF(Signal* signal)
		{
		jamEntry();
		progError(0, __LINE__, "Write to file refused");
		return;
		}//Dbacc::execFSWRITEREF()

		/* ------------------------------------------------------------------------- */
		/* ------------------------------------------------------------------------- */
		@@ -1425,10 +1387,6 @@ void Dbacc::execFSREMOVECONF(Signal* signal)
		tabPtr.p->tabUserRef = 0;
		}//Dbacc::execFSREMOVECONF()

		void Dbacc::execFSREMOVEREF(Signal* signal)
		{
		ndbrequire(false);
		}//Dbacc::execFSREMOVEREF()

		/* -------------------------------------------------------------------------- */
		/* ADDFRAGTOTAB */