tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "libsnapshot::RemoveAllUpdateState log stack"

Browse source 
Revert submission snapshotctl_callstack

Reason for revert: Callstack should not be logged
Reverted Changes:
Ib80c74a9a:Temporarily add libutilscallstack dependency
I2dfb6b7f1:libsnapshot::RemoveAllUpdateState log stack

Test: none
Bug: 148818798

Change-Id: I34683e93f10971629737f6fe648b25c6066c702f
This commit is contained in:
Yifan Hong 2020-02-12 18:21:20 +00:00
parent 611c6f7d79
commit 21ab3adc73
2 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs_mgr/libsnapshot/Android.bp
View file

@ -96,16 +96,6 @@ cc_library_static {
static_libs: [
"libfs_mgr_binder"
],
shared_libs: [
// TODO(b/148818798): remove when parent bug is fixed
"libutilscallstack",
],
cflags: [
"-g",
"-O0",
"-DLIBSNAPSHOT_USE_CALLSTACK",
],
}
cc_library_static {
@ -179,9 +169,6 @@ cc_defaults {
"libsparse",
"libutils",
"libz",
// TODO(b/148818798): remove when parent bug is fixed
"libutilscallstack",
],
static_libs: [
"libfs_mgr",
@ -231,8 +218,5 @@ cc_binary {
"libprotobuf-cpp-lite",
"libstatslog",
"libutils",
// TODO(b/148818798): remove when parent bug is fixed.
"libutilscallstack",
],
}

19
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -21,7 +21,6 @@
#include <sys/unistd.h>
#include <optional>
#include <sstream>
#include <thread>
#include <unordered_set>
@ -38,10 +37,6 @@
#include <libfiemap/image_manager.h>
#include <liblp/liblp.h>
#ifdef LIBSNAPSHOT_USE_CALLSTACK
#include <utils/CallStack.h>
#endif
#include <android/snapshot/snapshot.pb.h>
#include <libsnapshot/snapshot_stats.h>
#include "device_info.h"
@ -228,20 +223,6 @@ bool SnapshotManager::RemoveAllUpdateState(LockedFile* lock, const std::function
LOG(INFO) << "Removing all update state.";
#ifdef LIBSNAPSHOT_USE_CALLSTACK
LOG(WARNING) << "Logging stack; see b/148818798.";
// Do not use CallStack's log functions because snapshotctl relies on
// android-base/logging to save log to files.
// TODO(b/148818798): remove this before we ship.
CallStack callstack;
callstack.update();
auto callstack_str = callstack.toString();
LOG(WARNING) << callstack_str.c_str();
std::stringstream path;
path << "/data/misc/snapshotctl_log/libsnapshot." << Now() << ".log";
android::base::WriteStringToFile(callstack_str.c_str(), path.str());
#endif
if (!RemoveAllSnapshots(lock)) {
LOG(ERROR) << "Could not remove all snapshots";
return false;