GitLab

.. and make it the first one so that masterd can use it when it starts.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

The constant is used when calling the daemon startup/shutdown scripts.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

.. and fix the superfluous options list in ganeti-wconfd.hs
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

This is needed for WConfd, because during failover it needs to be
temporarily started in order to update the configuration on the selected
master candidate.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

When reading the configuration file from RPC JSON, values without a
floating point are parsed as 'int', not as 'float', and later the
consistency check fails.

This patch adds an automatic conversion from 'int' to 'float' during
checking so that the improper JSON parsing is fixed.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

...and by doing so, please lint.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

On startup, make wconfd read a the state of the lock allocation from disk,
instead of starting from an empty allocation.

Note that, as opposed to the configuration, no finding a saved
log configuration is not an error; e.g., the node might be master
for the first time.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

As we aim to handle jobs as separate processes with locks
handled by WConfD, we need to persist the locks to ensure
they survive a restart of that deamon. Saving only on master
daemon is enough, however.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

Lock allocation are stored on disk as their JSON representation.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

As we made Ganeti.Locking.Locks an instance of JSON, we better verify
that we can readJSON what we showJSON.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

As requests to acquire or release locks come via
inter-process communication, we need a serialization
of the locks data type.

All locks are serialised as JSON objects, where the
key "type" describes the type of lock, and the remaining
keys are type-dependent.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

Verify readJSON . showJSON = Ok for LockAllocations.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

In this way, we can serialize a lock state to disk, so that
locks can survive a restart of WConfD.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

* stable-2.11
  Add query support for locks to luxid (cherry-pick)
  Provide fields for lock queries (cherry-pick)
  A quick fix for broken 'make distcheck'

* stable-2.9
  Make gnt-debug locks display fake job locks properly
  Make NiceSort treat integers well
  Revision bump for 2.9.5
  Set release date for 2.9.5
  Add NEWS entry for 2.9.5

Conflicts:
	src/Ganeti/Query/Locks.hs
	src/Ganeti/Query/Query.hs

Conflicts were resolved in favor of master, where the code causing
the conflicts was cherry-picked from.
Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

* stable-2.9
  Make gnt-debug locks display fake job locks properly
  Make NiceSort treat integers well
  Revision bump for 2.9.5
  Set release date for 2.9.5
  Add NEWS entry for 2.9.5
Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

While requests only get forwarded, it still helps to
get luxid feature-complete with respect to master.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
Cherry-picked from commit a6e406ce

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

For luxid to be feature-complete with respect to masterd, it
also needs to answer requests about locks. This includes knowing
the fields available for locks.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
Cherry-picked from commit 86b04819

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Note that currently these functions lack any kind of locking and
concurrent calls to 'writeConfig' will result in lost changes in the
configuration.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

.. and include ConfigData in WConfd's ConfigState.

Currently it includes functions for asynchronous saving the
configuration and reading and (over)writing it in the daemon state.

Load the configuration from the file at daemon startup and configure an
asynchronous task to save it after writes.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Add functions for reading and writing the configuration. Writing
triggers the asynchronous worker which saves the configuration into the
master file. The actual action that saves the configuration is passed as
an argument to 'mkDaemonHandle'.

Also use lifted IORef functions to simplify code.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

.. so that it can be not only read, but also written to the master
configuration file.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Each such worker has its own background thread and performs a given
task when triggered. Triggers arriving when the worker is processing are
accumulated and processed together in a subsequent worker action.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Utils is getting too big, so better split this new set of functions into
a separate sub-module. This also allows us to use ResultG there.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Often we have `ResultT e IO a` as the return type of our primitive
functions and we need to lift them into a monad stack that is also based
on IO. This function accomplishes this by lifting a ResultT in a base
monad of a monad stack into the stack.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

This type occurs often in the upcoming code so it's worth having an
alias for it.

It's included in Errors instead of Utils, because it depends on
GanetiException, and importing Errors from Utils causes a cyclic
dependency.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Calling logging functions in a monad transformer stack requires
instances for all the transformers.
This patch adds a module with functions named just as in Ganeti.Logging,
but lifted into MonadBase. This allows using them in any transformer
stack which has MonadBase instance and whose base monad is MonadLog.
This condition is satisfied for all IO-based stacks.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

This will be used for asynchronous workers, for which it's convenient to
use StateT to keep their internal state.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

This allows to use them in any IO-based monad.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

In particular, this enables debug logging for WConfd on our test
environment.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

* stable-2.9
  Make gnt-debug locks display fake job locks properly
  Make NiceSort treat integers well
Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

When a job is dependent on other jobs, a fake lock is created whose
pending entry contains a list of job ids waiting on the job. gnt-debug
locks did not expect the job ids to be ints, crashing when encountering
them. This patch fixes the situation by forcing a string cast.
Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

NiceSort is invoked on arrays that may contain strings, but in other
situations can contain ints as well. As this surprisingly makes sense,
add a tiny modification to make NiceSort work in these conditions.
Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

* stable-2.9
  Revision bump for 2.9.5
  Set release date for 2.9.5
  Add NEWS entry for 2.9.5

Conflicts:
	NEWS: take both additions
	configure.ac: ignore revision bump
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Jose Lopes <jabolopes@google.com>

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Jose Lopes <jabolopes@google.com>

The offending target 'test/hs/offline-test.sh' requires the dependencies
even when the test isn't actually run. This is because currently our
Makefile doesn't distinguish between prerequisites for building test
scripts and running them.

This is a quick fix that hides the dependencies if the Haskell tests
aren't built, but it doesn't address the core problem. This will be
fixed in a separate patch series.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

At some places a few items of lists use 8 spaces, while we use tabs
everywhere (as makefiles require anyway). This patch unifies the
indentation.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

* stable-2.10
  Let the instance's tuple of nodes start with the primary
  Fix the test that checks for the order of instance's nodes
  Revision bump for the 2.10.0 release
  Update NEWS file for 2.10.0
  Revision bump for 2.10.0~rc3
  Update NEWS file for 2.10.0~rc3

* stable-2.9
  Fix net-common script in case of routed mode
  Document hspace's SPN parameters
  Document spindles in TSPEC
  man: Update the manual page of gnt-node FAILOVER
  Make hbal deal with no-LVM storage space properly

* stable-2.8
  Fix expression describing optional parameters
  Improve job status assert affected by race condition
  Export and import Disk/NIC name
  Fix backup import in case NIC is inside a network
  Override get() method of ConfigParser
  Fix integer overflow problem in hbal
  Add missing space

Conflicts:
	Makefile.am: manually apply 438ce535

 on
	  the stable-2.11 version
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

* stable-2.10
  Let the instance's tuple of nodes start with the primary
  Fix the test that checks for the order of instance's nodes
  Revision bump for the 2.10.0 release
  Update NEWS file for 2.10.0

* stable-2.9
  Fix net-common script in case of routed mode
  Document hspace's SPN parameters
  Document spindles in TSPEC
  man: Update the manual page of gnt-node FAILOVER
  Make hbal deal with no-LVM storage space properly

* stable-2.8
  Fix expression describing optional parameters
  Improve job status assert affected by race condition
  Export and import Disk/NIC name
  Fix backup import in case NIC is inside a network
  Override get() method of ConfigParser

Conflicts:
	NEWS: take both additions
	configure.ac: ignore suffix bump
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

Describe the changes since 2.9.4 for the soon-to-be-released
version 2.9.5.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>