tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

internfile: let the constructor succeed even on uncompression error, so that the doc record is created and retry choices can be done for other runs

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-03-19 16:41:01 +01:00
parent 4d7d1a7965
commit 1cf8327525
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/internfile/internfile.cpp
View File

@ -129,6 +129,14 @@ FileInterner::FileInterner(const string &fn, const struct stat *stp,
init(fn, stp, cnf, flags, imime); init(fn, stp, cnf, flags, imime);
} }
// Note that we always succeed (set m_ok = true), except in internal
// inconsistency cases (which could just as well abort()). Errors
// will be detected when internfile() is called. This is done so that
// our caller creates a doc record in all cases (with an error-flagged
// signature), so that the appropriate retry choices can be made. This
// used to not be the case, and was changed because this was the
// simplest way to solve the retry issues (simpler than changing the
// caller in e.g. fsindexer).
void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf, void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf,
int flags, const string *imime) int flags, const string *imime)
{ {
@ -190,6 +198,7 @@ void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf,
if (!m_cfg->getConfParam("compressedfilemaxkbs", &maxkbs) || if (!m_cfg->getConfParam("compressedfilemaxkbs", &maxkbs) ||
maxkbs < 0 || !stp || int(stp->st_size / 1024) < maxkbs) { maxkbs < 0 || !stp || int(stp->st_size / 1024) < maxkbs) {
if (!m_uncomp->uncompressfile(m_fn, ucmd, m_tfile)) { if (!m_uncomp->uncompressfile(m_fn, ucmd, m_tfile)) {
m_ok = true;
return; return;
} }
LOGDEB1("FileInterner:: after ucomp: tfile " << m_tfile <<"\n"); LOGDEB1("FileInterner:: after ucomp: tfile " << m_tfile <<"\n");
@ -199,6 +208,7 @@ void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf,
if (path_fileprops(m_fn, &ucstat) != 0) { if (path_fileprops(m_fn, &ucstat) != 0) {
LOGERR("FileInterner: can't stat the uncompressed file[" << LOGERR("FileInterner: can't stat the uncompressed file[" <<
m_fn << "] errno " << errno << "\n"); m_fn << "] errno " << errno << "\n");
m_ok = true;
return; return;
} else { } else {
docsize = ucstat.st_size; docsize = ucstat.st_size;