recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Garbage collect old daemon records based on modification date, not creation date

Summary:
Fixes T12720. Currently, old daemon records are collected based on creation date. By default, the GC collects them after 7 days.

After T12298, this can incorrectly collect hibernating daemons which are in state "wait".

In all cases, this could fail to collect daemons which are stuck in "running" for a long time for some reason. This doesn't seem to be causing any problems right now, but it makes me hesitant to do "dateCreated + not running or waiting" since that might make this become a problem, or make an existing problem with this that we just haven't bumped into worse.

Daemons always heartbeat periodically and update their rows, so `dateModified` is always fresh, so collect rows based only on modification date.

Test Plan:
- Ran daemons (`bin/phd start`).
- Waited a few minutes.
- Verified that hibernating daemons in the "wait" state had fresh timestamps.
- Verified that very old daemons still got GC'd properly.

```
mysql> select id, daemon, status, FROM_UNIXTIME(dateCreated), FROM_UNIXTIME(dateModified) from daemon_log;
+-------+--------------------------------------+--------+----------------------------+-----------------------------+
| id | daemon | status | FROM_UNIXTIME(dateCreated) | FROM_UNIXTIME(dateModified) |
+-------+--------------------------------------+--------+----------------------------+-----------------------------+
| 73377 | PhabricatorTaskmasterDaemon | exit | 2017-05-19 10:53:03 | 2017-05-19 12:38:54 |
...
| 73388 | PhabricatorRepositoryPullLocalDaemon | run | 2017-05-26 08:43:29 | 2017-05-26 08:45:30 |
| 73389 | PhabricatorTriggerDaemon | run | 2017-05-26 08:43:29 | 2017-05-26 08:46:35 |
| 73390 | PhabricatorTaskmasterDaemon | wait | 2017-05-26 08:43:29 | 2017-05-26 08:46:35 |
| 73391 | PhabricatorTaskmasterDaemon | wait | 2017-05-26 08:43:33 | 2017-05-26 08:46:33 |
| 73392 | PhabricatorTaskmasterDaemon | wait | 2017-05-26 08:43:37 | 2017-05-26 08:46:31 |
| 73393 | PhabricatorTaskmasterDaemon | wait | 2017-05-26 08:43:40 | 2017-05-26 08:46:33 |
+-------+--------------------------------------+--------+----------------------------+-----------------------------+
17 rows in set (0.00 sec)
```

Note that:

- The oldest daemon is <7 days old -- I had some other older rows but they got GC'd properly.
- The hibernating taskmasters (at the bottom, in state "wait") have recent/more-current `dateModified` dates than their `dateCreated` dates.

Reviewers: chad, amckinley

Reviewed By: chad

Maniphest Tasks: T12720

Differential Revision: https://secure.phabricator.com/D18024

epriestley 69538274 718c3913

+5 -6
+2 -3
src/applications/daemon/garbagecollector/PhabricatorDaemonLogGarbageCollector.php
··· 19 19 20 20 queryfx( 21 21 $conn_w, 22 - 'DELETE FROM %T WHERE dateCreated < %d AND status != %s LIMIT 100', 22 + 'DELETE FROM %T WHERE dateModified < %d LIMIT 100', 23 23 $table->getTableName(), 24 - $this->getGarbageEpoch(), 25 - PhabricatorDaemonLog::STATUS_RUNNING); 24 + $this->getGarbageEpoch()); 26 25 27 26 return ($conn_w->getAffectedRows() == 100); 28 27 }
+3 -3
src/applications/daemon/storage/PhabricatorDaemonLog.php
··· 37 37 'status' => array( 38 38 'columns' => array('status'), 39 39 ), 40 - 'dateCreated' => array( 41 - 'columns' => array('dateCreated'), 42 - ), 43 40 'key_daemonID' => array( 44 41 'columns' => array('daemonID'), 45 42 'unique' => true, 43 + ), 44 + 'key_modified' => array( 45 + 'columns' => array('dateModified'), 46 46 ), 47 47 ), 48 48 ) + parent::getConfiguration();