diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-10 01:09:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-10 01:09:23 +0000 |
| commit | 6ddae5257a27f8f0a8dc774e21886d593725d52f (patch) | |
| tree | af044422fba64fbf448029ff8337447ea5d698b1 | |
| parent | e7b370f2b077defdf9bcdfe7de187dd0b6f04913 (diff) | |
| parent | 791c277789eaed56b901b4f0a5a3656e5930c935 (diff) | |
| download | extras-6ddae5257a27f8f0a8dc774e21886d593725d52f.tar.gz | |
Snap for 7444394 from 791c277789eaed56b901b4f0a5a3656e5930c935 to sc-d1-release
Change-Id: I5354e48239e9be8fa1ec9df9316ebfce22a62711
| -rw-r--r-- | checkpoint_gc/checkpoint_gc.sh | 20 | ||||
| -rw-r--r-- | profcollectd/profcollectd.rc | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/checkpoint_gc/checkpoint_gc.sh b/checkpoint_gc/checkpoint_gc.sh index a1169ec0..b3080463 100644 --- a/checkpoint_gc/checkpoint_gc.sh +++ b/checkpoint_gc/checkpoint_gc.sh @@ -28,10 +28,13 @@ SLEEP=5 TIME=0 MAX_TIME=1200 -if [ ! -d /dev/sys/fs/by-name/userdata ]; then +# We only need to run this if we're using f2fs +if [ ! -f /dev/sys/fs/by-name/userdata/gc_urgent ]; then exit 0 fi +# Ideally we want to track unusable, as it directly measures what we +# care about. If it's not present, dirty_segments is the best proxy. if [ -f /dev/sys/fs/by-name/userdata/unusable ]; then UNUSABLE=1 METRIC="unusable blocks" @@ -44,9 +47,7 @@ else fi log -pi -t checkpoint_gc Turning on GC for userdata -read OLD_SLEEP < /dev/sys/fs/by-name/userdata/gc_urgent_sleep_time || exit 1 -echo 50 > /dev/sys/fs/by-name/userdata/gc_urgent_sleep_time || exit 1 -echo 1 > /dev/sys/fs/by-name/userdata/gc_urgent || exit 1 +echo 2 > /dev/sys/fs/by-name/userdata/gc_urgent || exit 1 CURRENT=${START} @@ -66,15 +67,18 @@ while [ ${CURRENT} -gt ${THRESHOLD} ]; do sleep ${SLEEP} TIME=$((${TIME}+${SLEEP})) if [ ${TIME} -gt ${MAX_TIME} ]; then + log -pi -t checkpoint_gc Timed out with gc threshold not met. break fi # In case someone turns it off behind our back - echo 1 > /dev/sys/fs/by-name/userdata/gc_urgent + echo 2 > /dev/sys/fs/by-name/userdata/gc_urgent done -log -pi -t checkpoint_gc Turning off GC for userdata -echo 0 > /dev/sys/fs/by-name/userdata/gc_urgent -echo ${OLD_SLEEP} > /dev/sys/fs/by-name/userdata/gc_urgent_sleep_time +# It could be a while before the system reboots for the update... +# Leaving on low level GC can help ensure the boot for ota is faster +# If powerhints decides to turn it off, we'll just rely on normal GC +log -pi -t checkpoint_gc Leaving on low GC for userdata +echo 2 > /dev/sys/fs/by-name/userdata/gc_urgent sync print -u${STATUS_FD} "global_progress 1.0" diff --git a/profcollectd/profcollectd.rc b/profcollectd/profcollectd.rc index 9ac3fbc9..d1dbd9ef 100644 --- a/profcollectd/profcollectd.rc +++ b/profcollectd/profcollectd.rc @@ -14,7 +14,7 @@ on property:persist.profcollectd.enabled_override=true on post-fs-data # Create directory for profcollectd. - mkdir /data/misc/profcollectd 0770 root root - mkdir /data/misc/profcollectd/trace 0770 root root - mkdir /data/misc/profcollectd/output 0770 root root - mkdir /data/misc/profcollectd/report 0770 root root + mkdir /data/misc/profcollectd 0770 root system + mkdir /data/misc/profcollectd/trace 0770 root system + mkdir /data/misc/profcollectd/output 0770 root system + mkdir /data/misc/profcollectd/report 0770 root system |