diff options
Diffstat (limited to 'cmds/statsd/src/StatsLogProcessor.cpp')
-rw-r--r-- | cmds/statsd/src/StatsLogProcessor.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index 7bee4e2d1a36..6eff639aca92 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -520,10 +520,10 @@ void StatsLogProcessor::GetActiveConfigsLocked(const int uid, vector<int64_t>& o } void StatsLogProcessor::OnConfigUpdated(const int64_t timestampNs, const ConfigKey& key, - const StatsdConfig& config) { + const StatsdConfig& config, bool modularUpdate) { std::lock_guard<std::mutex> lock(mMetricsMutex); WriteDataToDiskLocked(key, timestampNs, CONFIG_UPDATED, NO_TIME_CONSTRAINTS); - OnConfigUpdatedLocked(timestampNs, key, config); + OnConfigUpdatedLocked(timestampNs, key, config, modularUpdate); } void StatsLogProcessor::OnConfigUpdatedLocked(const int64_t timestampNs, const ConfigKey& key, @@ -549,9 +549,7 @@ void StatsLogProcessor::OnConfigUpdatedLocked(const int64_t timestampNs, const C configValid = it->second->updateConfig(config, mTimeBaseNs, timestampNs, mAnomalyAlarmMonitor, mPeriodicAlarmMonitor); if (configValid) { - // TODO(b/162323476): refresh TTL, ensure init() is handled properly. mUidMap->OnConfigUpdated(key); - } } if (!configValid) { @@ -720,7 +718,8 @@ void StatsLogProcessor::resetConfigsLocked(const int64_t timestampNs, for (const auto& key : configs) { StatsdConfig config; if (StorageManager::readConfigFromDisk(key, &config)) { - OnConfigUpdatedLocked(timestampNs, key, config); + // Force a full update when resetting a config. + OnConfigUpdatedLocked(timestampNs, key, config, /*modularUpdate=*/false); StatsdStats::getInstance().noteConfigReset(key); } else { ALOGE("Failed to read backup config from disk for : %s", key.ToString().c_str()); |