Commit 76de104d authored by mattijs's avatar mattijs Committed by Andrew Heather
Browse files

ENH: fileModificationSkew: add polling. Fixes #1472.

parent 1310e852
......@@ -82,6 +82,10 @@ OptimisationSwitches
// updated. Set to 0 on distributed case.
fileModificationSkew 10;
// How often retest (using above fileModificationSkew) before giving up.
// Default is 1.
//maxFileModificationPolls 100;
//- Modification checking:
// - timeStamp : use modification time on file
// - inotify : use inotify framework
......
......@@ -222,44 +222,77 @@ Foam::functionEntries::codeStream::getFunction
off_t masterSize = mySize;
Pstream::scatter(masterSize);
DebugPout
<< nl << "on processor " << Pstream::myProcNo()
<< " have masterSize:" << masterSize
<< " and localSize:" << mySize << endl;
if (mySize < masterSize)
for
(
label iter = 0;
iter < regIOobject::maxFileModificationPolls;
iter++
)
{
DebugPout
<< "Local file " << libPath
<< " not of same size (" << mySize
<< ") as master ("
<< masterSize << "). Waiting for "
<< regIOobject::fileModificationSkew
<< " seconds." << endl;
Foam::sleep(regIOobject::fileModificationSkew);
<< "on processor " << Pstream::myProcNo()
<< "masterSize:" << masterSize
<< " and localSize:" << mySize
<< endl;
// Recheck local size
mySize = Foam::fileSize(libPath);
if (mySize < masterSize)
if (mySize == masterSize)
{
FatalIOErrorInFunction(parentDict)
<< "Cannot read (NFS mounted) library " << nl
<< libPath << nl
break;
}
else if (mySize > masterSize)
{
FatalIOErrorInFunction(context.dict())
<< "Excessive size when reading (NFS mounted) library "
<< nl << libPath << nl
<< "on processor " << Pstream::myProcNo()
<< " detected size " << mySize
<< " whereas master size is " << masterSize
<< " bytes." << nl
<< "If your case is not NFS mounted"
<< "If your case is NFS mounted increase"
<< " fileModificationSkew or maxFileModificationPolls;"
<< nl << "If your case is not NFS mounted"
<< " (so distributed) set fileModificationSkew"
<< " to 0"
<< exit(FatalIOError);
}
else
{
DebugPout
<< "Local file " << libPath
<< " not of same size (" << mySize
<< ") as master ("
<< masterSize << "). Waiting for "
<< regIOobject::fileModificationSkew
<< " seconds." << endl;
Foam::sleep(regIOobject::fileModificationSkew);
// Recheck local size
mySize = Foam::fileSize(libPath);
}
}
// Finished doing iterations. Do final check
if (mySize != masterSize)
{
FatalIOErrorInFunction(context.dict())
<< "Cannot read (NFS mounted) library " << nl
<< libPath << nl
<< "on processor " << Pstream::myProcNo()
<< " detected size " << mySize
<< " whereas master size is " << masterSize
<< " bytes." << nl
<< "If your case is NFS mounted increase"
<< " fileModificationSkew or maxFileModificationPolls;"
<< nl << "If your case is not NFS mounted"
<< " (so distributed) set fileModificationSkew"
<< " to 0"
<< exit(FatalIOError);
}
DebugPout
<< nl << "on processor " << Pstream::myProcNo()
<< "on processor " << Pstream::myProcNo()
<< " after waiting: have masterSize:" << masterSize
<< " and localSize:" << mySize << endl;
}
......
......@@ -250,54 +250,79 @@ void Foam::codedBase::createLibrary
off_t masterSize = mySize;
Pstream::scatter(masterSize);
if (debug)
for
(
label iter = 0;
iter < regIOobject::maxFileModificationPolls;
iter++
)
{
Pout<< endl<< "on processor " << Pstream::myProcNo()
DebugPout
<< "on processor " << Pstream::myProcNo()
<< " have masterSize:" << masterSize
<< " and localSize:" << mySize
<< endl;
}
if (mySize < masterSize)
{
if (debug)
if (mySize == masterSize)
{
Pout<< "Local file " << libPath
<< " not of same size (" << mySize
<< ") as master ("
<< masterSize << "). Waiting for "
<< regIOobject::fileModificationSkew
<< " seconds." << endl;
break;
}
Foam::sleep(regIOobject::fileModificationSkew);
// Recheck local size
mySize = Foam::fileSize(libPath);
if (mySize < masterSize)
else if (mySize > masterSize)
{
FatalIOErrorInFunction(context.dict())
<< "Cannot read (NFS mounted) library " << nl
<< libPath << nl
<< "Excessive size when reading (NFS mounted) library "
<< nl << libPath << nl
<< "on processor " << Pstream::myProcNo()
<< " detected size " << mySize
<< " whereas master size is " << masterSize
<< " bytes." << nl
<< "If your case is not NFS mounted"
<< "If your case is NFS mounted increase"
<< " fileModificationSkew or maxFileModificationPolls;"
<< nl << "If your case is not NFS mounted"
<< " (so distributed) set fileModificationSkew"
<< " to 0"
<< exit(FatalIOError);
}
else
{
DebugPout
<< "Local file " << libPath
<< " not of same size (" << mySize
<< ") as master ("
<< masterSize << "). Waiting for "
<< regIOobject::fileModificationSkew
<< " seconds." << endl;
Foam::sleep(regIOobject::fileModificationSkew);
// Recheck local size
mySize = Foam::fileSize(libPath);
}
}
if (debug)
// Finished doing iterations. Do final check
if (mySize != masterSize)
{
Pout<< endl<< "on processor " << Pstream::myProcNo()
<< " after waiting: have masterSize:" << masterSize
<< " and localSize:" << mySize
<< endl;
FatalIOErrorInFunction(context.dict())
<< "Cannot read (NFS mounted) library " << nl
<< libPath << nl
<< "on processor " << Pstream::myProcNo()
<< " detected size " << mySize
<< " whereas master size is " << masterSize
<< " bytes." << nl
<< "If your case is NFS mounted increase"
<< " fileModificationSkew or maxFileModificationPolls;"
<< nl << "If your case is not NFS mounted"
<< " (so distributed) set fileModificationSkew"
<< " to 0"
<< exit(FatalIOError);
}
DebugPout
<< "on processor " << Pstream::myProcNo()
<< " after waiting: have masterSize:" << masterSize
<< " and localSize:" << mySize << endl;
}
reduce(create, orOp<bool>());
}
......
......@@ -50,6 +50,17 @@ registerOptSwitch
Foam::regIOobject::fileModificationSkew
);
int Foam::regIOobject::maxFileModificationPolls
(
Foam::debug::optimisationSwitch("maxFileModificationPolls", 1)
);
registerOptSwitch
(
"maxFileModificationPolls",
int,
Foam::regIOobject::maxFileModificationPolls
);
bool Foam::regIOobject::masterOnlyReading = false;
......
......@@ -131,6 +131,8 @@ public:
static float fileModificationSkew;
static int maxFileModificationPolls;
// Constructors
......
......@@ -1501,8 +1501,27 @@ void Foam::argList::parse
)
)
{
Info<< " (fileModificationSkew "
<< regIOobject::fileModificationSkew << ")";
if (regIOobject::maxFileModificationPolls == 1)
{
Info<< " (fileModificationSkew "
<< regIOobject::fileModificationSkew
<< ")";
}
else if (regIOobject::maxFileModificationPolls > 1)
{
Info<< " (fileModificationSkew "
<< regIOobject::fileModificationSkew
<< ", maxFileModificationPolls "
<< regIOobject::maxFileModificationPolls
<< ")";
}
else
{
FatalErrorInFunction
<< "Invalid setting for maxFileModificationPolls "
<< regIOobject::maxFileModificationPolls
<< exit(FatalError);
}
}
Info<< nl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment