Statistics
| Branch: | Tag: | Revision:

root / lib @ 3d914585

# Date Author Comment
3d914585 10/12/2010 01:57 pm René Nussbaumer

Add prealloc_wipe_disks as a cluster-wide configuration variable

This is the first step for the support of wiping block devices prior
to creation of the instance.

Signed-off-by: René Nussbaumer <>
Reviewed-by: Iustin Pop <>

69750d44 10/11/2010 04:16 pm Iustin Pop

Merge branch 'devel-2.2'

  • devel-2.2:
    RPC: disable curl's Expect header

Conflicts:
lib/rpc.py (trivial, copyright header)

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

8e29563f 10/11/2010 04:15 pm Iustin Pop

RPC: disable curl's Expect header

This patch solves the very slow (~8-9 seconds) gnt-instance modify
behaviour. Well, it solves in general the slow RPC behaviour, but it was
most visible in that LU.

It seems that curl's behaviour with regard to file uploads (via PUT) and...

86b16e9d 10/07/2010 06:10 pm Michael Hanselmann

jqueue, CancelJob: Check status only once per call

This simplifies the code a bit--the status is only checked once.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

ed3920e3 10/07/2010 11:32 am Iustin Pop

Fix a rare bug in StartDaemonChild and GenericMain

I've seen cases where the result from str(sys.exc_info()[1]) is ""; this
breaks the error reporting as the parent relies on non-empty error
messages to properly detect child status (otherwise it will try to read...

3e87c1bf 10/07/2010 11:31 am Iustin Pop

Enhance the error reporting

Since daemon startup error will be often related to socket errors, so it
makes sense to change the original reporting:

Error when starting daemon process: "(98, 'Address already in use')"

Into:

Error when starting daemon process: 'Socket-related error: Address...
b78aa8c2 10/07/2010 11:31 am Iustin Pop

Change daemon.GenericMain/utils.Daemonize workflow

This patch copies the pipe-based error reporting functionality from
utils.StartDaemon (I gave up for now on tryin to merge the two).

This patch will fix two longstanding bugs:

- if we fork, we lose all error reporting from the child to the original...

b42ea9ed 10/07/2010 11:31 am Iustin Pop

Change utils.GenericMain protocol

Currently, GenericMain does a two-staged workflow:

- Check, before forking
- then Exec, after forking

This means we don't have any possibility to treat preparation work
(before the daemon is ready for work) different from the actual work....

5c4d37f9 10/07/2010 11:31 am Iustin Pop

Use only one version of WritePidFile

This patch merges the pid file handling used for ganeti-* daemons and
impexp daemons. The latter version is used, since it's more reliable:
uses locked pid files as opposed to checking 'live' processes.

Signed-off-by: Iustin Pop <>...

79634555 10/07/2010 11:30 am Iustin Pop

Abstract daemon file descriptor setup

This does some slight changes:

- Daemonize() doesn't explicitly close the file-descriptors anymore, but
only implicitly via the usage of dup2
- StartDaemonChild uses separate devnull for stdin (rdonly) and
stdout/stderr (wronly), or if using a log file, it uses it in append...

0260032c 10/07/2010 11:30 am Iustin Pop

Abstract some daemon functionality

This patch abstracts the chdir/umask/setsid functionality, which is
identical in the code functions, just that Daemonize did the chdir/umask
in the second child; with this change it does it in the first, as
StartDaemon....

72884fef 10/05/2010 06:08 pm Michael Hanselmann

Merge branch 'devel-2.2'

  • devel-2.2:
    Add simple unittest for utils.CommaJoin
    LUDelTags: Improve formatting of error message
    LUGetTags: Acquire locks in shared mode
    gnt-cluster: Replace hardcoded “xenvg” with value retrieved from master
    Export VG name via LUQueryConfigValues...
9fc58eac 10/05/2010 05:59 pm Michael Hanselmann

Export VG name via LUQueryConfigValues

This will be used by LUXI client programs to display the VG name.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

60db9336 10/05/2010 05:59 pm Michael Hanselmann

LUGetTags: Acquire locks in shared mode

Retrieving tags can be done while the lock is shared. Only writing
needs to be exclusive.

Also add a FIXME for cluster tags, where the code currently doesn't
use any locks except the config lock.

Signed-off-by: Michael Hanselmann <>...

91c69b44 10/05/2010 05:59 pm Michael Hanselmann

LUDelTags: Improve formatting of error message

Use utils.CommaJoin to add spaces after comma, clean up code a bit.

Before: Tag(s) 'bar','baz','foo','moo' not found
After: Tag(s) 'bar', 'baz', 'foo', 'moo' not found

Signed-off-by: Michael Hanselmann <>...

845c79d8 10/05/2010 05:59 pm Michael Hanselmann

cli: Move parsing of --net option to separate function

This function will also be used in tools/move-instance.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

9d3015f9 10/05/2010 04:54 pm Guido Trotter

kvm: collapse two consecutive extend calls

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

4f958b0b 10/05/2010 04:45 pm Miguel Di Ciurcio Filho

kvm: Introduce support for -mem-path

Using hugepages, KVM instances can get a good performance boost. To
activate that, we need to pass the -mem-path argument to KVM along with
the mount point of the hugetlbfs file system on the node.

For the sake of memory availability computation, we use the -mem-prealloc...

cf10a26f 10/05/2010 12:23 pm Iustin Pop

Merge branch 'devel-2.2'

  • devel-2.2:
    Rename the _oss cluster vars to _os

Conflicts:
lib/objects.py (trivial, strange that this one, and only this one, conflicted)

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

87b2cd45 10/05/2010 12:11 pm Iustin Pop

Rename the _oss cluster vars to _os

Per the mailing list discussion, rename _oss to _os, both in cluster parameters
and in the rest of the code.

This is just an s/_oss/_os, with the exception of a small bit of cleanup
around the helper_os function in cmdlib.py....

df5758b1 10/05/2010 12:11 pm Iustin Pop

Merge branch 'devel-2.2'

  • devel-2.2:
    gnt-job info: Sort input fields
    KVM: Add function to check the hypervisor version
    Bump version to 2.2.0, update NEWS
    Fix instance rename regression from 3fe11ba3
    Fix instance rename regression from 3fe11ba3...
b52d85c1 10/04/2010 07:06 pm Guido Trotter

KVM: Add function to check the hypervisor version

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

e964cc85 09/30/2010 08:23 pm Iustin Pop

Fix instance rename regression from 3fe11ba3

Committ 3fe11ba3 broke the instance rename as we don't use the FQDN
anymore. This fixes it.

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

21674464 09/30/2010 03:10 am Iustin Pop

Sort OS names and variants in LUDiagnoseOS

The OS list and variants as returned from LUDiagnoseOS is not sorted,
and gnt-instance reinstall doesn't sort it either. This means that it
the menu that users are present with is inconsistent across clusters,
and that is confusing....

d22dfef7 09/30/2010 03:10 am Iustin Pop

Change behaviour of OpDiagnoseOS w.r.t. 'valid'

This patch changes the behaviour of OpDiagnoseOS with regards to the
'valid' field to be similar to the one for the hidden/blacklisted
fields: unless this field is requested, invalid OSes are filtered out.
...

61a14bb3 09/30/2010 03:10 am Iustin Pop

Allow gnt-os modify to change the new OS params

Signed-off-by: Iustin Pop <>
Reviewed-by: Guido Trotter <>

cd14c16c 09/30/2010 03:10 am Iustin Pop

Add two more _T-type tests

These are useful for more in-depth checking of some kinds of arguments.

Signed-off-by: Iustin Pop <>
Reviewed-by: René Nussbaumer <>

c950e9f2 09/30/2010 03:10 am Iustin Pop

Add blacklisted/hidden OS support in LUDiagnoseOS

This changes the behaviour of LUDiagnoseOS significantly.

The addition of hidden/blacklisted OSes would mean that each user-facing
client would have to filter intentionally such OSes from display, which
is not a good choice. Rather, the patch makes LUDiagnoseOS not return...

fc31fadd 09/30/2010 03:10 am Iustin Pop

Restrict blacklisted OSes in instance installation

Signed-off-by: Iustin Pop <>
Reviewed-by: Guido Trotter <>

546b1111 09/30/2010 03:09 am Iustin Pop

Add two new cluster settings

The new variables are:

- a list of hidden OSes, that should not be displayed to the users in
interactive selection (e.g. reinstall); however, if they are selected, they
can be used
- a list of OSes that should be hidden and blocked from install-time selection...

870dc44c 09/30/2010 03:09 am Iustin Pop

Abstract OS name/variant functions

Currently, the computation of the 'pure' name or the variant is
hardcoded and spread around the functions that need it. This is not
nice, and in the future we'd spread it even more with more usage of
variants/pure os names....

485ba212 09/29/2010 02:42 pm Guido Trotter

Avoid nodegroup name/uuid conflicts

Forbid nodegroups to be called with a name that matches the UUID regular
expression. Uppercase versions are forbidden as well.

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

05636402 09/29/2010 02:42 pm Guido Trotter

Move the uuid regexp to utils.py

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

a38e8674 09/24/2010 07:21 pm Michael Hanselmann

Fix docstring typo in jqueue._JobProcessor._MarkWaitlock

epydoc complained:
“File …/ganeti/jqueue.py, line 886, in
ganeti.jqueue._JobProcessor._MarkWaitlock
Warning: Redefinition of type for job”

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

f23db633 09/24/2010 06:18 pm Michael Hanselmann

jqueue: Use priority for acquiring locks

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

f879a9c7 09/24/2010 06:18 pm Michael Hanselmann

mcpu: Implement priority for lock acquiring

Until now the priority for lock acquires couldn't be passed
when running opcodes.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

b30d95b6 09/24/2010 06:18 pm Michael Hanselmann

locking: Implement priority in Ganeti lock manager

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

7100c2fa 09/24/2010 06:18 pm Michael Hanselmann

locking: Don't set default priority as keyword default

This allows users of these classes to simply pass None if they want to use the
default value (the actual default is an internal constant), instead of
dynamically constructing the keyword arguments.

Signed-off-by: Michael Hanselmann <>...

26d3fd2f 09/24/2010 06:18 pm Michael Hanselmann

jqueue: Use timeout when acquiring locks

As already noted in the design document, an opcode's priority is
increased when the lock(s) can't be acquired within a certain amount of
time, except at the highest priority, where in such a case a blocking
acquire is used....

673cd9c4 09/23/2010 04:52 pm René Nussbaumer

Migrate call from backend._GetVGInfo to bdev.LogicalVolume.GetVGInfo

This patch removes duplicate code found in backend which also needs to
get VG infos. To make it simpler we moved to bdev.LogicalVolume.GetVGInfo.

Signed-off-by: René Nussbaumer <>...

b80cc518 09/23/2010 04:06 pm Michael Hanselmann

jqueue: Introduce per-opcode context object

This is better to group per-opcode data.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

a7770f03 09/23/2010 04:06 pm Michael Hanselmann

mcpu: Adjust lock acquire strategy

The changes to job queue processing require some changes on this class'
interface. LockAttemptTimeoutStrategy might move to another place, but that'll
be done in a later patch.

Signed-off-by: Michael Hanselmann <>...

831bbbc1 09/23/2010 04:06 pm Michael Hanselmann

mcpu.Processor: Raise exception on lock acquire timeout

Right now the timeout is not passed by any caller, making the code
effectively go back to blocking acquires. Since the timeout is always
None, no caller needs to be changed in this patch.

This change also means that any LUXI query handled by ganeti-masterd...

03b63608 09/23/2010 12:07 pm Michael Hanselmann

jqueue: Rename current_op to better reflect what it actually is

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

fa4aa6b4 09/23/2010 12:07 pm Michael Hanselmann

jqueue: Separate function for in-memory variables

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

5ee6fffc 09/22/2010 05:57 pm Michael Hanselmann

Merge branch 'devel-2.2'

  • devel-2.2:
    NEWS: Add 2.2.0~rc2 release date
    Bump version to 2.2.0~rc2
    Fix mac checker regex
    Remove two old aliases
    Fix migration on new KVMs
    Fix typo in ganeti man page
    cli: Pass options in {Add,Remove}Tags
    Prepare 2.2.0~rc2 release...
227e546f 09/22/2010 05:53 pm Michael Hanselmann

Merge branch 'stable-2.2' into devel-2.2

  • stable-2.2:
    NEWS: Add 2.2.0~rc2 release date
    Bump version to 2.2.0~rc2
    Remove two old aliases
    Fix migration on new KVMs
    Prepare 2.2.0~rc2 release

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

db5bce34 09/22/2010 05:38 pm Michael Hanselmann

jqueue: Add unittest for _QueuedJob.CalcStatus

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

197478f2 09/22/2010 04:17 pm René Nussbaumer

Use free space in vg instead of biggest free pv space for a snapshot

Even for snapshot we looked at the biggest free pv space even though
the vg might have fit the snapshot we aborted if one of the pvs was too
small. This patch fixes this by looking at the vg size instead of the pv...

cb639800 09/22/2010 04:16 pm Michael Hanselmann

Merge branch 'devel-2.1' into devel-2.2

  • devel-2.1:
    Fix mac checker regex

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

8fb00704 09/22/2010 02:12 pm Iustin Pop

Fix mac checker regex

Currently, the mac checker regex could match a corner case of
11:22:33:44:55:66: (one extra colon at the end). We fix this, and we
also move the regex compilation outside of this function, at module
level.

Signed-off-by: Iustin Pop <>...

f0ca837f 09/20/2010 04:14 pm René Nussbaumer

Ignore failures while shutting down instances during failover from offline node

Don't abort failover if instance shutdown doesn't work on a node marked
offline. The node is offline, so the instances living on it are too. Before
you had to use --ignore-consistency to archieve that....

aa06f8c6 09/20/2010 03:41 pm Michael Hanselmann

cli: Expose priority option and pass priority to master daemon

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

be760ba8 09/20/2010 03:41 pm Michael Hanselmann

jqueue: Change model from per-job to per-opcode processing

In order to support priorities, the processing of jobs needs to be
changed. Instead of processing jobs as a whole, the code is changed to
process one opcode at a time and then return to the queue. See the...

7b5c4a69 09/20/2010 03:41 pm Michael Hanselmann

jqueue: Use priority for worker pool

A small helper function is added to make this easier. Priorities are not
yet used in all necessary places.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

01eaf2fb 09/20/2010 12:04 pm Vitaly Kuznetsov

Fix migration on new KVMs

New KVMs (0.12.1.2-el6 and 0.13.5 tested) exit immediately after
unsuccessful network connection when they are in "-incoming" mode. The
simple check netutils.TcpPing causes remote kvm to exit so the migration
will always fail. This check is also redundant by the way as if the...

af1a81d1 09/20/2010 11:12 am Michael Hanselmann

cli: Pass options in {Add,Remove}Tags

They'll be used for job priorities. Also add an empty line to
gnt-os where it's missing.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

a0d2fe2c 09/20/2010 11:11 am Michael Hanselmann

jqueue: Add missing docstring to _QueuedJob.Cancel

This was forgotten in commit 099b2870b.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

f4ec2960 09/16/2010 02:58 pm René Nussbaumer

Bail out if daemon gets fired up under wrong uid

This patch bails out in early stage, if the user invoking the daemon
doesn't match the user set at configure time.

Signed-off-by: René Nussbaumer <>
Reviewed-by: Michael Hanselmann <>

2bc27b91 09/16/2010 01:56 pm Michael Hanselmann

Merge branch 'devel-2.2'

  • devel-2.2:
    QA: Test more tag operations via RAPI
    qa_rapi: Fix indentation error
    opcode summary: improve display for list summaries
    cmdlib: Fix type of “name” parameter for tag operations
    rlib2: Set tag operation param “name” to None for cluster tags...
55ec5c5e 09/16/2010 01:38 pm Michael Hanselmann

Merge branch 'stable-2.2' into devel-2.2

  • stable-2.2:
    cmdlib: Fix type of “name” parameter for tag operations
    rlib2: Set tag operation param “name” to None for cluster tags
    Fix OS_VARIANT variable setting

Signed-off-by: Michael Hanselmann <>...

bc8bbda1 09/16/2010 01:28 pm Iustin Pop

opcode summary: improve display for list summaries

Currently, opcodes like NODE_EVAC_STRATEGY look bad:

89684 error   NODE_EVAC_STRATEGY([u'node3'])

With this patch, we try to render list arguments a little bit better:

89684 error   NODE_EVAC_STRATEGY(node3)...
e1ea54e9 09/16/2010 01:26 pm Michael Hanselmann

workerpool: Fix typo

A call to logging.debug was missing an argument, leading to complaints
on stderr at runtime.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

099b2870 09/16/2010 01:25 pm Michael Hanselmann

jqueue: Move CancelJob logic to separate function

Moving the internals of this function will allow it to be used from
unittests in the future. Splitting this into a pure, side-effect free
function and an impure one makes the pure function easily testable....

42e32075 09/16/2010 10:25 am Iustin Pop

Merge branch 'devel-2.2'

  • devel-2.2:
    Fix case of MAC special-values
    Remove mcpu's ReportLocks callback
    Revert "jqueue: Resume jobs from “waitlock” status"

(no conflicts, took LGTM from original commit)

Signed-off-by: Iustin Pop <>...

bf2ace9f 09/15/2010 10:48 pm Michael Hanselmann

cmdlib: Fix type of “name” parameter for tag operations

The parameter “name” is be None for cluster tags.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

5313eed7 09/15/2010 10:48 pm Michael Hanselmann

rlib2: Set tag operation param “name” to None for cluster tags

Otherwise parameter verification in the master daemon fails.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

31684f84 09/15/2010 03:58 pm René Nussbaumer

Stop all daemons precautiosly before trying to start ganeti-noded again

Please note that if the pid file is broken or missing we'll not catch
the process (if any is running) and it's up to the user to fix this state

Signed-off-by: René Nussbaumer <>...

ace16501 09/15/2010 03:42 pm Guido Trotter

Check for duplicate nodegroup names

Since the nodegroups dict is indexed by uuid duplicate names might
happen as a result of bugs. Add a check to prevent them.

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

c60abd62 09/15/2010 02:08 pm Guido Trotter

Split a long docstring line in objects.py

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

88b92fe3 09/15/2010 02:08 pm Guido Trotter

InitConfig: create nodegroups as well

This patch also ensures that the initial configuration has all the
needed UUIDs and that they are unique, by using a
TemporaryReservationManager inside InitConfit to generate them.

Signed-off-by: Guido Trotter <>...

6f076453 09/14/2010 07:49 pm Guido Trotter

Export nodegroups list (names/uuids) via ssconf

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

36e247e1 09/14/2010 07:49 pm Guido Trotter

Add nodegroup bash autocomplation

We autocomplete both by nodegroup name and uuid.

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

5fbbd028 09/14/2010 07:49 pm Guido Trotter

Add nodegroup option to AddNode

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

190e3cb6 09/14/2010 07:49 pm Guido Trotter

Add node's nodegroup field

If a node doesn't have a node group we'll upgrade the config making it
the cluster default. Also the node add and removal operations are
changed to set/clear the node group correctly. Finally we populate the
"members" list of nodegroups on config load with the value from the...

6520ba14 09/14/2010 07:40 pm Guido Trotter

Check for nodegroup uuid indexing

Since the uuid is immutable the probability of it getting out of sync
between the object and the dict key is very low. Still, checking is
cheap, so we do it to be more sure nothing is wrong.

Signed-off-by: Guido Trotter <>...

eaa98a04 09/14/2010 07:40 pm Guido Trotter

config.LookupNodeGroup

This function allows a node group to be looked up by name or uuid.
If no nodegroup is specified and only one exists, that one is returned.

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

f9e81396 09/14/2010 07:40 pm Guido Trotter

ConfigWriter: create the default node group

If no node groups exist we'll create a new default empty one.

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

3df43542 09/14/2010 06:14 pm Guido Trotter

Add a 'nodegroups' slot to ConfigData

Also:
- reformat the slots declaration of ConfigData
- call UpgradeConfig on each node groups to handle future upgrades
- add nodegroups special case in {To,From}Dict
- add nodegroups to _AllUUIDObjects

Signed-off-by: Guido Trotter <>...

fe25a79a 09/14/2010 06:14 pm Guido Trotter

_ContainerFromDicts: handle None source

When _ContainerFromDicts is called on some element which doesn't exist
in the config, because it is yet to be upgraded, it will receive its
value as None. We take care of this case by using an empty element of
the required target type....

24a3707f 09/14/2010 06:14 pm Guido Trotter

Add a new NodeGroup config object

The "members" slot of this object is not serialized, and is discarded
when deserializing, initializing it explicitly to [].

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

84a5b33c 09/13/2010 06:35 pm Michael Hanselmann

cli: Add option definition for priority

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

e71c8147 09/13/2010 06:35 pm Michael Hanselmann

jqueue: Ensure only accepted priorities are allowed for submitting jobs

Quoting the design document: “Submitted opcodes can have one of the priorities
listed below. Other priorities are reserved for internal use”. Submitting jobs
at priority -20 should not be allowed....

8f5c488d 09/13/2010 06:35 pm Michael Hanselmann

Add support for job priority to opcodes and job queue objects

This allows clients to submit opcodes with a priority. Except for being
tracked by the job queue, it is not yet used by any code.

Unittests for jqueue._QueuedOpCode and jqueue._QueuedJob are provided for...

e5d8774b 09/13/2010 06:35 pm Michael Hanselmann

Add job priority constants

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

acf931b7 09/13/2010 05:46 pm Michael Hanselmann

Remove mcpu's ReportLocks callback

This is no longer needed with the new lock monitor. One callback is kept to
check for cancelled jobs.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

5ef699a0 09/13/2010 05:39 pm Michael Hanselmann

Revert "jqueue: Resume jobs from “waitlock” status"

This reverts commit 4008c8edae31a3971fa8c4b200238afc8005d3d4.

While it worked in my initial tests, I've now found cases where this doesn't
work properly as it is. More work is needed and will be done as part of the...

a025e535 09/13/2010 02:04 pm Vitaly Kuznetsov

Fix OS_VARIANT variable setting

This was introduced in efaa9b06d1e1e6d1678d0edd75b1ba37cf0de3d9.

in OSCoreEnv:
inst_os.name is pure operating system name (without variant) as variant is stripped
in OSFromDisk(). So we always get variant = inst_os.supported_variants[0] (first...
a68fe106 09/10/2010 03:11 pm Michael Hanselmann

Merge branch 'devel-2.2'

  • devel-2.2:
    Fix pylint warning in http/__init__.py
    Allow SSL ciphers to be overridden in HTTP server
    jqueue: Resume jobs from “waitlock” status
    jqueue: Move queue inspection into separate function
    jqueue: Don't update file in MarkUnfinishedOps...
a6d350cc 09/10/2010 03:10 pm Michael Hanselmann

Merge branch 'stable-2.2' into devel-2.2

  • stable-2.2:
    Fix pylint warning in http/__init__.py
    Allow SSL ciphers to be overridden in HTTP server
    If we had any errors in setup in one of the hosts, exit with non-zero

Signed-off-by: Michael Hanselmann <>...

5117f822 09/10/2010 02:54 pm Michael Hanselmann

Fix pylint warning in http/__init__.py

My bad for not seeing this before:
R0201:614:HttpBase.GetSslCiphers: Method could be a function

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

91c69613 09/10/2010 02:43 pm Michael Hanselmann

Allow SSL ciphers to be overridden in HTTP server

Users of this class, such as the RAPI server, might want to override or adjust
the default SSL cipher defined in a constant.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

4008c8ed 09/10/2010 02:23 pm Michael Hanselmann

jqueue: Resume jobs from “waitlock” status

After an unclean restart of ganeti-masterd, jobs in the “waitlock” status can
be safely restarted. They hadn't modified the cluster yet.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

de9d02c7 09/10/2010 02:23 pm Michael Hanselmann

jqueue: Move queue inspection into separate function

This makes the init function a lot smaller while not changing
functionality.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: René Nussbaumer <>

747f6113 09/10/2010 02:23 pm Michael Hanselmann

jqueue: Don't update file in MarkUnfinishedOps

This reduced the number of updates to the job files. It's used in two places
while processing a job and the file is updated just afterwards.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

05ad571c 09/10/2010 02:22 pm Michael Hanselmann

locking.SharedLock: Update class docstring

This was already outdated when the initial version of SharedLock was added
in commit 162c1c1f1 (February 2008).

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

887c7aa6 09/07/2010 04:56 pm Michael Hanselmann

locking: Implement priorities in SharedLock and LockSet

For proper support of job priorities, jobs' locks need to respect
priorities. Otherwise it could happen that a job with a lower priority
could get a lock before a job with a higher priority (depending on...

fd346851 09/07/2010 02:26 pm René Nussbaumer

Remove utils.EnsureDir as this is done by ensure-dirs.in now

Signed-off-by: René Nussbaumer <>
Reviewed-by: Michael Hanselmann <>

e60c73a1 09/07/2010 02:26 pm René Nussbaumer

The config now should also belong to confd group and readable by it

Signed-off-by: René Nussbaumer <>
Reviewed-by: Michael Hanselmann <>

82b22e19 09/07/2010 02:26 pm René Nussbaumer

Move job queue to new ganeti.runtime

Signed-off-by: René Nussbaumer <>
Reviewed-by: Michael Hanselmann <>