Skip to content

Commit

Permalink
Merge branch 'release/3.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@aarpon
aarpon committed Dec 17, 2019
2 parents 612b8d1 + f103c2c commit 980eddd
Show file tree
Hide file tree
Showing 6 changed files with 326 additions and 310 deletions.
6 changes: 3 additions & 3 deletions css/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -937,12 +937,12 @@ table#Servers td {
vertical-align: middle;
}

#ChromaticAberration table {
#ChromaticAberrationTable table {
font-size: 90%;
padding-bottom: 1em;
}

#ChromaticAberration td.header {
#ChromaticAberrationTable td.header {
font-weight: bold;
}

Expand Down Expand Up @@ -2330,4 +2330,4 @@ div.StedDeplModeValues {

.highlighted {
color: darkorange;
}
}
58 changes: 41 additions & 17 deletions inc/QueueManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,19 +541,28 @@ public function cleanUpRemoteServer($job)
// Loop over all the running jobs to find out about collisions.
$runningJobs = $this->queue->runningJobs();
foreach ($runningJobs as $runningJob) {

// Hostname == registered server entry without GPU tag.
$runningJobServer = $runningJob->server();
$s = explode(" ", $runningJobServer);
$runningJobHostname = $s[0];

// Other properties of the running job.

/** @var JobDescription $runningJobDescription */
$runningJobDescription = $runningJob->description();

/** @var UserV2 $runningJobOwner */
$runningJobOwner = $runningJobDescription->owner();

if ($runningJob->id() == $job->id()) continue;
if ($runningJobOwner->name() != $jobOwner->name()) continue;
if ($runningJobHostname != $jobHostname) continue;
if ($runningJob->id() == $job->id()) {
continue;
}
if ($runningJobOwner->name() != $jobOwner->name()) {
continue;
}
if ($runningJobHostname != $jobHostname) {
continue;
}

// Remove collisions with other jobs from the list of source files.
$runningJobSrcFiles = $runningJobDescription->files();
Expand Down Expand Up @@ -1105,12 +1114,14 @@ public function run()

// Fill admin user information in the database
if (!$this->fillInSuperAdminInfoInTheDatabase()) {
Log::error("Could not store the information for the admin user in the database!");
Log::error("Could not store the information for the admin user in the database! " .
"The Queue Manager was shut down!");
return;
}

if (!FileserverV2::createUpDownloadFolderIfMissing()) {
Log::error("The upload and download folders do not exist or are not writable!");
Log::error("The upload and download folders do not exist or are not writable!" .
"The Queue Manager was shut down!");
return;
}

Expand All @@ -1120,7 +1131,8 @@ public function run()
// Query the database for processing servers
$servers = $db->getAllServers();
if (count($servers) == 0) {
Log::error("There are no processing servers configured in the database!");
Log::error("There are no processing servers configured in the database! " .
"The Queue Manager was shut down!");
return;
}

Expand All @@ -1135,22 +1147,24 @@ public function run()
$hucorePath = $servers[0]['huscript_path'];

if (!$this->askHuCoreVersionAndStoreIntoDB($server, $hucorePath)) {
Log::error("An error occurred while reading HuCore version");
Log::error("An error occurred while reading HuCore version. " .
"The Queue Manager was shut down!");
return;
} else {
Log::info("Successfully stored HuCore version in the database.");
}

if (!$this->storeHuCoreLicenseDetailsIntoDB($server, $hucorePath)) {
Log::error("An error occurred while saving HuCore license details");
Log::error("An error occurred while saving HuCore license details" .
"The Queue Manager was shut down!");
return;
} else {
Log::info("Successfully updated license details in the database.");
}

if (!$this->storeConfidenceLevelsIntoDB($server, $hucorePath)) {
Log::error("An error occurred while storing the confidence " .
"levels in the database");
Log::error("An error occurred while storing the confidence levels in the database. " .
"The Queue Manager was shut down!");
return;
} else {
Log::info("Successfully updated confidence levels in the database.");
Expand All @@ -1159,7 +1173,6 @@ public function run()
$queue = $this->queue;
while (!$this->shallStop()) {
set_time_limit(0);
$result = true;

// Reduce the used cycles by going to sleep for one second
if ($imageProcessingIsOnQueueManager) {
Expand Down Expand Up @@ -1198,17 +1211,28 @@ public function run()

// Execute the template on the Huygens server and
// update the database state
$result = $result && $this->executeTemplate($job);
if (! $this->executeTemplate($job)) {
Log::error("An error occurred while executing HuCore template " .
"for job with id $id. Skipping to next job in queue.");
continue;
}

Log::info("Template has been executed successfully.");

if (!$result) {
// Now run the actual job
if (! $queue->startJob($job)) {
Log::error("An error occurred while running job with id $id." .
"Skipping to next job in queue.");
continue;
}

Log::info("Template has been executed");
$result = $result && $queue->startJob($job);
Log::info("Job with id " . $job->id() . " has been started (" . date("Y-m-d H:i:s") . ")");
// Inform that the job has started
$startDate = date("Y-m-d H:i:s");
Log::info("Job with id $id has been started on $startDate.");
}
}

// Inform
Log::warning("Huygens Remote Manager stopped via database switch on " . date("Y-m-d H:i:s"));
}

Expand Down
Loading

0 comments on commit 980eddd

Please sign in to comment.