Differential D22446 Diff 61717 kstars/ekos/scheduler/scheduler.cpp

Changeset View

Standalone View

View Options

kstars/ekos/scheduler/scheduler.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 190 Lines • ▼ Show 20 Line(s)46{
191 connect(pauseB, &QPushButton::clicked, this, &Scheduler::pause); 191​ connect(pauseB, &QPushButton::clicked, this, &Scheduler::pause);
192 192​
193 connect(queueSaveAsB, &QPushButton::clicked, this, &Scheduler::saveAs); 193​ connect(queueSaveAsB, &QPushButton::clicked, this, &Scheduler::saveAs);
194 connect(queueSaveB, &QPushButton::clicked, this, &Scheduler::save); 194​ connect(queueSaveB, &QPushButton::clicked, this, &Scheduler::save);
195 connect(queueLoadB, &QPushButton::clicked, this, &Scheduler::load); 195​ connect(queueLoadB, &QPushButton::clicked, this, &Scheduler::load);
196 196​
197 connect(twilightCheck, &QCheckBox::toggled, this, &Scheduler::checkTwilightWarning); 197​ connect(twilightCheck, &QCheckBox::toggled, this, &Scheduler::checkTwilightWarning);
198 198​
199​ // restore default values for error handling strategy
200​ setErrorHandlingStrategy(static_cast<ErrorHandlingStrategy>(Options::errorHandlingStrategy()));
201​ errorHandlingRescheduleErrorsCB->setChecked(Options::rescheduleErrors());
202​ errorHandlingDelaySB->setValue(Options::errorHandlingStrategyDelay());
203​
204​ // save new default values for error handling strategy
205​
206​ connect(errorHandlingRescheduleErrorsCB, &QPushButton::clicked, [this](bool checked)
207​ {
208​ Options::setRescheduleErrors(checked);
209​ });
210​ connect(errorHandlingButtonGroup, static_cast<void (QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked), [this](QAbstractButton *button)
211​ {
212​ Q_UNUSED(button);
213​ Options::setErrorHandlingStrategy(getErrorHandlingStrategy());
214​ });
215​ connect(errorHandlingDelaySB, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [this](int value)
216​ {
217​ Options::setErrorHandlingStrategyDelay(value);
218​ });
219​
220​
199 loadProfiles(); 221​ loadProfiles();
200 222​
201 watchJobChanges(true); 223​ watchJobChanges(true);
202} 224​}
203 225​
204QString Scheduler::getCurrentJobName() 226​QString Scheduler::getCurrentJobName()
205{ 227​{
206 return (currentJob != nullptr ? currentJob->getName() : ""); 228​ return (currentJob != nullptr ? currentJob->getName() : "");
Show All 26 Lines232{
233 QComboBox * const comboBoxes[] = 255​ QComboBox * const comboBoxes[] =
234 { 256​ {
235 schedulerProfileCombo 257​ schedulerProfileCombo
236 }; 258​ };
237 259​
238 QButtonGroup * const buttonGroups[] = 260​ QButtonGroup * const buttonGroups[] =
239 { 261​ {
240 stepsButtonGroup, 262​ stepsButtonGroup,
263​ errorHandlingButtonGroup,
241 startupButtonGroup, 264​ startupButtonGroup,
242 constraintButtonGroup, 265​ constraintButtonGroup,
243 completionButtonGroup, 266​ completionButtonGroup,
244 startupProcedureButtonGroup, 267​ startupProcedureButtonGroup,
245 shutdownProcedureGroup 268​ shutdownProcedureGroup
246 }; 269​ };
247 270​
271​ QAbstractButton * const buttons[] =
272​ {
273​ errorHandlingRescheduleErrorsCB
274​ };
275​
248 QSpinBox * const spinBoxes[] = 276​ QSpinBox * const spinBoxes[] =
249 { 277​ {
250 culminationOffset, 278​ culminationOffset,
251 repeatsSpin, 279​ repeatsSpin,
252 prioritySpin 280​ prioritySpin,
281​ errorHandlingDelaySB
253 }; 282​ };
254 283​
255 QDoubleSpinBox * const dspinBoxes[] = 284​ QDoubleSpinBox * const dspinBoxes[] =
256 { 285​ {
257 minMoonSeparation, 286​ minMoonSeparation,
258 minAltitude 287​ minAltitude
259 }; 288​ };
260 289​
Show All 23 Lines291 {
284 { 313​ {
285 setDirty(); 314​ setDirty();
286 }); 315​ });
287 for (auto * const control : buttonGroups) 316​ for (auto * const control : buttonGroups)
288 connect(control, static_cast<void (QButtonGroup::*)(int, bool)>(&QButtonGroup::buttonToggled), this, [this](int, bool) 317​ connect(control, static_cast<void (QButtonGroup::*)(int, bool)>(&QButtonGroup::buttonToggled), this, [this](int, bool)
289 { 318​ {
290 setDirty(); 319​ setDirty();
291 }); 320​ });
321​ for (auto * const control : buttons)
322​ connect(control, static_cast<void (QAbstractButton::*)(bool)>(&QAbstractButton::clicked), this, [this](bool)
323​ {
324​ setDirty();
325​ });
292 for (auto * const control : spinBoxes) 326​ for (auto * const control : spinBoxes)
293 connect(control, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [this]() 327​ connect(control, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [this]()
294 { 328​ {
295 setDirty(); 329​ setDirty();
296 }); 330​ });
297 for (auto * const control : dspinBoxes) 331​ for (auto * const control : dspinBoxes)
298 connect(control, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, [this](double) 332​ connect(control, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, [this](double)
299 { 333​ {
300 setDirty(); 334​ setDirty();
301 }); 335​ });
302 } 336​ }
303 else 337​ else
304 { 338​ {
305 /* Disconnect the relevant signal from each widget. Actually, this method removes all signals from the widgets, 339​ /* Disconnect the relevant signal from each widget. Actually, this method removes all signals from the widgets,
306 * because we did not take care to keep the connection object when connecting. No problem in our case, we do not 340​ * because we did not take care to keep the connection object when connecting. No problem in our case, we do not
307 * expect other signals to be connected. Because we used a lambda, we cannot use the same function object to 341​ * expect other signals to be connected. Because we used a lambda, we cannot use the same function object to
308 * disconnect selectively. 342​ * disconnect selectively.
309 */ 343​ */
310 for (auto * const control : lineEdits) 344​ for (auto * const control : lineEdits)
311 disconnect(control, &QLineEdit::editingFinished, this, nullptr); 345​ disconnect(control, &QLineEdit::editingFinished, this, nullptr);
312 for (auto * const control : dateEdits) 346​ for (auto * const control : dateEdits)
313 disconnect(control, &QDateTimeEdit::editingFinished, this, nullptr); 347​ disconnect(control, &QDateTimeEdit::editingFinished, this, nullptr);
314 for (auto * const control : comboBoxes) 348​ for (auto * const control : comboBoxes)
315 disconnect(control, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, nullptr); 349​ disconnect(control, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, nullptr);
350​ for (auto * const control : buttons)
351​ disconnect(control, static_cast<void (QAbstractButton::*)(bool)>(&QAbstractButton::clicked), this, nullptr);
316 for (auto * const control : buttonGroups) 352​ for (auto * const control : buttonGroups)
317 disconnect(control, static_cast<void (QButtonGroup::*)(int, bool)>(&QButtonGroup::buttonToggled), this, nullptr); 353​ disconnect(control, static_cast<void (QButtonGroup::*)(int, bool)>(&QButtonGroup::buttonToggled), this, nullptr);
318 for (auto * const control : spinBoxes) 354​ for (auto * const control : spinBoxes)
319 disconnect(control, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, nullptr); 355​ disconnect(control, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, nullptr);
320 for (auto * const control : dspinBoxes) 356​ for (auto * const control : dspinBoxes)
321 disconnect(control, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, nullptr); 357​ disconnect(control, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, nullptr);
322 } 358​ }
323 359​
▲ Show 20 Lines • Show All 1063 Lines • ▼ Show 20 Line(s)1414{
1387 if (Options::rememberJobProgress()) 1423​ if (Options::rememberJobProgress())
1388 updateCompletedJobsCount(); 1424​ updateCompletedJobsCount();
1389 1425​
1390 /* Update dawn and dusk astronomical times - unconditionally in case date changed */ 1426​ /* Update dawn and dusk astronomical times - unconditionally in case date changed */
1391 calculateDawnDusk(); 1427​ calculateDawnDusk();
1392 1428​
1393 /* First, filter out non-schedulable jobs */ 1429​ /* First, filter out non-schedulable jobs */
1394 /* FIXME: jobs in state JOB_ERROR should not be in the list, reorder states */ 1430​ /* FIXME: jobs in state JOB_ERROR should not be in the list, reorder states */
1395 QList<SchedulerJob *> sortedJobs = jobs; 1431​ QList<SchedulerJob *> sortedJobs = jobs;
TallFurryManUnsubmitted
Not Done

Here I tend to disagree. We have JOB_INVALID, JOB_ERROR and JOB_ABORTED.
JOB_INVALID indicates a configuration error, and we cannot proceed with the job at all.
JOB_ERROR indicates a fatal error during processing, and we cannot proceed with the job anymore.
JOB_ABORTED indicates a transitory error during processing, and we should retry at some point.
Based on these definitions, we should not re-evaluate JOB_ERROR.
Now, I know that the enums are not properly ordered, but to me JOB_ERROR jobs should still be removed.

TallFurryMan: Here I tend to disagree. We have JOB_INVALID, JOB_ERROR and JOB_ABORTED. JOB_INVALID indicates…
wreissenbergerAuthorUnsubmitted
Not Done

I would agree if JOB_ERROR is only used when an error is non recoverable. But for example what error state should be set if a slew command fails? It is definitely recoverable, since sending the command again solves the problem. The same is true if e.g. we loose network connection.

The problem is, that we do not have a JOB_FATAL state. For those, I absolutely agree, we should not try to restart. That's why I added the option to handle errors like aborts. I am quite sure that there are setups where restarting of errors is dangerous. But with my setting, its absolutely fine.

wreissenberger: I would agree if JOB_ERROR is only used when an error is non recoverable. But for example what…
TallFurryManUnsubmitted
Not Done

I believe the current JOB_ERROR and your example JOB_FATAL are equivalent. If the failures of a slew command leads to JOB_ERROR currently and you think it is recoverable, then we should change the state resulting from such failure to JOB_ABORTED.

TallFurryMan: I believe the current JOB_ERROR and your example JOB_FATAL are equivalent. If the failures of a…
1396 sortedJobs.erase(std::remove_if(sortedJobs.begin(), sortedJobs.end(), [](SchedulerJob * job) ​
1397 { ​
1398 return SchedulerJob::JOB_ABORTED < job->getState(); ​
1399 }), sortedJobs.end()); ​
1400 1432​
1401 /* Then enumerate SchedulerJobs to consolidate imaging time */ 1433​ /* Then enumerate SchedulerJobs to consolidate imaging time */
1402 foreach (SchedulerJob *job, sortedJobs) 1434​ foreach (SchedulerJob *job, sortedJobs)
1403 { 1435​ {
1404 /* Let aborted jobs be rescheduled later instead of forgetting them */ 1436​ /* Let aborted jobs be rescheduled later instead of forgetting them */
1405 switch (job->getState()) 1437​ switch (job->getState())
1406 { 1438​ {
1407 case SchedulerJob::JOB_SCHEDULED: 1439​ case SchedulerJob::JOB_SCHEDULED:
1408 /* If job is scheduled, keep it for evaluation against others */ 1440​ /* If job is scheduled, keep it for evaluation against others */
1409 break; 1441​ break;
1410 1442​
1411 case SchedulerJob::JOB_ERROR: ​
1412 case SchedulerJob::JOB_INVALID: 1443​ case SchedulerJob::JOB_INVALID:
1413 case SchedulerJob::JOB_COMPLETE: 1444​ case SchedulerJob::JOB_COMPLETE:
1414 /* If job is in error, invalid or complete, bypass evaluation */ 1445​ /* If job is invalid or complete, bypass evaluation */
1415 continue; 1446​ continue;
1416 1447​
1417 case SchedulerJob::JOB_BUSY: 1448​ case SchedulerJob::JOB_BUSY:
1418 /* If job is busy, edge case, bypass evaluation */ 1449​ /* If job is busy, edge case, bypass evaluation */
1419 continue; 1450​ continue;
1420 1451​
1452​ case SchedulerJob::JOB_ERROR:
1421 case SchedulerJob::JOB_ABORTED: 1453​ case SchedulerJob::JOB_ABORTED:
1422 /* If job is aborted and we're running, keep its evaluation until there is nothing else to do */ 1454​ /* If job is in error or aborted and we're running, keep its evaluation until there is nothing else to do */
1423 if (state == SCHEDULER_RUNNING) 1455​ if (state == SCHEDULER_RUNNING)
1424 continue; 1456​ continue;
1425 /* Fall through */ 1457​ /* Fall through */
1426 case SchedulerJob::JOB_IDLE: 1458​ case SchedulerJob::JOB_IDLE:
1427 case SchedulerJob::JOB_EVALUATION: 1459​ case SchedulerJob::JOB_EVALUATION:
1428 default: 1460​ default:
1429 /* If job is idle, re-evaluate completely */ 1461​ /* If job is idle, re-evaluate completely */
1430 job->setEstimatedTime(-1); 1462​ job->setEstimatedTime(-1);
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s)
1497 1529​
1498 /* This predicate matches jobs not being evaluated and not aborted */ 1530​ /* This predicate matches jobs not being evaluated and not aborted */
1499 auto neither_evaluated_nor_aborted = [](SchedulerJob const * const job) 1531​ auto neither_evaluated_nor_aborted = [](SchedulerJob const * const job)
1500 { 1532​ {
1501 SchedulerJob::JOBStatus const s = job->getState(); 1533​ SchedulerJob::JOBStatus const s = job->getState();
1502 return SchedulerJob::JOB_EVALUATION != s && SchedulerJob::JOB_ABORTED != s; 1534​ return SchedulerJob::JOB_EVALUATION != s && SchedulerJob::JOB_ABORTED != s;
1503 }; 1535​ };
1504 1536​
1537​ /* This predicate matches jobs neither being evaluated nor aborted nor in error state */
TallFurryManUnsubmitted
Done

OK for this block, interesting feature indeed.

TallFurryMan: OK for this block, interesting feature indeed.
1538​ auto neither_evaluated_nor_aborted_nor_error = [](SchedulerJob const * const job)
1539​ {
1540​ SchedulerJob::JOBStatus const s = job->getState();
1541​ return SchedulerJob::JOB_EVALUATION != s && SchedulerJob::JOB_ABORTED != s && SchedulerJob::JOB_ERROR != s;
1542​ };
1543​
1505 /* This predicate matches jobs that aborted, or completed for whatever reason */ 1544​ /* This predicate matches jobs that aborted, or completed for whatever reason */
1506 auto finished_or_aborted = [](SchedulerJob const * const job) 1545​ auto finished_or_aborted = [](SchedulerJob const * const job)
1507 { 1546​ {
1508 SchedulerJob::JOBStatus const s = job->getState(); 1547​ SchedulerJob::JOBStatus const s = job->getState();
1509 return SchedulerJob::JOB_ERROR <= s || SchedulerJob::JOB_ABORTED == s; 1548​ return SchedulerJob::JOB_ERROR <= s || SchedulerJob::JOB_ABORTED == s;
1510 }; 1549​ };
1511 1550​
1551​ bool nea = std::all_of(sortedJobs.begin(), sortedJobs.end(), neither_evaluated_nor_aborted);
1552​ bool neae = std::all_of(sortedJobs.begin(), sortedJobs.end(), neither_evaluated_nor_aborted_nor_error);
1553​
1512 /* If there are no jobs left to run in the filtered list, stop evaluation */ 1554​ /* If there are no jobs left to run in the filtered list, stop evaluation */
1513 if (sortedJobs.isEmpty() || std::all_of(sortedJobs.begin(), sortedJobs.end(), neither_evaluated_nor_aborted)) 1555​ if (sortedJobs.isEmpty() || (!errorHandlingRescheduleErrorsCB->isChecked() && nea) || (errorHandlingRescheduleErrorsCB->isChecked() && neae))
1514 { 1556​ {
1515 appendLogText(i18n("No jobs left in the scheduler queue.")); 1557​ appendLogText(i18n("No jobs left in the scheduler queue."));
1516 setCurrentJob(nullptr); 1558​ setCurrentJob(nullptr);
1517 jobEvaluationOnly = false; 1559​ jobEvaluationOnly = false;
1518 return; 1560​ return;
1519 } 1561​ }
1520 1562​
1521 /* If there are only aborted jobs that can run, reschedule those */ 1563​ /* If there are only aborted jobs that can run, reschedule those */
1522 if (std::all_of(sortedJobs.begin(), sortedJobs.end(), finished_or_aborted)) 1564​ if (std::all_of(sortedJobs.begin(), sortedJobs.end(), finished_or_aborted) &&
1565​ errorHandlingDontRestartButton->isChecked() == false)
1523 { 1566​ {
1524 appendLogText(i18n("Only aborted jobs left in the scheduler queue, rescheduling those.")); 1567​ appendLogText(i18n("Only %1 jobs left in the scheduler queue, rescheduling those.",
1525 std::for_each(sortedJobs.begin(), sortedJobs.end(), [](SchedulerJob * job) 1568​ errorHandlingRescheduleErrorsCB->isChecked() ? "aborted or error" : "aborted"));
1569​
1570​ // set aborted and error jobs to evaluation state
1571​ for (int index = 0; index < sortedJobs.size(); index++)
1526 { 1572​ {
1527 if (SchedulerJob::JOB_ABORTED == job->getState()) 1573​ SchedulerJob * const job = sortedJobs.at(index);
1574​ if (SchedulerJob::JOB_ABORTED == job->getState() ||
1575​ (errorHandlingRescheduleErrorsCB->isChecked() && SchedulerJob::JOB_ERROR == job->getState()))
1528 job->setState(SchedulerJob::JOB_EVALUATION); 1576​ job->setState(SchedulerJob::JOB_EVALUATION);
1529 }); 1577​ }
1578​
1579​ if (errorHandlingRestartAfterAllButton->isChecked())
TallFurryManUnsubmitted
Not Done

I'm not sure about this block, it really gets in the way of the regular method of scheduling.
It will conflict with the completion time of the aborted jobs.
It will run a parallel conflict with whatever restriction makes the jobs aborted at some point.
It will conflict with the preemptive shutdown option (unless you forbid a larger delay?).
Eventually, forbid a delay larger than the lead time option?

TallFurryMan: I'm not sure about this block, it really gets in the way of the regular method of scheduling.
wreissenbergerAuthorUnsubmitted
Not Done

This section simply extends the old predicate based to a loop so that it can take into account whether the "re-schedule errors" checkbox is selected. I needed to switch to a loop since the checkbox is not static.

wreissenberger: This section simply extends the old predicate based to a loop so that it can take into account…
TallFurryManUnsubmitted
Not Done

OK. I'm still worried about the edge cases I listed.

TallFurryMan: OK. I'm still worried about the edge cases I listed.
1580​ {
1581​ // interrupt regular status checks during the sleep time
1582​ schedulerTimer.stop();
1583​
1584​ // but before we restart them, we wait for the given delay.
1585​ appendLogText(i18n("All jobs aborted. Waiting %1 seconds to re-schedule.", errorHandlingDelaySB->value()));
1586​
1587​ // wait the given delay until the jobs will be evaluated again
1588​ sleepTimer.setInterval(( errorHandlingDelaySB->value() * 1000));
1589​ sleepTimer.start();
1590​ sleepLabel->setToolTip(i18n("Scheduler waits for a retry."));
1591​ sleepLabel->show();
1592​ // we continue to determine which job should be running, when the delay is over
1593​ }
1530 } 1594​ }
1531 1595​
1532 /* If option says so, reorder by altitude and priority before sequencing */ 1596​ /* If option says so, reorder by altitude and priority before sequencing */
1533 /* FIXME: refactor so all sorts are using the same predicates */ 1597​ /* FIXME: refactor so all sorts are using the same predicates */
1534 /* FIXME: use std::stable_sort as qStableSort is deprecated */ 1598​ /* FIXME: use std::stable_sort as qStableSort is deprecated */
1535 /* FIXME: dissociate altitude and priority, it's difficult to choose which predicate to use first */ 1599​ /* FIXME: dissociate altitude and priority, it's difficult to choose which predicate to use first */
1536 qCInfo(KSTARS_EKOS_SCHEDULER) << "Option to sort jobs based on priority and altitude is" << Options::sortSchedulerJobs(); 1600​ qCInfo(KSTARS_EKOS_SCHEDULER) << "Option to sort jobs based on priority and altitude is" << Options::sortSchedulerJobs();
1537 if (Options::sortSchedulerJobs()) 1601​ if (Options::sortSchedulerJobs())
1538 { 1602​ {
TallFurryManUnsubmitted
Not Done

OK, only if scheduling algorithm takes the presence of JOB_ABORTED into account.

TallFurryMan: OK, only if scheduling algorithm takes the presence of JOB_ABORTED into account.
wreissenbergerAuthorUnsubmitted
Not Done

Sorry, don't get the point.

wreissenberger: Sorry, don't get the point.
1539 // If we reorder, remove all non-runnable jobs so that they end up at the end of the list and do not disturb the reorder ​
1540 // We tested that the list could not be empty after that operation above ​
1541 sortedJobs.erase(std::remove_if(sortedJobs.begin(), sortedJobs.end(), neither_evaluated_nor_aborted), sortedJobs.end()); ​
1542 ​
1543 using namespace std::placeholders; 1603​ using namespace std::placeholders;
1544 std::stable_sort(sortedJobs.begin(), sortedJobs.end(), 1604​ std::stable_sort(sortedJobs.begin(), sortedJobs.end(),
1545 std::bind(SchedulerJob::decreasingAltitudeOrder, _1, _2, KStarsData::Instance()->lt())); 1605​ std::bind(SchedulerJob::decreasingAltitudeOrder, _1, _2, KStarsData::Instance()->lt()));
1546 std::stable_sort(sortedJobs.begin(), sortedJobs.end(), SchedulerJob::increasingPriorityOrder); 1606​ std::stable_sort(sortedJobs.begin(), sortedJobs.end(), SchedulerJob::increasingPriorityOrder);
1547 } 1607​ }
1548 1608​
1549 /* The first reordered job has no lead time - this could also be the delay from now to startup */ 1609​ /* The first reordered job has no lead time - this could also be the delay from now to startup */
1550 sortedJobs.first()->setLeadTime(0); 1610​ sortedJobs.first()->setLeadTime(0);
▲ Show 20 Lines • Show All 442 Lines • ▼ Show 20 Line(s)2047#if 0
1993 2053​
1994 if (SchedulerJob::START_CULMINATION == currentJob->getFileStartupCondition() && Options::leadTime() < 5) 2054​ if (SchedulerJob::START_CULMINATION == currentJob->getFileStartupCondition() && Options::leadTime() < 5)
1995 appendLogText(i18n("Job '%1' may require increasing the current lead time of %2 minutes to make transit time calculation stable.", 2055​ appendLogText(i18n("Job '%1' may require increasing the current lead time of %2 minutes to make transit time calculation stable.",
1996 currentJob->getName(), 2056​ currentJob->getName(),
1997 Options::leadTime())); 2057​ Options::leadTime()));
1998#endif 2058​#endif
1999 } 2059​ }
2000 } 2060​ }
2001 2061​
TallFurryManUnsubmitted
Not Done

OK, only if scheduling algorithm takes the presence of JOB_ABORTED into account.

TallFurryMan: OK, only if scheduling algorithm takes the presence of JOB_ABORTED into account.
2002 /* Remove unscheduled jobs that may have appeared during the last step - safeguard */ ​
2003 sortedJobs.erase(std::remove_if(sortedJobs.begin(), sortedJobs.end(), [](SchedulerJob * job) ​
2004 { ​
2005 SchedulerJob::JOBStatus const s = job->getState(); ​
2006 return SchedulerJob::JOB_SCHEDULED != s && SchedulerJob::JOB_ABORTED != s; ​
2007 }), sortedJobs.end()); ​
2008 ​
2009 /* Apply sorting to queue table, and mark it for saving if it changes */ 2062​ /* Apply sorting to queue table, and mark it for saving if it changes */
2010 mDirty = reorderJobs(sortedJobs) | mDirty; 2063​ mDirty = reorderJobs(sortedJobs) | mDirty;
2011 2064​
2012 if (jobEvaluationOnly || state != SCHEDULER_RUNNING) 2065​ if (jobEvaluationOnly || state != SCHEDULER_RUNNING)
2013 { 2066​ {
2014 qCInfo(KSTARS_EKOS_SCHEDULER) << "Ekos finished evaluating jobs, no job selection required."; 2067​ qCInfo(KSTARS_EKOS_SCHEDULER) << "Ekos finished evaluating jobs, no job selection required.";
2015 jobEvaluationOnly = false; 2068​ jobEvaluationOnly = false;
2016 return; 2069​ return;
Show All 15 Lines
2032 if (sortedJobs.isEmpty() || std::all_of(sortedJobs.begin(), sortedJobs.end(), neither_scheduled_nor_aborted)) 2085​ if (sortedJobs.isEmpty() || std::all_of(sortedJobs.begin(), sortedJobs.end(), neither_scheduled_nor_aborted))
2033 { 2086​ {
2034 appendLogText(i18n("No jobs left in the scheduler queue after evaluating.")); 2087​ appendLogText(i18n("No jobs left in the scheduler queue after evaluating."));
2035 setCurrentJob(nullptr); 2088​ setCurrentJob(nullptr);
2036 jobEvaluationOnly = false; 2089​ jobEvaluationOnly = false;
2037 return; 2090​ return;
2038 } 2091​ }
2039 /* If there are only aborted jobs that can run, reschedule those and let Scheduler restart one loop */ 2092​ /* If there are only aborted jobs that can run, reschedule those and let Scheduler restart one loop */
2040 else if (std::all_of(sortedJobs.begin(), sortedJobs.end(), finished_or_aborted)) 2093​ else if (std::all_of(sortedJobs.begin(), sortedJobs.end(), finished_or_aborted) &&
2094​ errorHandlingDontRestartButton->isChecked() == false)
2041 { 2095​ {
2042 appendLogText(i18n("Only aborted jobs left in the scheduler queue after evaluating, rescheduling those.")); 2096​ appendLogText(i18n("Only aborted jobs left in the scheduler queue after evaluating, rescheduling those."));
2043 std::for_each(sortedJobs.begin(), sortedJobs.end(), [](SchedulerJob * job) 2097​ std::for_each(sortedJobs.begin(), sortedJobs.end(), [](SchedulerJob * job)
2044 { 2098​ {
2045 if (SchedulerJob::JOB_ABORTED == job->getState()) 2099​ if (SchedulerJob::JOB_ABORTED == job->getState())
2046 job->setState(SchedulerJob::JOB_EVALUATION); 2100​ job->setState(SchedulerJob::JOB_EVALUATION);
2047 }); 2101​ });
2048 2102​
▲ Show 20 Lines • Show All 1054 Lines • ▼ Show 20 Line(s)3139{
3103 if (currentJob->getCompletionCondition() == SchedulerJob::FINISH_AT && 3157​ if (currentJob->getCompletionCondition() == SchedulerJob::FINISH_AT &&
3104 currentJob->getState() == SchedulerJob::JOB_BUSY) 3158​ currentJob->getState() == SchedulerJob::JOB_BUSY)
3105 { 3159​ {
3106 // If the job reached it COMPLETION time, we stop it. 3160​ // If the job reached it COMPLETION time, we stop it.
3107 if (now.secsTo(currentJob->getCompletionTime()) <= 0) 3161​ if (now.secsTo(currentJob->getCompletionTime()) <= 0)
3108 { 3162​ {
3109 appendLogText(i18n("Job '%1' reached completion time %2, stopping.", currentJob->getName(), 3163​ appendLogText(i18n("Job '%1' reached completion time %2, stopping.", currentJob->getName(),
3110 currentJob->getCompletionTime().toString(currentJob->getDateTimeDisplayFormat()))); 3164​ currentJob->getCompletionTime().toString(currentJob->getDateTimeDisplayFormat())));
3111 currentJob->setState(SchedulerJob::JOB_ABORTED); 3165​ currentJob->setState(SchedulerJob::JOB_COMPLETE);
TallFurryManUnsubmitted
Not Done

This is a behavior change, but well, makes sense now.
Note that currently, the completion date embeds both date and time.
The completion date should be optional, so that multi-day schedules could be more easily programmed (I have a need for this).
The interface is painful when rescheduling START_AT and COMPLETE_AT jobs, but not moving jobs should improve that.

TallFurryMan: This is a behavior change, but well, makes sense now. Note that currently, the completion date…
wreissenbergerAuthorUnsubmitted
Not Done

Oops, multi-day schedules? That's tricky.

wreissenberger: Oops, multi-day schedules? That's tricky.
wreissenbergerAuthorUnsubmitted
Not Done

I'm afraid with multi-day schedules we have a conceptual problem with manually sorted lists. As soon as a job reaches its completion time we need to change the order. Otherwise re-scheduling it to the next day would mean that the following job is also postponed to the next day.
From that perspective, it makes sense shifting aborted jobs behind the scheduled ones. But this behavior conflicts with the option to immediately restarting an aborted job.
Personally, I would opt to resolve multi-day schedules differently - e.g. by an external cron job. Otherwise we would lose the ability to restart aborted jobs immediately - which I see as essential having a robust schedule in nights with clouds.

wreissenberger: I'm afraid with multi-day schedules we have a conceptual problem with manually sorted lists. As…
wreissenbergerAuthorUnsubmitted
Not Done

Please take a look into this discussion: https://indilib.org/forum/general/5423-potential-bug-in-the-scheduler-mount-doesn-t-get-parked-when-guiding-aborted.html

It seems like the current behavior is not very intuitive regarding restarting jobs that hit limiting constraints.

wreissenberger: Please take a look into this discussion: https://indilib.org/forum/general/5423-potential-bug…
TallFurryManUnsubmitted
Not Done

Agreed, there is still work to do. From my tests, the best way to execute multi-day schedules is to automatically order targets per altitude and set targets to capture indefinitely with a high altitude restriction. This needs to be tested with your auto-restart mechanism. If of course someone is willing to spent a few clear nights to let the setup work its schedule on its own :)

TallFurryMan: Agreed, there is still work to do. From my tests, the best way to execute multi-day schedules…
3112 stopCurrentJobAction(); 3166​ stopCurrentJobAction();
3113 stopGuiding(); 3167​ stopGuiding();
3114 findNextJob(); 3168​ findNextJob();
3115 return; 3169​ return;
3116 } 3170​ }
3117 } 3171​ }
3118 3172​
3119 // #2 Check if altitude restriction still holds true 3173​ // #2 Check if altitude restriction still holds true
Show All 9 Lines3182 {
3129 // Only terminate job due to altitude limitation if mount is NOT parked. 3183​ // Only terminate job due to altitude limitation if mount is NOT parked.
3130 if (isMountParked() == false) 3184​ if (isMountParked() == false)
3131 { 3185​ {
3132 appendLogText(i18n("Job '%1' current altitude (%2 degrees) crossed minimum constraint altitude (%3 degrees), " 3186​ appendLogText(i18n("Job '%1' current altitude (%2 degrees) crossed minimum constraint altitude (%3 degrees), "
3133 "marking aborted.", currentJob->getName(), 3187​ "marking aborted.", currentJob->getName(),
3134 QString("%L1").arg(p.alt().Degrees(), 0, 'f', minAltitude->decimals()), 3188​ QString("%L1").arg(p.alt().Degrees(), 0, 'f', minAltitude->decimals()),
3135 QString("%L1").arg(currentJob->getMinAltitude(), 0, 'f', minAltitude->decimals()))); 3189​ QString("%L1").arg(currentJob->getMinAltitude(), 0, 'f', minAltitude->decimals())));
3136 3190​
3137 currentJob->setState(SchedulerJob::JOB_ABORTED); 3191​ currentJob->setState(SchedulerJob::JOB_COMPLETE);
TallFurryManUnsubmitted
Not Done

I disagree: this job must be rescheduled to next observation time, thus JOB_ABORTED.

TallFurryMan: I disagree: this job must be rescheduled to next observation time, thus JOB_ABORTED.
wreissenbergerAuthorUnsubmitted
Not Done

Maybe neither COMPLETE nor ABORTED. What about if we set it to EVALUATION?

wreissenberger: Maybe neither COMPLETE nor ABORTED. What about if we set it to EVALUATION?
wreissenbergerAuthorUnsubmitted
Not Done

I have to correct, EVALUATION does not help - see comment above. If we have the option for immediate restart selected, aborting a job with completion time exceeded leads to the situation, that it is scheduled for the following day and the next job as consequence will be shifted to the next day as well - which is not the desired behavior.

wreissenberger: I have to correct, EVALUATION does not help - see comment above. If we have the option for…
TallFurryManUnsubmitted
Not Done

I think I understand why you changed that: it conflicts with your auto-restart mechanism. What if you set it to complete when auto-restarting, with a warning, and to aborted when not auto-restarting?

TallFurryMan: I think I understand why you changed that: it conflicts with your auto-restart mechanism. What…
3138 stopCurrentJobAction(); 3192​ stopCurrentJobAction();
3139 stopGuiding(); 3193​ stopGuiding();
3140 findNextJob(); 3194​ findNextJob();
3141 return; 3195​ return;
3142 } 3196​ }
3143 } 3197​ }
3144 } 3198​ }
3145 3199​
Show All 9 Lines3202 {
3155 { 3209​ {
3156 // Only terminate job due to moon separation limitation if mount is NOT parked. 3210​ // Only terminate job due to moon separation limitation if mount is NOT parked.
3157 if (isMountParked() == false) 3211​ if (isMountParked() == false)
3158 { 3212​ {
3159 appendLogText(i18n("Job '%2' current moon separation (%1 degrees) is lower than minimum constraint (%3 " 3213​ appendLogText(i18n("Job '%2' current moon separation (%1 degrees) is lower than minimum constraint (%3 "
3160 "degrees), marking aborted.", 3214​ "degrees), marking aborted.",
3161 moonSeparation, currentJob->getName(), currentJob->getMinMoonSeparation())); 3215​ moonSeparation, currentJob->getName(), currentJob->getMinMoonSeparation()));
3162 3216​
3163 currentJob->setState(SchedulerJob::JOB_ABORTED); 3217​ currentJob->setState(SchedulerJob::JOB_COMPLETE);
TallFurryManUnsubmitted
Not Done

I disagree: this job must be rescheduled to next observation time (albeit quite a far one!), thus JOB_ABORTED.

TallFurryMan: I disagree: this job must be rescheduled to next observation time (albeit quite a far one!)…
wreissenbergerAuthorUnsubmitted
Not Done

see above on line 3191.

wreissenberger: see above on line 3191.
TallFurryManUnsubmitted
Not Done

Same as previous comment.

TallFurryMan: Same as previous comment.
3164 stopCurrentJobAction(); 3218​ stopCurrentJobAction();
3165 stopGuiding(); 3219​ stopGuiding();
3166 findNextJob(); 3220​ findNextJob();
3167 return; 3221​ return;
3168 } 3222​ }
3169 } 3223​ }
3170 } 3224​ }
3171 3225​
3172 // #4 Check if we're not at dawn 3226​ // #4 Check if we're not at dawn
3173 if (currentJob->getEnforceTwilight() && now > KStarsDateTime(preDawnDateTime)) 3227​ if (currentJob->getEnforceTwilight() && now > KStarsDateTime(preDawnDateTime))
3174 { 3228​ {
3175 // If either mount or dome are not parked, we shutdown if we approach dawn 3229​ // If either mount or dome are not parked, we shutdown if we approach dawn
3176 if (isMountParked() == false || (parkDomeCheck->isEnabled() && isDomeParked() == false)) 3230​ if (isMountParked() == false || (parkDomeCheck->isEnabled() && isDomeParked() == false))
3177 { 3231​ {
3178 // Minute is a DOUBLE value, do not use i18np 3232​ // Minute is a DOUBLE value, do not use i18np
3179 appendLogText(i18n( 3233​ appendLogText(i18n(
3180 "Job '%3' is now approaching astronomical twilight rise limit at %1 (%2 minutes safety margin), marking aborted.", 3234​ "Job '%3' is now approaching astronomical twilight rise limit at %1 (%2 minutes safety margin), marking aborted.",
3181 preDawnDateTime.toString(), Options::preDawnTime(), currentJob->getName())); 3235​ preDawnDateTime.toString(), Options::preDawnTime(), currentJob->getName()));
3182 currentJob->setState(SchedulerJob::JOB_ABORTED); 3236​ currentJob->setState(SchedulerJob::JOB_COMPLETE);
TallFurryManUnsubmitted
Not Done

I disagree: this job must be rescheduled to the next observation time, thus JOB_ABORTED.

TallFurryMan: I disagree: this job must be rescheduled to the next observation time, thus JOB_ABORTED.
TallFurryManUnsubmitted
Not Done

Same as previous comment.

TallFurryMan: Same as previous comment.
3183 stopCurrentJobAction(); 3237​ stopCurrentJobAction();
3184 stopGuiding(); 3238​ stopGuiding();
3185 findNextJob(); 3239​ findNextJob();
3186 return; 3240​ return;
3187 } 3241​ }
3188 } 3242​ }
3189 3243​
3190 // #5 Check system status to improve robustness 3244​ // #5 Check system status to improve robustness
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s)3286 {
3237 { 3291​ {
3238 if (captureFailureCount++ < MAX_FAILURE_ATTEMPTS) 3292​ if (captureFailureCount++ < MAX_FAILURE_ATTEMPTS)
3239 { 3293​ {
3240 qCDebug(KSTARS_EKOS_SCHEDULER) << "capture module timed out. Restarting request..."; 3294​ qCDebug(KSTARS_EKOS_SCHEDULER) << "capture module timed out. Restarting request...";
3241 startCapture(); 3295​ startCapture();
3242 } 3296​ }
3243 else 3297​ else
3244 { 3298​ {
3245 appendLogText(i18n("Warning: job '%1' capture procedure failed, aborting job.", currentJob->getName())); 3299​ appendLogText(i18n("Warning: job '%1' capture procedure failed, aborting job.", currentJob->getName()));
TallFurryManUnsubmitted
Not Done

Just a warning not about translations. If you change this, translators need to change stuff, perhaps needlessly.

TallFurryMan: Just a warning not about translations. If you change this, translators need to change stuff…
3246 currentJob->setState(SchedulerJob::JOB_ABORTED); 3300​ currentJob->setState(SchedulerJob::JOB_ABORTED);
3247 findNextJob(); 3301​ findNextJob();
3248 } 3302​ }
3249 } 3303​ }
3250 else currentOperationTime.restart(); 3304​ else currentOperationTime.restart();
3251 } 3305​ }
3252 break; 3306​ break;
3253 3307​
▲ Show 20 Lines • Show All 573 Lines • ▼ Show 20 Line(s)3861{
3827 3881​
3828 qDeleteAll(jobs); 3882​ qDeleteAll(jobs);
3829 jobs.clear(); 3883​ jobs.clear();
3830 3884​
3831 LilXML *xmlParser = newLilXML(); 3885​ LilXML *xmlParser = newLilXML();
3832 char errmsg[MAXRBUF]; 3886​ char errmsg[MAXRBUF];
3833 XMLEle *root = nullptr; 3887​ XMLEle *root = nullptr;
3834 XMLEle *ep = nullptr; 3888​ XMLEle *ep = nullptr;
3889​ XMLEle *subEP = nullptr;
3835 char c; 3890​ char c;
3836 3891​
3892​ // We expect all data read from the XML to be in the C locale - QLocale::c()
TallFurryManUnsubmitted
Done

OK! I thought this was already in.

TallFurryMan: OK! I thought this was already in.
3893​ QLocale cLocale = QLocale::c();
3894​
3837 while (sFile.getChar(&c)) 3895​ while (sFile.getChar(&c))
3838 { 3896​ {
3839 root = readXMLEle(xmlParser, c, errmsg); 3897​ root = readXMLEle(xmlParser, c, errmsg);
3840 3898​
3841 if (root) 3899​ if (root)
3842 { 3900​ {
3843 for (ep = nextXMLEle(root, 1); ep != nullptr; ep = nextXMLEle(root, 0)) 3901​ for (ep = nextXMLEle(root, 1); ep != nullptr; ep = nextXMLEle(root, 0))
3844 { 3902​ {
3845 const char *tag = tagXMLEle(ep); 3903​ const char *tag = tagXMLEle(ep);
3846 if (!strcmp(tag, "Job")) 3904​ if (!strcmp(tag, "Job"))
3847 processJobInfo(ep); 3905​ processJobInfo(ep);
3848 else if (!strcmp(tag, "Profile")) 3906​ else if (!strcmp(tag, "Profile"))
3849 { 3907​ {
3850 schedulerProfileCombo->setCurrentText(pcdataXMLEle(ep)); 3908​ schedulerProfileCombo->setCurrentText(pcdataXMLEle(ep));
3851 } 3909​ }
3910​ else if (!strcmp(tag, "ErrorHandlingStrategy"))
TallFurryManUnsubmitted
Done

OK.

TallFurryMan: OK.
3911​ {
3912​ setErrorHandlingStrategy(static_cast<ErrorHandlingStrategy>(cLocale.toInt(findXMLAttValu(ep, "value"))));
TallFurryManUnsubmitted
Done

Enum-to-int conversions are dangerous, we should review this method at some point...

TallFurryMan: Enum-to-int conversions are dangerous, we should review this method at some point...
wreissenbergerAuthorUnsubmitted
Not Done

Agreed.

wreissenberger: Agreed.
3913​
3914​ subEP = findXMLEle(ep, "delay");
3915​ if (subEP)
3916​ {
3917​ errorHandlingDelaySB->setValue(cLocale.toInt(pcdataXMLEle(subEP)));
3918​ }
3919​ subEP = findXMLEle(ep, "RescheduleErrors");
3920​ if (subEP)
3921​ {
3922​ errorHandlingRescheduleErrorsCB->setChecked(!strcmp(findXMLAttValu(subEP, "enabled"), "true"));
TallFurryManUnsubmitted
Done

The default value "true" is a bit lost in the code here, can we do better?
Line 3942 for instance, startup procedure block, has the boolean flag present or not in the "StartupProcedure" element.
The default is clear at lines 3929. Wouldn't that be better for maintenance?

TallFurryMan: The default value "true" is a bit lost in the code here, can we do better? Line 3942 for…
wreissenbergerAuthorUnsubmitted
Not Done

Good point, changed.

wreissenberger: Good point, changed.
3923​ }
3924​ }
3852 else if (!strcmp(tag, "StartupProcedure")) 3925​ else if (!strcmp(tag, "StartupProcedure"))
3853 { 3926​ {
3854 XMLEle *procedure; 3927​ XMLEle *procedure;
3855 startupScript->clear(); 3928​ startupScript->clear();
3856 unparkDomeCheck->setChecked(false); 3929​ unparkDomeCheck->setChecked(false);
3857 unparkMountCheck->setChecked(false); 3930​ unparkMountCheck->setChecked(false);
3858 uncapCheck->setChecked(false); 3931​ uncapCheck->setChecked(false);
3859 3932​
▲ Show 20 Lines • Show All 334 Lines • ▼ Show 20 Line(s)4266 if (job->getStepPipeline() & SchedulerJob::USE_ALIGN)
4194 outstream << "<Step>Align</Step>" << endl; 4267​ outstream << "<Step>Align</Step>" << endl;
4195 if (job->getStepPipeline() & SchedulerJob::USE_GUIDE) 4268​ if (job->getStepPipeline() & SchedulerJob::USE_GUIDE)
4196 outstream << "<Step>Guide</Step>" << endl; 4269​ outstream << "<Step>Guide</Step>" << endl;
4197 outstream << "</Steps>" << endl; 4270​ outstream << "</Steps>" << endl;
4198 4271​
4199 outstream << "</Job>" << endl; 4272​ outstream << "</Job>" << endl;
4200 } 4273​ }
4201 4274​
4275​ outstream << "<ErrorHandlingStrategy value='" << getErrorHandlingStrategy() << "'>" << endl;
4276​ outstream << "<RescheduleErrors enabled='" << QVariant(errorHandlingRescheduleErrorsCB->isChecked()).toString() << "' />" << endl;
4277​ outstream << "<delay>" << errorHandlingDelaySB->value() << "</delay>" << endl;
4278​ outstream << "</ErrorHandlingStrategy>" << endl;
4279​
4202 outstream << "<StartupProcedure>" << endl; 4280​ outstream << "<StartupProcedure>" << endl;
4203 if (startupScript->text().isEmpty() == false) 4281​ if (startupScript->text().isEmpty() == false)
4204 outstream << "<Procedure value='" << startupScript->text() << "'>StartupScript</Procedure>" << endl; 4282​ outstream << "<Procedure value='" << startupScript->text() << "'>StartupScript</Procedure>" << endl;
4205 if (unparkDomeCheck->isChecked()) 4283​ if (unparkDomeCheck->isChecked())
4206 outstream << "<Procedure>UnparkDome</Procedure>" << endl; 4284​ outstream << "<Procedure>UnparkDome</Procedure>" << endl;
4207 if (unparkMountCheck->isChecked()) 4285​ if (unparkMountCheck->isChecked())
4208 outstream << "<Procedure>UnparkMount</Procedure>" << endl; 4286​ outstream << "<Procedure>UnparkMount</Procedure>" << endl;
4209 if (uncapCheck->isChecked()) 4287​ if (uncapCheck->isChecked())
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Line(s)4438{
4373 jobTimer.stop(); 4451​ jobTimer.stop();
4374 4452​
4375 // Reset failed count 4453​ // Reset failed count
4376 alignFailureCount = guideFailureCount = focusFailureCount = captureFailureCount = 0; 4454​ alignFailureCount = guideFailureCount = focusFailureCount = captureFailureCount = 0;
4377 4455​
4378 /* FIXME: Other debug logs in that function probably */ 4456​ /* FIXME: Other debug logs in that function probably */
4379 qCDebug(KSTARS_EKOS_SCHEDULER) << "Find next job..."; 4457​ qCDebug(KSTARS_EKOS_SCHEDULER) << "Find next job...";
4380 4458​
4381 if (currentJob->getState() == SchedulerJob::JOB_ERROR) 4459​ if (currentJob->getState() == SchedulerJob::JOB_ERROR || currentJob->getState() == SchedulerJob::JOB_ABORTED)
TallFurryManUnsubmitted
Not Done

As mentioned earlier, JOB_ERROR jobs should be left cancelled per definition.

TallFurryMan: As mentioned earlier, JOB_ERROR jobs should be left cancelled per definition.
TallFurryManUnsubmitted
Not Done

Still stands.

TallFurryMan: Still stands.
4382 { 4460​ {
4383 captureBatch = 0; 4461​ captureBatch = 0;
4384 // Stop Guiding if it was used 4462​ // Stop Guiding if it was used
4385 stopGuiding(); 4463​ stopGuiding();
4386 4464​
4465​ if (currentJob->getState() == SchedulerJob::JOB_ERROR)
4387 appendLogText(i18n("Job '%1' is terminated due to errors.", currentJob->getName())); 4466​ appendLogText(i18n("Job '%1' is terminated due to errors.", currentJob->getName()));
4467​ else
4468​ appendLogText(i18n("Job '%1' is aborted.", currentJob->getName()));
4388 4469​
4389 // Always reset job stage 4470​ // Always reset job stage
4390 currentJob->setStage(SchedulerJob::STAGE_IDLE); 4471​ currentJob->setStage(SchedulerJob::STAGE_IDLE);
4391 4472​
4392 setCurrentJob(nullptr); 4473​ // restart aborted jobs immediately, if error handling strategy is set to "restart immediately"
4393 schedulerTimer.start(); 4474​ if (errorHandlingRestartImmediatelyButton->isChecked() &&
4394 } 4475​ (currentJob->getState() == SchedulerJob::JOB_ABORTED ||
4395 else if (currentJob->getState() == SchedulerJob::JOB_ABORTED) 4476​ (currentJob->getState() == SchedulerJob::JOB_ERROR && errorHandlingRescheduleErrorsCB->isChecked())))
4396 { 4477​ {
4397 // Stop Guiding if it was used 4478​ // reset the state so that it will be restarted
4398 stopGuiding(); 4479​ currentJob->setState(SchedulerJob::JOB_SCHEDULED);
4399 4480​
4400 appendLogText(i18n("Job '%1' is aborted.", currentJob->getName())); 4481​ appendLogText(i18n("Waiting %1 seconds to restart job '%2'.", errorHandlingDelaySB->value(), currentJob->getName()));
TallFurryManUnsubmitted
Not Done

Same issue as described earlier.

TallFurryMan: Same issue as described earlier.
4401 4482​
4402 // Always reset job stage 4483​ // wait the given delay until the jobs will be evaluated again
4403 currentJob->setStage(SchedulerJob::STAGE_IDLE); 4484​ sleepTimer.setInterval(( errorHandlingDelaySB->value() * 1000));
4485​ sleepTimer.start();
4486​ sleepLabel->setToolTip(i18n("Scheduler waits for a retry."));
4487​ sleepLabel->show();
4488​ return;
4489​ }
4404 4490​
4405 setCurrentJob(nullptr); 4491​ // otherwise start re-evaluation
TallFurryManUnsubmitted
Done

Comment on the reason of the setCurrentJob move?

TallFurryMan: Comment on the reason of the setCurrentJob move?
wreissenbergerAuthorUnsubmitted
Not Done

There's no reason for - reverting it.

wreissenberger: There's no reason for - reverting it.
4406 schedulerTimer.start(); 4492​ schedulerTimer.start();
4493​ setCurrentJob(nullptr);
4407 } 4494​ }
4408 // Job is complete, so check completion criteria to optimize processing 4495​ // Job is complete, so check completion criteria to optimize processing
4409 // In any case, we're done whether the job completed successfully or not. 4496​ // In any case, we're done whether the job completed successfully or not.
4410 else if (currentJob->getCompletionCondition() == SchedulerJob::FINISH_SEQUENCE) 4497​ else if (currentJob->getCompletionCondition() == SchedulerJob::FINISH_SEQUENCE)
4411 { 4498​ {
4412 /* If we remember job progress, mark the job idle as well as all its duplicates for re-evaluation */ 4499​ /* If we remember job progress, mark the job idle as well as all its duplicates for re-evaluation */
4413 if (Options::rememberJobProgress()) 4500​ if (Options::rememberJobProgress())
4414 { 4501​ {
▲ Show 20 Lines • Show All 1390 Lines • ▼ Show 20 Line(s)5891 {
5805 for (SchedulerJob * job : jobs) 5892​ for (SchedulerJob * job : jobs)
5806 job->reset(); 5893​ job->reset();
5807 5894​
5808 jobEvaluationOnly = true; 5895​ jobEvaluationOnly = true;
5809 evaluateJobs(); 5896​ evaluateJobs();
5810 } 5897​ }
5811} 5898​}
5812 5899​
5900​
5813void Scheduler::updatePreDawn() 5901​void Scheduler::updatePreDawn()
5814{ 5902​{
5815 double earlyDawn = Dawn - Options::preDawnTime() / (60.0 * 24.0); 5903​ double earlyDawn = Dawn - Options::preDawnTime() / (60.0 * 24.0);
5816 int dayOffset = 0; 5904​ int dayOffset = 0;
5817 QTime dawn = QTime(0, 0, 0).addSecs(Dawn * 24 * 3600); 5905​ QTime dawn = QTime(0, 0, 0).addSecs(Dawn * 24 * 3600);
5818 if (KStarsData::Instance()->lt().time() >= dawn) 5906​ if (KStarsData::Instance()->lt().time() >= dawn)
5819 dayOffset = 1; 5907​ dayOffset = 1;
5820 preDawnDateTime.setDate(KStarsData::Instance()->lt().date().addDays(dayOffset)); 5908​ preDawnDateTime.setDate(KStarsData::Instance()->lt().date().addDays(dayOffset));
Show All 32 Lines
5853} 5941​}
5854 5942​
5855void Scheduler::resumeCheckStatus() 5943​void Scheduler::resumeCheckStatus()
5856{ 5944​{
5857 disconnect(this, &Scheduler::weatherChanged, this, &Scheduler::resumeCheckStatus); 5945​ disconnect(this, &Scheduler::weatherChanged, this, &Scheduler::resumeCheckStatus);
5858 schedulerTimer.start(); 5946​ schedulerTimer.start();
5859} 5947​}
5860 5948​
5949​Scheduler::ErrorHandlingStrategy Scheduler::getErrorHandlingStrategy()
TallFurryManUnsubmitted
Done

OK

TallFurryMan: OK
5950​{
5951​ // The UI holds the state
5952​ if (errorHandlingRestartAfterAllButton->isChecked())
5953​ return ERROR_RESTART_AFTER_TERMINATION;
5954​ else if (errorHandlingRestartImmediatelyButton->isChecked())
5955​ return ERROR_RESTART_IMMEDIATELY;
5956​ else
5957​ return ERROR_DONT_RESTART;
5958​
5959​}
5960​
5961​void Scheduler::setErrorHandlingStrategy(Scheduler::ErrorHandlingStrategy strategy)
5962​{
5963​ errorHandlingWaitLabel->setEnabled(strategy != ERROR_DONT_RESTART);
5964​ errorHandlingDelaySB->setEnabled(strategy != ERROR_DONT_RESTART);
5965​
5966​ switch (strategy) {
5967​ case ERROR_RESTART_AFTER_TERMINATION:
5968​ errorHandlingRestartAfterAllButton->setChecked(true);
5969​ break;
5970​ case ERROR_RESTART_IMMEDIATELY:
5971​ errorHandlingRestartImmediatelyButton->setChecked(true);
5972​ break;
5973​ default:
5974​ errorHandlingDontRestartButton->setChecked(true);
5975​ break;
5976​ }
5977​}
5978​
5979​
5980​
5861void Scheduler::startMosaicTool() 5981​void Scheduler::startMosaicTool()
5862{ 5982​{
5863 bool raOk = false, decOk = false; 5983​ bool raOk = false, decOk = false;
5864 dms ra(raBox->createDms(false, &raOk)); //false means expressed in hours 5984​ dms ra(raBox->createDms(false, &raOk)); //false means expressed in hours
5865 dms dec(decBox->createDms(true, &decOk)); 5985​ dms dec(decBox->createDms(true, &decOk));
5866 5986​
5867 if (raOk == false) 5987​ if (raOk == false)
5868 { 5988​ {
▲ Show 20 Lines • Show All 846 Lines • ▼ Show 20 Line(s)6823 {
6715 { 6835​ {
6716 appendLogText(i18n("Job '%1' is guiding, guiding procedure will be restarted in %2 seconds.", currentJob->getName(), (RESTART_GUIDING_DELAY_MS * guideFailureCount) / 1000)); 6836​ appendLogText(i18n("Job '%1' is guiding, guiding procedure will be restarted in %2 seconds.", currentJob->getName(), (RESTART_GUIDING_DELAY_MS * guideFailureCount) / 1000));
6717 restartGuidingTimer.start(RESTART_GUIDING_DELAY_MS * guideFailureCount); 6837​ restartGuidingTimer.start(RESTART_GUIDING_DELAY_MS * guideFailureCount);
6718 } 6838​ }
6719 } 6839​ }
6720 else 6840​ else
6721 { 6841​ {
6722 appendLogText(i18n("Warning: job '%1' guiding procedure failed, marking terminated due to errors.", currentJob->getName())); 6842​ appendLogText(i18n("Warning: job '%1' guiding procedure failed, marking terminated due to errors.", currentJob->getName()));
6723 currentJob->setState(SchedulerJob::JOB_ERROR); 6843​ currentJob->setState(SchedulerJob::JOB_ABORTED);
TallFurryManUnsubmitted
Done

OK! But change the log.

TallFurryMan: OK! But change the log.
6724 6844​
6725 findNextJob(); 6845​ findNextJob();
6726 } 6846​ }
6727 } 6847​ }
6728 } 6848​ }
6729} 6849​}
6730 6850​
6731GuideState Scheduler::getGuidingStatus() 6851​GuideState Scheduler::getGuidingStatus()
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Line(s)6970 {
6852 // Reset frame to original size. 6972​ // Reset frame to original size.
6853 focusInterface->call(QDBus::AutoDetect, "resetFrame"); 6973​ focusInterface->call(QDBus::AutoDetect, "resetFrame");
6854 // Restart focusing 6974​ // Restart focusing
6855 startFocusing(); 6975​ startFocusing();
6856 } 6976​ }
6857 else 6977​ else
6858 { 6978​ {
6859 appendLogText(i18n("Warning: job '%1' focusing procedure failed, marking terminated due to errors.", currentJob->getName())); 6979​ appendLogText(i18n("Warning: job '%1' focusing procedure failed, marking terminated due to errors.", currentJob->getName()));
6860 currentJob->setState(SchedulerJob::JOB_ERROR); 6980​ currentJob->setState(SchedulerJob::JOB_ABORTED);
TallFurryManUnsubmitted
Done

OK! But change the log.

TallFurryMan: OK! But change the log.
6861 6981​
6862 findNextJob(); 6982​ findNextJob();
6863 } 6983​ }
6864 } 6984​ }
6865 } 6985​ }
6866} 6986​}
6867 6987​
6868void Scheduler::setMountStatus(ISD::Telescope::Status status) 6988​void Scheduler::setMountStatus(ISD::Telescope::Status status)
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines