Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
snf-ganeti
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
itminedu
snf-ganeti
Commits
cc2bea8b
Commit
cc2bea8b
authored
16 years ago
by
Michael Hanselmann
Browse files
Options
Downloads
Patches
Plain Diff
ganeti-masterd: Remove unused locking code
Reviewed-by: iustinp, ultrotter
parent
96cb3986
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemons/ganeti-masterd
+14
-21
14 additions, 21 deletions
daemons/ganeti-masterd
with
14 additions
and
21 deletions
daemons/ganeti-masterd
+
14
−
21
View file @
cc2bea8b
...
...
@@ -288,28 +288,21 @@ def PoolWorker(worker_id, incoming_queue, context):
if
item
is
None
:
break
logging
.
debug
(
"
worker %s processing job %s
"
,
worker_id
,
item
.
data
.
job_id
)
#utils.Lock('cmd'
)
proc
=
mcpu
.
Processor
(
context
,
feedback
=
lambda
x
:
None
)
try
:
proc
=
mcpu
.
Processor
(
context
,
feedback
=
lambda
x
:
None
)
try
:
JobRunner
(
proc
,
item
,
context
)
except
errors
.
GenericError
,
err
:
msg
=
"
ganeti exception
"
logging
.
error
(
msg
,
exc_info
=
err
)
item
.
SetStatus
(
opcodes
.
Job
.
STATUS_FAIL
,
result
=
[
msg
])
except
Exception
,
err
:
msg
=
"
unhandled exception
"
logging
.
error
(
msg
,
exc_info
=
err
)
item
.
SetStatus
(
opcodes
.
Job
.
STATUS_FAIL
,
result
=
[
msg
])
except
:
msg
=
"
unhandled unknown exception
"
logging
.
error
(
msg
,
exc_info
=
True
)
item
.
SetStatus
(
opcodes
.
Job
.
STATUS_FAIL
,
result
=
[
msg
])
finally
:
#utils.Unlock('cmd')
#utils.LockCleanup()
pass
JobRunner
(
proc
,
item
,
context
)
except
errors
.
GenericError
,
err
:
msg
=
"
ganeti exception
"
logging
.
error
(
msg
,
exc_info
=
err
)
item
.
SetStatus
(
opcodes
.
Job
.
STATUS_FAIL
,
result
=
[
msg
])
except
Exception
,
err
:
msg
=
"
unhandled exception
"
logging
.
error
(
msg
,
exc_info
=
err
)
item
.
SetStatus
(
opcodes
.
Job
.
STATUS_FAIL
,
result
=
[
msg
])
except
:
msg
=
"
unhandled unknown exception
"
logging
.
error
(
msg
,
exc_info
=
True
)
item
.
SetStatus
(
opcodes
.
Job
.
STATUS_FAIL
,
result
=
[
msg
])
logging
.
debug
(
"
worker %s finish job %s
"
,
worker_id
,
item
.
data
.
job_id
)
logging
.
debug
(
"
worker %s exiting
"
,
worker_id
)
...
...
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