Page MenuHomePhabricator
Files F15501309

D20078.id.diff
No OneTemporary
Actions

D20078.id.diff
View Options

diff --git a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
--- a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
+++ b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
@@ -73,6 +73,9 @@
$futures = array();
$queue = array();
+ $sync_wait = phutil_units('2 minutes in seconds');
+ $last_sync = array();
+
while (!$this->shouldExit()) {
PhabricatorCaches::destroyRequestCache();
$device = AlmanacKeys::getLiveDevice();
@@ -96,6 +99,37 @@
$retry_after[$message->getRepositoryID()] = time();
}
+ if ($device) {
+ $unsynchronized = $this->loadUnsynchronizedRepositories($device);
+ $now = PhabricatorTime::getNow();
+ foreach ($unsynchronized as $repository) {
+ $id = $repository->getID();
+
+ $this->log(
+ pht(
+ 'Cluster repository ("%s") is out of sync on this node ("%s").',
+ $repository->getDisplayName(),
+ $device->getName()));
+
+ // Don't let out-of-sync conditions trigger updates too frequently,
+ // since we don't want to get trapped in a death spiral if sync is
+ // failing.
+ $sync_at = idx($last_sync, $id, 0);
+ $wait_duration = ($now - $sync_at);
+ if ($wait_duration < $sync_wait) {
+ $this->log(
+ pht(
+ 'Skipping forced out-of-sync update because the last update '.
+ 'was too recent (%s seconds ago).',
+ $wait_duration));
+ continue;
+ }
+
+ $last_sync[$id] = $now;
+ $retry_after[$id] = $now;
+ }
+ }
+
// If any repositories were deleted, remove them from the retry timer map
// so we don't end up with a retry timer that never gets updated and
// causes us to sleep for the minimum amount of time.
@@ -521,4 +555,41 @@
return false;
}
+ private function loadUnsynchronizedRepositories(AlmanacDevice $device) {
+ $viewer = $this->getViewer();
+ $table = new PhabricatorRepositoryWorkingCopyVersion();
+ $conn = $table->establishConnection('r');
+
+ $our_versions = queryfx_all(
+ $conn,
+ 'SELECT repositoryPHID, repositoryVersion FROM %R WHERE devicePHID = %s',
+ $table,
+ $device->getPHID());
+ $our_versions = ipull($our_versions, 'repositoryVersion', 'repositoryPHID');
+
+ $max_versions = queryfx_all(
+ $conn,
+ 'SELECT repositoryPHID, MAX(repositoryVersion) maxVersion FROM %R
+ GROUP BY repositoryPHID',
+ $table);
+ $max_versions = ipull($max_versions, 'maxVersion', 'repositoryPHID');
+
+ $unsynchronized_phids = array();
+ foreach ($max_versions as $repository_phid => $max_version) {
+ $our_version = idx($our_versions, $repository_phid);
+ if (($our_version === null) || ($our_version < $max_version)) {
+ $unsynchronized_phids[] = $repository_phid;
+ }
+ }
+
+ if (!$unsynchronized_phids) {
+ return array();
+ }
+
+ return id(new PhabricatorRepositoryQuery())
+ ->setViewer($viewer)
+ ->withPHIDs($unsynchronized_phids)
+ ->execute();
+ }
+
}
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php
--- a/src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementWorkflow.php
@@ -7,7 +7,7 @@
$identifiers = $args->getArg($param);
if (!$identifiers) {
- return null;
+ return array();
}
$query = id(new PhabricatorRepositoryQuery())

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 14, 9:24 PM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7221753
Default Alt Text
D20078.id.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility