Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-33291 Ensure exceptions during file exists check are properly reported #19446

Merged
merged 1 commit into from
Jan 30, 2025
Merged

HPCC-33291 Ensure exceptions during file exists check are properly reported #19446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 63 additions & 26 deletions thorlcr/thorutil/thormisc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,11 @@ bool getBestFilePart(CActivityBase *activity, IPartDescriptor &partDesc, OwnedIF
RemoteFilename rfn;
StringBuffer locationName, primaryName;
//First check for local matches
for (l=0; l<partDesc.numCopies(); l++)
unsigned copies = partDesc.numCopies();
unsigned localCopies = 0;
Owned<IException> accessException;
IMultiException *multiException = nullptr;
for (l=0; l<copies; l++)
{
rfn.clear();
partDesc.getFilename(l, rfn);
Expand All @@ -1081,6 +1085,7 @@ bool getBestFilePart(CActivityBase *activity, IPartDescriptor &partDesc, OwnedIF
}
if (rfn.isLocal())
{
localCopies++;
rfn.getPath(locationName.clear());
assertex(locationName.length());

Expand All @@ -1105,45 +1110,77 @@ bool getBestFilePart(CActivityBase *activity, IPartDescriptor &partDesc, OwnedIF
catch (IException *e)
{
ActPrintLog(&activity->queryContainer(), e, "getBestFilePart");
e->Release();
if (!accessException)
accessException.setown(e);
else
{
if (!multiException)
{
multiException = makeMultiException();
multiException->append(*accessException.getClear());
accessException.setown(multiException);
}
multiException->append(*e);
}
}
}
}

//Now check for a remote match...
for (l=0; l<partDesc.numCopies(); l++)
if (localCopies < copies)
{
rfn.clear();
partDesc.getFilename(l, rfn);
if (!rfn.isLocal())
//Now check for a remote match...
for (l=0; l<partDesc.numCopies(); l++)
{
rfn.getPath(locationName.clear());
assertex(locationName.length());
Owned<IFile> file = createIFile(locationName.str());
try
rfn.clear();
partDesc.getFilename(l, rfn);
if (!rfn.isLocal())
{
if (file->exists())
rfn.getPath(locationName.clear());
assertex(locationName.length());
Owned<IFile> file = createIFile(locationName.str());
try
{
ifile.set(file);
location = l;
if (0 != l)
if (file->exists())
{
Owned<IThorException> e = MakeActivityWarning(activity, 0, "Primary file missing: %s, using remote copy: %s", primaryName.str(), locationName.str());
if (!eHandler)
throw e.getClear();
eHandler->fireException(e);
ifile.set(file);
location = l;
if (0 != l)
{
Owned<IThorException> e = MakeActivityWarning(activity, 0, "Primary file missing: %s, using remote copy: %s", primaryName.str(), locationName.str());
if (!eHandler)
throw e.getClear();
eHandler->fireException(e);
}
path.append(locationName);
return true;
}
}
catch (IException *e)
{
ActPrintLog(&activity->queryContainer(), e, "In getBestFilePart");
if (!accessException)
accessException.setown(e);
else
{
if (!multiException)
{
multiException = makeMultiException();
multiException->append(*accessException.getClear());
accessException.setown(multiException);
}
multiException->append(*e);
}
path.append(locationName);
return true;
}
}
catch (IException *e)
{
ActPrintLog(&activity->queryContainer(), e, "In getBestFilePart");
e->Release();
}
}
}
if (accessException)
{
if (!eHandler)
throw accessException.getClear();

eHandler->fireException(accessException);
}
return false;
}

Expand Down
Loading