Page MenuHomePhabricator
Files F15438956

D17551.id42211.diff
No OneTemporary
Actions

D17551.id42211.diff
View Options

diff --git a/src/daemon/PhutilDaemonOverseer.php b/src/daemon/PhutilDaemonOverseer.php
--- a/src/daemon/PhutilDaemonOverseer.php
+++ b/src/daemon/PhutilDaemonOverseer.php
@@ -187,9 +187,11 @@
foreach ($this->getDaemonPools() as $pool) {
$pool->updatePool();
- if ($pool->isHibernating()) {
- if ($this->shouldWakePool($pool)) {
- $pool->wakeFromHibernation();
+ if (!$this->shouldShutdown()) {
+ if ($pool->isHibernating()) {
+ if ($this->shouldWakePool($pool)) {
+ $pool->wakeFromHibernation();
+ }
}
}
@@ -204,7 +206,7 @@
$this->waitForDaemonFutures($futures);
if (!$futures) {
- if ($this->inGracefulShutdown) {
+ if ($this->shouldShutdown()) {
break;
}
}
@@ -226,7 +228,7 @@
break;
}
} else {
- if (!$this->inGracefulShutdown) {
+ if (!$this->shouldShutdown()) {
sleep(1);
}
}
@@ -505,4 +507,8 @@
return $should_wake;
}
+ private function shouldShutdown() {
+ return $this->inGracefulShutdown || $this->inAbruptShutdown;
+ }
+
}
diff --git a/src/daemon/PhutilDaemonPool.php b/src/daemon/PhutilDaemonPool.php
--- a/src/daemon/PhutilDaemonPool.php
+++ b/src/daemon/PhutilDaemonPool.php
@@ -10,6 +10,7 @@
private $argv;
private $lastAutoscaleUpdate;
+ private $inShutdown;
private function __construct() {
// <empty>
@@ -64,6 +65,10 @@
return $this->commandLineArguments;
}
+ private function shouldShutdown() {
+ return $this->inShutdown;
+ }
+
private function newDaemon() {
$config = $this->properties;
@@ -128,9 +133,11 @@
$daemon->didReceiveReloadSignal($signo);
break;
case PhutilDaemonOverseer::SIGNAL_GRACEFUL:
+ $this->inShutdown = true;
$daemon->didReceiveGracefulSignal($signo);
break;
case PhutilDaemonOverseer::SIGNAL_TERMINATE:
+ $this->inShutdown = true;
$daemon->didReceiveTerminateSignal($signo);
break;
default:
@@ -232,6 +239,10 @@
}
private function updateAutoscale() {
+ if ($this->shouldShutdown()) {
+ return;
+ }
+
// Don't try to autoscale more than once per second. This mostly stops the
// logs from getting flooded in verbose mode.
$now = time();

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 27, 4:56 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7226216
Default Alt Text
D17551.id42211.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility