Recover from corrupted cache data

Make Cache constructor exception free

fixes #74
This commit is contained in:
Konstantinos Sideris 2017-10-03 21:16:31 +03:00
parent 73222aa900
commit 88349eae90
3 changed files with 38 additions and 27 deletions

View file

@ -35,9 +35,9 @@ public:
inline void deleteData(); inline void deleteData();
inline void unmount(); inline void unmount();
inline QString memberDbName(const QString &roomid);
void removeRoom(const QString &roomid); void removeRoom(const QString &roomid);
void setup();
private: private:
void setNextBatchToken(lmdb::txn &txn, const QString &token); void setNextBatchToken(lmdb::txn &txn, const QString &token);
@ -59,15 +59,11 @@ Cache::unmount()
isMounted_ = false; isMounted_ = false;
} }
inline QString
Cache::memberDbName(const QString &roomid)
{
return QString("m.%1").arg(roomid);
}
inline void inline void
Cache::deleteData() Cache::deleteData()
{ {
qInfo() << "Deleting cache data";
if (!cacheDirectory_.isEmpty()) if (!cacheDirectory_.isEmpty())
QDir(cacheDirectory_).removeRecursively(); QDir(cacheDirectory_).removeRecursively();
} }

View file

@ -37,10 +37,21 @@ Cache::Cache(const QString &userId)
, isMounted_{ false } , isMounted_{ false }
, userId_{ userId } , userId_{ userId }
{ {
}
void
Cache::setup()
{
qDebug() << "Setting up cache";
auto statePath = QString("%1/%2/state") auto statePath = QString("%1/%2/state")
.arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)) .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation))
.arg(QString::fromUtf8(userId_.toUtf8().toHex())); .arg(QString::fromUtf8(userId_.toUtf8().toHex()));
cacheDirectory_ = QString("%1/%2")
.arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation))
.arg(QString::fromUtf8(userId_.toUtf8().toHex()));
bool isInitial = !QFile::exists(statePath); bool isInitial = !QFile::exists(statePath);
env_ = lmdb::env::create(); env_ = lmdb::env::create();
@ -48,7 +59,7 @@ Cache::Cache(const QString &userId)
env_.set_max_dbs(1024UL); env_.set_max_dbs(1024UL);
if (isInitial) { if (isInitial) {
qDebug() << "[cache] First time initializing LMDB"; qDebug() << "First time initializing LMDB";
if (!QDir().mkpath(statePath)) { if (!QDir().mkpath(statePath)) {
throw std::runtime_error( throw std::runtime_error(
@ -84,9 +95,6 @@ Cache::Cache(const QString &userId)
txn.commit(); txn.commit();
isMounted_ = true; isMounted_ = true;
cacheDirectory_ = QString("%1/%2")
.arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation))
.arg(QString::fromUtf8(userId_.toUtf8().toHex()));
} }
void void
@ -156,6 +164,9 @@ Cache::insertRoomState(lmdb::txn &txn, const QString &roomid, const RoomState &s
void void
Cache::removeRoom(const QString &roomid) Cache::removeRoom(const QString &roomid)
{ {
if (!isMounted_)
return;
auto txn = lmdb::txn::begin(env_, nullptr, 0); auto txn = lmdb::txn::begin(env_, nullptr, 0);
lmdb::dbi_del(txn, roomDb_, lmdb::val(roomid.toUtf8(), roomid.toUtf8().size()), nullptr); lmdb::dbi_del(txn, roomDb_, lmdb::val(roomid.toUtf8(), roomid.toUtf8().size()), nullptr);

View file

@ -248,15 +248,22 @@ ChatPage::bootstrap(QString userid, QString homeserver, QString token)
client_->setAccessToken(token); client_->setAccessToken(token);
client_->getOwnProfile(); client_->getOwnProfile();
try {
cache_ = QSharedPointer<Cache>(new Cache(userid)); cache_ = QSharedPointer<Cache>(new Cache(userid));
} catch (const std::exception &e) {
qCritical() << e.what(); try {
cache_->setup();
if (cache_->isInitialized()) {
loadStateFromCache();
return;
}
} catch (const lmdb::error &e) {
qCritical() << "Cache failure" << e.what();
cache_->unmount();
cache_->deleteData();
qInfo() << "Falling back to initial sync ...";
} }
if (cache_->isInitialized())
loadStateFromCache();
else
client_->initialSync(); client_->initialSync();
} }
@ -367,6 +374,7 @@ ChatPage::syncCompleted(const SyncResponse &response)
qCritical() << "The cache couldn't be updated: " << e.what(); qCritical() << "The cache couldn't be updated: " << e.what();
// TODO: Notify the user. // TODO: Notify the user.
cache_->unmount(); cache_->unmount();
cache_->deleteData();
} }
client_->setNextBatchToken(response.nextBatch()); client_->setNextBatchToken(response.nextBatch());
@ -416,6 +424,7 @@ ChatPage::initialSyncCompleted(const SyncResponse &response)
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
qCritical() << "The cache couldn't be initialized: " << e.what(); qCritical() << "The cache couldn't be initialized: " << e.what();
cache_->unmount(); cache_->unmount();
cache_->deleteData();
} }
client_->setNextBatchToken(response.nextBatch()); client_->setNextBatchToken(response.nextBatch());
@ -492,14 +501,8 @@ ChatPage::loadStateFromCache()
{ {
qDebug() << "Restoring state from cache"; qDebug() << "Restoring state from cache";
try {
qDebug() << "Restored nextBatchToken" << cache_->nextBatchToken(); qDebug() << "Restored nextBatchToken" << cache_->nextBatchToken();
client_->setNextBatchToken(cache_->nextBatchToken()); client_->setNextBatchToken(cache_->nextBatchToken());
} catch (const lmdb::error &e) {
qCritical() << "Failed to load next_batch_token from cache" << e.what();
// TODO: Clean the environment
return;
}
// Fetch all the joined room's state. // Fetch all the joined room's state.
auto rooms = cache_->states(); auto rooms = cache_->states();
@ -612,6 +615,7 @@ ChatPage::removeRoom(const QString &room_id)
qCritical() << "The cache couldn't be updated: " << e.what(); qCritical() << "The cache couldn't be updated: " << e.what();
// TODO: Notify the user. // TODO: Notify the user.
cache_->unmount(); cache_->unmount();
cache_->deleteData();
} }
room_list_->removeRoom(room_id, room_id == current_room_); room_list_->removeRoom(room_id, room_id == current_room_);
} }