This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Ganeti core".
The branch, master has been updated
via 7a3aa19fd332345879cce9ce78fa5e488833ce76 (commit)
via 6452e6e446b265e473fb97897a7f9de1549427cd (commit)
via 3fa5888d28dcac5977991346dc5709e09ee525a9 (commit)
from 8e5ab0538117502be1fcf808d79a278c4db152a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7a3aa19fd332345879cce9ce78fa5e488833ce76
Author: Niklas Hambuechen <[email protected]>
Date: Mon Sep 29 16:51:25 2014 +0200
Generalize SlotMap
This turns the existing `SlotMap` from the structure
Map (label :: String, limit :: Int) (occupied :: Int)
into
Map (label :: a) (occupied :: Int, limit :: Int)
and extracts it into its own module; this makes it possible to use
`SlotMap`s for cases outside of reason rate limiting.
There is also a semantic clean-up (not affecting how reason rate limiting
works): `joinSlotMap` (now `occupySlots`) no longer takes a `SlotMap`
as second argument, removing the need to decide how the limits of the
second `SlotMap` affect the return value.
Before `c = joinSlotMap a b` allowed to have keys in `b` that don't appear
in `a`, and those would appear in `c` with the limits from `b` (so `a` does
not constrain them).
In the new `occupySlots`, such keys have a limit of 0 instead.
Signed-off-by: Niklas Hambuechen <[email protected]>
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Klaus Aehlig <[email protected]>
commit 6452e6e446b265e473fb97897a7f9de1549427cd
Author: Niklas Hambuechen <[email protected]>
Date: Mon Sep 29 16:51:24 2014 +0200
ReasonRateLimiting: Refactor: Extract `queueSlotMap`
Makes `reasonRateLimit` easier to read.
Signed-off-by: Niklas Hambuechen <[email protected]>
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Klaus Aehlig <[email protected]>
commit 3fa5888d28dcac5977991346dc5709e09ee525a9
Author: Niklas Hambuechen <[email protected]>
Date: Mon Sep 29 16:51:23 2014 +0200
ReasonRateLimiting: Generalize `slotMapFromJob` a bit
This function doesn't need to take a `JobWithStat`, the `QueuedJob`
inside it is sufficient.
Signed-off-by: Niklas Hambuechen <[email protected]>
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Klaus Aehlig <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +
src/Ganeti/JQScheduler/ReasonRateLimiting.hs | 102 +++++------
src/Ganeti/SlotMap.hs | 99 ++++++++++
test/hs/Test/Ganeti/JQScheduler.hs | 251 ++++---------------------
test/hs/Test/Ganeti/SlotMap.hs | 263 ++++++++++++++++++++++++++
test/hs/htest.hs | 2 +
6 files changed, 448 insertions(+), 271 deletions(-)
create mode 100644 src/Ganeti/SlotMap.hs
create mode 100644 test/hs/Test/Ganeti/SlotMap.hs
hooks/post-receive
--
Ganeti core
--
---
You received this message because you are subscribed to the Google Groups
"ganeti-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
