diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp index 486548cad..a0c5c6658 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp @@ -582,7 +582,6 @@ bool MergeWorker::Run() { pthread_setname_np(pthread_self(), "MergeWorker"); if (!snapuserd_->WaitForMergeBegin()) { - SNAP_LOG(ERROR) << "Merge terminated early..."; return true; } auto merge_thread_priority = android::base::GetUintProperty( diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp index 9a1d441c4..3007d45f4 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp @@ -702,7 +702,7 @@ bool ReadAhead::ReadAheadIOStart() { // window. If there is a crash during this time frame, merge should resume // based on the contents of the scratch space. if (!snapuserd_->WaitForMergeReady()) { - SNAP_LOG(ERROR) << "ReadAhead failed to wait for merge ready"; + SNAP_LOG(VERBOSE) << "ReadAhead failed to wait for merge ready"; return false; } diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp index 2ad4ea1c2..714c64124 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp @@ -202,7 +202,7 @@ bool SnapshotHandler::WaitForMergeBegin() { cv.wait(lock, [this]() -> bool { return MergeInitiated() || IsMergeBeginError(io_state_); }); if (IsMergeBeginError(io_state_)) { - SNAP_LOG(ERROR) << "WaitForMergeBegin failed with state: " << io_state_; + SNAP_LOG(VERBOSE) << "WaitForMergeBegin failed with state: " << io_state_; return false; } @@ -276,7 +276,9 @@ bool SnapshotHandler::WaitForMergeReady() { if (io_state_ == MERGE_IO_TRANSITION::MERGE_FAILED || io_state_ == MERGE_IO_TRANSITION::MERGE_COMPLETE || io_state_ == MERGE_IO_TRANSITION::IO_TERMINATED) { - SNAP_LOG(ERROR) << "Wait for merge ready failed: " << io_state_; + if (io_state_ == MERGE_IO_TRANSITION::MERGE_FAILED) { + SNAP_LOG(ERROR) << "Wait for merge ready failed: " << io_state_; + } return false; } return true;