AUG: add support for resources section & quorum/quorate

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@3055 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Angus Salkeld 2010-09-27 21:14:06 +00:00
parent 83b24b660b
commit 191c19429c
2 changed files with 55 additions and 1 deletions

View File

@ -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")

View File

@ -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,7 +123,17 @@ 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" }