@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
Update Phabricator for new daemon pool changes
Summary:
Ref T12298. This updates `bin/phd` for minor changes to daemon configuration. In particular:
- Every daemon now has an autoscale pool (for trigger/pull, the maximum pool size is 1).
- Pools now have labels to make debugging a little easier.
- Some minor structural changes.
Test Plan: See D17389.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T12298
Differential Revision: https://secure.phabricator.com/D17390
+12
-32
+5
-14
src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
+5
-14
src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
···
28
28
'instead of the configured %s',
29
29
'phd.user'),
30
30
),
31
-
array(
32
-
'name' => 'autoscale',
33
-
'help' => pht('Put the daemon in an autoscale group.'),
34
-
),
35
31
));
36
32
}
37
33
···
44
40
pht('You must specify which daemon to debug.'));
45
41
}
46
42
47
-
$config = array();
48
-
49
-
$config['class'] = array_shift($argv);
50
-
$config['argv'] = $argv;
51
-
52
-
if ($args->getArg('autoscale')) {
53
-
$config['autoscale'] = array(
54
-
'group' => 'debug',
55
-
);
56
-
}
43
+
$config = array(
44
+
'class' => array_shift($argv),
45
+
'label' => 'debug',
46
+
'argv' => $argv,
47
+
);
57
48
58
49
return $this->launchDaemons(
59
50
array(
+7
-18
src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
+7
-18
src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
···
362
362
$daemons = array(
363
363
array(
364
364
'class' => 'PhabricatorRepositoryPullLocalDaemon',
365
+
'label' => 'pull',
365
366
),
366
367
array(
367
368
'class' => 'PhabricatorTriggerDaemon',
369
+
'label' => 'trigger',
368
370
),
369
371
array(
370
372
'class' => 'PhabricatorTaskmasterDaemon',
371
-
'autoscale' => array(
372
-
'group' => 'task',
373
-
'pool' => PhabricatorEnv::getEnvConfig('phd.taskmasters'),
374
-
'reserve' => idx($options, 'reserve', 0),
375
-
),
373
+
'label' => 'task',
374
+
'pool' => PhabricatorEnv::getEnvConfig('phd.taskmasters'),
375
+
'reserve' => idx($options, 'reserve', 0),
376
376
),
377
377
);
378
378
···
618
618
pht('(Logs will appear in "%s".)', $log_dir));
619
619
620
620
foreach ($daemons as $daemon) {
621
-
$is_autoscale = isset($daemon['autoscale']['group']);
622
-
if ($is_autoscale) {
623
-
$autoscale = $daemon['autoscale'];
624
-
foreach ($autoscale as $key => $value) {
625
-
$autoscale[$key] = $key.'='.$value;
626
-
}
627
-
$autoscale = implode(', ', $autoscale);
628
-
629
-
$autoscale = pht('(Autoscaling: %s)', $autoscale);
630
-
} else {
631
-
$autoscale = pht('(Static)');
632
-
}
621
+
$pool_size = pht('(Pool: %s)', idx($daemon, 'pool', 1));
633
622
634
623
$console->writeOut(
635
624
" %s %s\n",
625
+
$pool_size,
636
626
$daemon['class'],
637
-
$autoscale,
638
627
implode(' ', idx($daemon, 'argv', array())));
639
628
}
640
629
$console->writeOut("\n");