Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 176de7bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log the CowOperation when decompression failed" into main am: e8778855 am: 95879d3e 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768488



Change-Id: I7f026a7662ad580e4e2bb628196749baba2909e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8c6297e 95879d3e

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_worker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ bool WorkerThread::ProcessReplaceOp(const CowOperation* cow_op) { 
    ssize_t rv = reader_->ReadData(cow_op, buffer, BLOCK_SZ);

    if (rv != BLOCK_SZ) {

        SNAP_LOG(ERROR) << "ProcessReplaceOp failed for block " << cow_op->new_block

                        << ", return = " << rv;

                        << ", return = " << rv << ", COW operation = " << *cow_op;

        return false;

    }

    return true;

fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp

+2 −1
Original line number Diff line number Diff line
@@ -283,7 +283,8 @@ bool ReadWorker::ReadAlignedSector(sector_t sector, size_t sz) { 
                // We found the sector in mapping. Check the type of COW OP and

                // process it.

                if (!ProcessCowOp(it->second, buffer)) {

                    SNAP_LOG(ERROR) << "ProcessCowOp failed";

                    SNAP_LOG(ERROR)

                            << "ProcessCowOp failed, sector = " << sector << ", size = " << sz;

                    return false;

                }