Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
48617b87
Commit
48617b87
authored
8 years ago
by
Eric Cano
Browse files
Options
Downloads
Patches
Plain Diff
cta/CTA#69: fixed failure to commit the archive queue...
...when it only contains orphaned references.
parent
4385847e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scheduler/OStoreDB/OStoreDB.cpp
+3
-0
3 additions, 0 deletions
scheduler/OStoreDB/OStoreDB.cpp
with
3 additions
and
0 deletions
scheduler/OStoreDB/OStoreDB.cpp
+
3
−
0
View file @
48617b87
...
...
@@ -1534,6 +1534,7 @@ auto OStoreDB::ArchiveMount::getNextJob(log::LogContext &logContext) -> std::uni
// Pop jobs until we find one actually belonging to the queue.
// Any job not really belonging is an uncommitted pop, which we will
// re-do here.
bool
aqUpdated
=
false
;
while
(
aq
.
dumpJobs
().
size
())
{
// First take a lock on and download the job
// If the request is not around anymore, we will just move the the next
...
...
@@ -1554,6 +1555,7 @@ auto OStoreDB::ArchiveMount::getNextJob(log::LogContext &logContext) -> std::uni
.
add
(
"queueObject"
,
aq
.
getAddressIfSet
())
.
add
(
"jobObject"
,
privateRet
->
m_archiveRequest
.
getAddressIfSet
());
logContext
.
log
(
log
::
INFO
,
"In ArchiveMount::getNextJob(): skipped orphaned job from the queue."
);
aqUpdated
=
true
;
continue
;
}
}
catch
(
cta
::
exception
::
Exception
&
)
{
...
...
@@ -1594,6 +1596,7 @@ auto OStoreDB::ArchiveMount::getNextJob(log::LogContext &logContext) -> std::uni
logContext
.
log
(
log
::
INFO
,
"In ArchiveMount::getNextJob(): popped job from queue"
);
return
std
::
unique_ptr
<
SchedulerDatabase
::
ArchiveJob
>
(
privateRet
.
release
());
}
if
(
aqUpdated
)
aq
.
commit
();
// If we get here, we exhausted the queue. We can now remove it.
// removeArchiveQueueAndCommit is safe, as it checks whether the queue is empty
// before deleting it. It will throw an exception in such a case (allowing us to
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment