Commit 9725b53d authored by Michael Hanselmann's avatar Michael Hanselmann

Add locking doc to Ganeti documentation

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarLuca Bigliardi <shammash@google.com>
parent 667161b4
......@@ -136,6 +136,7 @@ docrst = \
doc/iallocator.rst \
doc/index.rst \
doc/install.rst \
doc/locking.rst \
doc/rapi.rst \
doc/security.rst
......@@ -202,7 +203,6 @@ EXTRA_DIST = \
doc/examples/dumb-allocator \
doc/examples/hooks/ethers \
doc/examples/hooks/ipsec.in \
doc/locking.txt \
test/testutils.py \
test/mocks.py \
$(dist_TESTS) \
......
......@@ -692,7 +692,7 @@ Locking in the job queue is a complicated topic. It is called from more than
one thread and must be thread-safe. For simplicity, a single lock is used for
the whole job queue.
A more detailed description can be found in doc/locking.txt.
A more detailed description can be found in doc/locking.rst.
Internal RPC
......
......@@ -14,6 +14,7 @@ Contents:
security.rst
design-2.0.rst
design-2.1.rst
locking.rst
hooks.rst
iallocator.rst
rapi.rst
......
......@@ -19,10 +19,10 @@ the Processor (in mcpu.py) with the aid of the Ganeti Locking Library
acquire it in a shared fashion, and are able to execute all toghether
(baring other lock waits) while old LUs acquire it exclusively and can only
execute one at a time, and not at the same time with new LUs.
* Instance locks: can be declared in ExpandNames() o DeclareLocks() by an LU,
* Instance locks: can be declared in ExpandNames() or DeclareLocks() by an LU,
and have the same name as the instance itself. They are acquired as a set.
Internally the locking library acquired them in alphabetical order.
* Node locks: can be declared in ExpandNames() o DeclareLocks() by an LU, and
* Node locks: can be declared in ExpandNames() or DeclareLocks() by an LU, and
have the same name as the node itself. They are acquired as a set.
Internally the locking library acquired them in alphabetical order. Given
this order it's possible to safely acquire a set of instances, and then the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment