GitLab

.. to TestCommon as a preparation for cherry-picking changes that
need it.

The macro and the version detection will be removed in 2.14 where the
functionality is replaced with cabal.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

After cherry-picking the changes needed for GHC7.8, the former isn't
used any more.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

It turns out that GHC 7.8's -dynamic-too is forbidden not only for
profiling builds object files, but also for those using HPC coverage.

This commit accordingly renames HFLAGS_NOPROF to HFLAGS_DYNAMIC
(since it now is not conditional on profiling any more),
and makes sure that it is not used for profiling or HPC.

This way we achieve that, for profiling+coverage builds
  - .dyn_o files are available for use in TH in the following 3 cases
  - .o files are for the normal binaries
  - .hpc_o files are for coverage-enabled test binaries
  - .prof_o files are for profiling binaries

We make .hpc_o files depend on the .o files because the creation of
the .o files will also create the .so files needed for TH.
This was already in place for .prof_o files.

This requires that HFLAGS now also contains `-itest/hs` since
the rule for .o files is now also responsible for building .o/.so files
in test/hs.
Signed-off-by: Niklas Hambuechen <niklash@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Cherry-picked-from: 1ad14f38Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

This fixes
  ./configure --enable-haskell-tests && make hs-tests
builds on GHC 7.8.

It changes `-osuf .ext` to `-osuf ext`; the old form was allowed in
GHC <= 7.6, but GHC 7.8 seems to have problems with it:
  https://ghc.haskell.org/trac/ghc/ticket/9760

The form without dot works in all GHC versions, and we don't have
dots in other -osuf arguments in the same file either, so this
was probably an accident.
Signed-off-by: Niklas Hambuechen <niklash@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Cherry-picked-from: 9664aff9Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

GHC 7.8 switched to dynamic linking being used for ghci, which requires
that .so file are being built for modules that are loaded for TH.

For this reason, GHC >= 7.8 has a -dynamic-too flag, which we now use.

However, -dynamic-too must not be enabled for profiling builds,
which is why this commit introduces a HFLAGS_NOPROF variable
(currently only containing -dynamic-too) that must be passed to
all GHC invocations that are not creating profiling output.
Signed-off-by: Niklas Hambuechen <niklash@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

Cherry-picked-from: 083776b9Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

This works around https://ghc.haskell.org/trac/ghc/ticket/9749:

GHC 7.8 (undocumentedly) changed the way in which ghc -M generated
object file dependencies, lacking the underscore that older versions
added automatically to the file names.
It also requires a -dep-suffix for the plain object file (.o).

This commit detects GHC 7.6 and older (7.7 is development only, has no
release and is treated equal to 7.8), and adjusts the -M invocation
appropriately for newer GHC versions.
Signed-off-by: Niklas Hambuechen <niklash@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

Cherry-picked-from: b78a2c30Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

.. to the Makefile as well as to the Haskell modules where it will be
needed.

While at it, fix spacing so that command lines start with tabs, as they
should.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

.. as we'll be adding the version information of another package later.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

For better LURenewCrypto unit tests, we need to be able to
mock the pathutils module. This makes it necessary to add
some support to the testutils for patching this module.
Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

The replacement command only added dependencies for *.hi files, not
*.*_hi files that are used for testing.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

The original version didn't work when the version was just 2 numbers,
and also wasn't robust enough when there were multiple 'lens' versions
installed.

This patch fixes that, and always takes the last installed version, as
reported by ghc-pkg.

Starting with 2.14 there is a native cabal-based mechanism for
generating these definitions, so the whole 'hs-lens-version' target
should be dropped from the Makefile in that version.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

.. in Haskell code.

This patch should be removed starting from 2.14, as there cabal
provides proper macros for all packages.

The macro in this patch is intentionally kept compatible with the cabal
macros.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

While not strictly necessary for using Ganeti, the distribution
tar ball is still supposed to be a complete for Ganeti development.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

Add a target to manually run the python tests, and no other
tests. In the same way as the hs-tests target simplifies testing
Haskell changes while developing Haskell code, this target
simplifies developing python code.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Signed-off-by: Niklas Hambuechen <niklash@google.com>
Reviewed-by: Niklas Hambuechen <niklash@google.com>

Cherry-picked from 5b8754f4Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

For generated files, it is enough to check the headers of the
files they are generated from. Moreover, the generated files
have the shebang-line of the target system, which might be
different from the generic one checked for.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Niklas Hambuechen <niklash@google.com>

While most of our top-level python scripts used to be generated
in the Makefile already, the scripts under tools used to be
"ready to use". However, in our current situation where the
python 2 interpreter is called different on different platforms
we still need to fix the shebang line. This patch achieves this
without moving source files around.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

...in our automatically generated top-level python files.
Instead use the automatically detected python path.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

The script does the bare minimum required to set up the interface during
instance creation. The rest of the process is carried out by the ifup-os
script.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

...this will allow inspecting, e.g., the effective compiler
flags without actually running the compiler. For example,
to see the value of the HFLAGS,

make print-HFLAGS
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

Unless you develop Ganeti, it is not a problem if some of
the functions used are deprecated in you newer haskell
environment. So allow those builds for normal users.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

use the Python interpreter which has been set via PYTHON env-var at
configure time
Signed-off-by: Neal Oakey <neal.oakey@googlemail.com>
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Fixes issues 758 and 912.
Since ghc -M does not generate inter object dependency rule for object
files, dependencies from a target executable seed object
(e.g. src/hluxid.o) to objects which finally will be linked to the
target object (e.g. src/Ganeti/Daemon.o) are missing in Makefile.ghc.
For instance, following commands will not rebuild src/hluxid inspite of
its dependent object src/Ganeti/Daemon.o has been updated.

    $ make # rebuild all once
    $ touch src/Ganeti/Daemon.hs
    $ make # this will rebuild src/Ganeti/Daemon.o, not src/hluxid.o

This patch adds simple substitution code after the Makefile.ghc
generation to add additional inter object dependency for all object
files to force relink related objects when a linked object has been
updated.
Signed-off-by: Yuto KAWAMURA(kawamuray) <kawamuray.dadada@gmail.com>
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

This patch add systemd unit files used by ganeti-*.service to
EXTRA_DIST.
Signed-off-by: Jun Futagawa <jfut@integ.jp>
Reviewed-by: Apollon Oikonomopoulos <apoikos@gmail.com>
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

In particular, skip its compilation, if the required packages aren't
present.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

In particular, kvmd, luxid, metad and wconfd aren't dependent on
enabling confd.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

This requires to compile each object file twice, once without profiling,
for TH splicing, and then once with profiling enabled.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Remove implemented ones from the draft list and add the ones fully or
partially implemented in 2.12.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

Make gnt-cluster upgrade honor the --with-backup-dir configure option.
In this way, at configure time, it can be decided in which directory
the configuration backup tar balls are put.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

During Ganeti version upgrades, Ganeti creates a backup of
the full configuration directory. Add a new configure option
to decide in which directory the backup tar ball is to be put.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

...that was accidentally removed in e8127e66.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

In particular, test serialization of IPv4Reservation, which is used
on the Python part as well.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

We verify that 'readJSON . showJSON == Ok' and that maps are equal iff
keys map to the same values.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Internally, they're implemented using IntSets, which work quite well for
both sparse and dense sets. The implementation is hidden outside the
module so it's possible to replace it with something else, if needed.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Currently, the part that loads/saves locks is generic, with no lock
specifics. Abstract it so that it can be reused for temporary
reservations.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

The function fsync(2) is not packaged in any package we currently
depend on, but we need it nevertheless. For a single function, however,
it is easier, also for people trying to build Ganeti, to just do the
foreign function call ourselves, instead of depending on yet another
package.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

Add a DRBD 8.4 configuration with the first resource empty, together
with the relevant Haskell and Python tests.
Signed-off-by: Apollon Oikonomopoulos <apoikos@gmail.com>
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Currently it does only some basic checking, like valid UUIDs.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Verify that the results of allocation do not depend on the
presence of an overfull group, if the option --independent-groups
is given.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

This monads wraps the writer monad. It allows a computation to emit
multiple errors messages and deal with them at the end.

This will be used for configuration verification, as well as for other
verification purposes such as verification of JSON input.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>