Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285 Former-commit-id:cd7934e12f
[formerly542ba7e504
] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerlyc4bed432da
]] [formerlycd7934e12f
[formerly542ba7e504
] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerlyc4bed432da
]] [formerly49f6c31256
[formerlyc4bed432da
[formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]] Former-commit-id:49f6c31256
Former-commit-id:e15d2f50f9
[formerly3b9f80d03e
] [formerly de3f95e5f61e7ea15849603d3138b155fe401280 [formerly445b55f796
]] Former-commit-id: 1b4853e591b02029ef646ca2512a6fb8faddce26 [formerlyc545368839
] Former-commit-id:c4e70210fd
This commit is contained in:
parent
e2baae15ac
commit
15edb8e522
1 changed files with 45 additions and 35 deletions
|
@ -126,6 +126,7 @@ import com.raytheon.uf.edex.datadelivery.util.DataDeliveryIdUtil;
|
|||
* because of efficiency.
|
||||
* Feb 11, 2014 2771 bgonzale Use Data Delivery ID instead of Site.
|
||||
* Feb 10, 2014 2636 mpduff Pass Network map to be scheduled.
|
||||
* Feb 21, 2014, 2636 dhladky Try catch to keep MaintTask from dying.
|
||||
* </pre>
|
||||
*
|
||||
* @author djohnson
|
||||
|
@ -837,44 +838,53 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
|
|||
private class MaintenanceTask implements Runnable {
|
||||
@Override
|
||||
public void run() {
|
||||
IPerformanceTimer timer = TimeUtil.getPerformanceTimer();
|
||||
timer.start();
|
||||
statusHandler.info("MaintenanceTask starting...");
|
||||
|
||||
for (RetrievalPlan plan : retrievalManager.getRetrievalPlans()
|
||||
.values()) {
|
||||
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
|
||||
statusHandler.info("MaintenanceTask: " + plan.getNetwork());
|
||||
statusHandler.info("MaintenanceTask: planStart: "
|
||||
+ plan.getPlanStart().getTime());
|
||||
statusHandler.info("MaintenanceTask: planEnd: "
|
||||
+ plan.getPlanEnd().getTime());
|
||||
}
|
||||
plan.resize();
|
||||
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
|
||||
statusHandler.info("MaintenanceTask: resized planStart: "
|
||||
+ plan.getPlanStart().getTime());
|
||||
statusHandler.info("MaintenanceTask: resized planEnd: "
|
||||
+ plan.getPlanEnd().getTime());
|
||||
statusHandler.info("MaintenanceTask: Update schedule");
|
||||
}
|
||||
// Find DEFERRED Allocations and load them into the plan...
|
||||
List<BandwidthAllocation> deferred = bandwidthDao.getDeferred(
|
||||
plan.getNetwork(), plan.getPlanEnd());
|
||||
if (!deferred.isEmpty()) {
|
||||
retrievalManager.schedule(deferred);
|
||||
}
|
||||
}
|
||||
try {
|
||||
|
||||
int numSubsProcessed = 0;
|
||||
for (RetrievalPlan plan : retrievalManager.getRetrievalPlans()
|
||||
.values()) {
|
||||
numSubsProcessed += updateSchedule(plan.getNetwork());
|
||||
IPerformanceTimer timer = TimeUtil.getPerformanceTimer();
|
||||
timer.start();
|
||||
statusHandler.info("MaintenanceTask starting...");
|
||||
|
||||
for (RetrievalPlan plan : retrievalManager.getRetrievalPlans()
|
||||
.values()) {
|
||||
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
|
||||
statusHandler.info("MaintenanceTask: "
|
||||
+ plan.getNetwork());
|
||||
statusHandler.info("MaintenanceTask: planStart: "
|
||||
+ plan.getPlanStart().getTime());
|
||||
statusHandler.info("MaintenanceTask: planEnd: "
|
||||
+ plan.getPlanEnd().getTime());
|
||||
}
|
||||
plan.resize();
|
||||
if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
|
||||
statusHandler
|
||||
.info("MaintenanceTask: resized planStart: "
|
||||
+ plan.getPlanStart().getTime());
|
||||
statusHandler.info("MaintenanceTask: resized planEnd: "
|
||||
+ plan.getPlanEnd().getTime());
|
||||
statusHandler.info("MaintenanceTask: Update schedule");
|
||||
}
|
||||
// Find DEFERRED Allocations and load them into the plan...
|
||||
List<BandwidthAllocation> deferred = bandwidthDao
|
||||
.getDeferred(plan.getNetwork(), plan.getPlanEnd());
|
||||
if (!deferred.isEmpty()) {
|
||||
retrievalManager.schedule(deferred);
|
||||
}
|
||||
}
|
||||
|
||||
int numSubsProcessed = 0;
|
||||
for (RetrievalPlan plan : retrievalManager.getRetrievalPlans()
|
||||
.values()) {
|
||||
numSubsProcessed += updateSchedule(plan.getNetwork());
|
||||
}
|
||||
timer.stop();
|
||||
statusHandler.info("MaintenanceTask complete: "
|
||||
+ timer.getElapsed() + " - " + numSubsProcessed
|
||||
+ " Subscriptions processed.");
|
||||
|
||||
} catch (Throwable t) {
|
||||
statusHandler.error("MaintenanceTask: Subscription update scheduling has failed", t);
|
||||
}
|
||||
timer.stop();
|
||||
statusHandler.info("MaintenanceTask complete: "
|
||||
+ timer.getElapsed() + " - " + numSubsProcessed
|
||||
+ " Subscriptions processed.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue