Signed-off-by: Angus Salkeld <[email protected]>
---
conf/lenses/corosync.aug | 32 +++++++++++++++++++++++++++++++-
conf/lenses/tests/test_corosync.aug | 24 ++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/conf/lenses/corosync.aug b/conf/lenses/corosync.aug
index 23458f3..f3257e9 100644
--- a/conf/lenses/corosync.aug
+++ b/conf/lenses/corosync.aug
@@ -110,6 +110,35 @@ let logging =
section "logging" setting
+(* The resource section *)
+let common_resource =
+ kv "max" Rx.decimal
+ |kv "poll_period" Rx.integer
+ |kv "recovery" /reboot|shutdown|watchdog|none/
+
+let memory_used =
+ let setting =
+ common_resource in
+ section "memory_used" setting
+
+
+let load_15min =
+ let setting =
+ common_resource in
+ section "load_15min" setting
+
+let system =
+ let setting =
+ load_15min
+ |memory_used in
+ section "system" setting
+
+(* The resources section *)
+let resources =
+ let setting =
+ system in
+ section "resources" setting
+
(* The amf section *)
let amf =
let setting =
@@ -125,6 +154,7 @@ let quorum =
|kv "quorumdev_poll" Rx.integer
|kv "leaving_timeout" Rx.integer
|kv "disallowed" Rx.integer
+ |kv "quorate" Rx.integer
|kv "two_node" Rx.integer in
section "quorum" setting
@@ -140,6 +170,6 @@ let uidgid =
qstr /uid|gid/ in
section "uidgid" setting
-let lns =
(comment|empty|compatibility|totem|quorum|logging|amf|service|uidgid)*
+let lns =
(comment|empty|compatibility|totem|quorum|logging|resources|amf|service|uidgid)*
let xfm = transform lns (incl "/etc/corosync/corosync.conf")
diff --git a/conf/lenses/tests/test_corosync.aug
b/conf/lenses/tests/test_corosync.aug
index bae7db6..a0fe1d5 100644
--- a/conf/lenses/tests/test_corosync.aug
+++ b/conf/lenses/tests/test_corosync.aug
@@ -50,9 +50,23 @@ quorum {
quorumdev_poll: 2
leaving_timeout: 2
disallowed: 0
+ quorate: 1
two_node: 0
}
+resources {
+ system {
+ memory_used {
+ recovery: reboot
+ max: 80
+ }
+ load_15min {
+ recovery: watchdog
+ max: 8.56
+ }
+ }
+}
+
uidgid {
uid: 0
gid: 0
@@ -109,8 +123,18 @@ test Corosync.lns get conf =
{ "quorumdev_poll" = "2" }
{ "leaving_timeout" = "2" }
{ "disallowed" = "0" }
+ { "quorate" = "1" }
{ "two_node" = "0" } }
{ }
+ { "resources"
+ { "system"
+ { "memory_used"
+ { "recovery" = "reboot" }
+ { "max" = "80" } }
+ { "load_15min"
+ { "recovery" = "watchdog" }
+ { "max" = "8.56" } } } }
+ { }
{ "uidgid"
{ "uid" = "0" }
{ "gid" = "0" } }
--
1.7.2.2
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
