ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extra logging for metadata errors

Browse source 
Increase logging in metadata image management.

Bug: none
Test: m
Change-Id: Ie49ca9ac90cd593c95d31f4651ae724d617d5695
Signed-off-by: Alessio Balsini <balsini@google.com>
This commit is contained in:
Alessio Balsini 2020-02-04 18:59:10 +00:00
parent 09b9fc56a2
commit 272ef868f1
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libfiemap/image_manager.cpp
View file

@ -252,7 +252,7 @@ bool ImageManager::DeleteBackingImage(const std::string& name) {
// For dm-linear devices sitting on top of /data, we cannot risk deleting
// the file. The underlying blocks could be reallocated by the filesystem.
if (IsImageMapped(name)) {
LOG(ERROR) << "Backing image " << name << " is currently mapped to a block device";
LOG(ERROR) << "Cannot delete backing image " << name << " because mapped to a block device";
return false;
}

17
fs_mgr/libfiemap/metadata.cpp
View file

@ -39,7 +39,13 @@ std::string GetMetadataFile(const std::string& metadata_dir) {
bool MetadataExists(const std::string& metadata_dir) {
auto metadata_file = GetMetadataFile(metadata_dir);
return access(metadata_file.c_str(), F_OK) == 0;
if (access(metadata_file.c_str(), F_OK)) {
if (errno != ENOENT) {
PLOG(ERROR) << "Access " << metadata_file << " failed:";
}
return false;
}
return true;
}
std::unique_ptr<LpMetadata> OpenMetadata(const std::string& metadata_dir) {
@ -61,7 +67,7 @@ std::unique_ptr<MetadataBuilder> OpenOrCreateMetadata(const std::string& metadat
std::unique_ptr<MetadataBuilder> builder;
if (access(metadata_file.c_str(), R_OK)) {
if (errno != ENOENT) {
PLOG(ERROR) << "access " << metadata_file << " failed:";
PLOG(ERROR) << "Access " << metadata_file << " failed:";
return nullptr;
}
@ -112,7 +118,12 @@ bool SaveMetadata(MetadataBuilder* builder, const std::string& metadata_dir) {
bool RemoveAllMetadata(const std::string& dir) {
auto metadata_file = GetMetadataFile(dir);
return android::base::RemoveFileIfExists(metadata_file);
std::string err;
if (!android::base::RemoveFileIfExists(metadata_file, &err)) {
LOG(ERROR) << "Could not remove metadata file: " << err;
return false;
}
return true;
}
bool FillPartitionExtents(MetadataBuilder* builder, Partition* partition, SplitFiemap* file,