cluster: STABLE3 - Added detail to Node Assassin fence agent (fence_na) copyright.
by Madison Kelly
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: a026b2894835ce4b942dfcada85b03dfe4abbe57
Parent: 73de6c00b600cbd1954f69a7443033ba9316da3c
Author: Madison Kelly <mkelly(a)alteeve.com>
AuthorDate: Thu Sep 2 13:44:09 2010 -0400
Committer: Madison Kelly <mkelly(a)alteeve.com>
CommitterDate: Thu Sep 2 13:44:09 2010 -0400
Added detail to Node Assassin fence agent (fence_na) copyright.
Signed-off-by: Madison Kelly <mkelly(a)alteeve.com>
---
doc/COPYRIGHT | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT
index 64a3dc7..e61a585 100644
--- a/doc/COPYRIGHT
+++ b/doc/COPYRIGHT
@@ -48,6 +48,7 @@ fence/agents/ipmilan/expect.{c,h}:
Copyright (C) 2000 Alan Robertson <alanr at unix.sh>
fence/agents/node_assassin/*
+ Copyright (C) 2009-2010 Madison Kelly/Alteeve's Niche!
Author: Digimer <digimer at alteeve.com>
fence/agents/xvm/tcp.c:
13 years, 8 months
cluster: STABLE3 - doc: Update autogenerated doc for resource-defaults
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 73de6c00b600cbd1954f69a7443033ba9316da3c
Parent: e9a8b4e4ed9463902620683e69750b71930e3b15
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Sep 2 10:00:27 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Sep 2 10:00:27 2010 -0400
doc: Update autogenerated doc for resource-defaults
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
doc/cluster_conf.html | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/doc/cluster_conf.html b/doc/cluster_conf.html
index 0a7c4eb..ab857f1 100644
--- a/doc/cluster_conf.html
+++ b/doc/cluster_conf.html
@@ -47,6 +47,9 @@
<<a href="#tag_resources">resources</a>><br/>
<a href="#ref_CHILDREN">CHILDREN</a><br/>
<<a href="#tag_resources">/resources</a>><br/>
+ <<a href="#tag_resource-defaults">resource-defaults</a>><br/>
+ <a href="#ref_CHILDREN">CHILDREN</a><br/>
+ <<a href="#tag_resource-defaults">/resource-defaults</a>><br/>
<a href="#ref_SERVICE">SERVICE</a><br/>
<a href="#ref_VM">VM</a><br/>
<<a href="#tag_rm">/rm</a>><br/>
@@ -245,6 +248,7 @@
<tr valign="top"><td><a href="#tag_postgres-8"><b>postgres-8</b></a></td><td>Defines a PostgreSQL server</td></tr>
<tr valign="top"><td><a href="#tag_quorumd"><b>quorumd</b></a></td><td>This element and its attributes define parameters for the quorum disk daemon, quorumd. qdisk(5).</td></tr>
<tr valign="top"><td><a href="#tag_resources"><b>resources</b></a></td><td>Defines global resources which may be referenced in services. You may redefine actions for resources here, but child resource definitions are ignored in this section.</td></tr>
+<tr valign="top"><td><a href="#tag_resource-defaults"><b>resource-defaults</b></a></td><td>This section allows the administrator to change defaults for resource agents. Overriding parameters which must be unique is not allowed. Overriding a value which, by default, inherits a value from a parent resource will disable inheritance for that resource type.</td></tr>
<tr valign="top"><td><a href="#tag_rm"><b>rm</b></a></td><td>This element and its attributes define resources (for example an IP address) required to create HA cluster services, the HA cluster services themselves, and failover domains for the HA cluster services.</td></tr>
<tr valign="top"><td><a href="#tag_samba"><b>samba</b></a></td><td>Dynamic smbd/nmbd resource agent</td></tr>
<tr valign="top"><td><a href="#tag_SAPDatabase"><b>SAPDatabase</b></a></td><td>SAP database resource agent</td></tr>
@@ -437,6 +441,7 @@ Defines the properties of a device used for fencing or unfencing a node. fenced(
<tr><td><b>power_timeout</b></td><td>Test X seconds for status change after ON/OFF</td></tr>
<tr><td><b>power_wait</b></td><td>Wait X seconds after issuing ON/OFF</td></tr>
<tr><td><b>pserver</b></td><td>The pserver to operate on. fence_egenera(8)</td></tr>
+ <tr><td><b>quiet</b></td><td>Supress output</td></tr>
<tr><td><b>retrans</b></td><td>Multicast retransmit time (in 1/10sec; default=20)</td></tr>
<tr><td><b>retry_on</b></td><td>Count of attempts to retry power on</td></tr>
<tr><td><b>ribcl</b></td><td>Force ribcl version to use</td></tr>
@@ -596,6 +601,7 @@ Defines fence device properties. fenced(8)<br/>
<tr><td><b>power_timeout</b></td><td>Test X seconds for status change after ON/OFF</td></tr>
<tr><td><b>power_wait</b></td><td>Wait X seconds after issuing ON/OFF</td></tr>
<tr><td><b>pserver</b></td><td>The pserver to operate on. fence_egenera(8)</td></tr>
+ <tr><td><b>quiet</b></td><td>Supress output</td></tr>
<tr><td><b>retrans</b></td><td>Multicast retransmit time (in 1/10sec; default=20)</td></tr>
<tr><td><b>retry_on</b></td><td>Count of attempts to retry power on</td></tr>
<tr><td><b>ribcl</b></td><td>Force ribcl version to use</td></tr>
@@ -991,6 +997,10 @@ Children: <a href="#tag_heuristic">heuristic</a> <br/><a href="#" onClick="histo
Defines global resources which may be referenced in services. You may redefine actions for resources here, but child resource definitions are ignored in this section.<br/>
<br/>
Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
+<h3><a name="tag_resource-defaults"/>resource-defaults</h3>
+This section allows the administrator to change defaults for resource agents. Overriding parameters which must be unique is not allowed. Overriding a value which, by default, inherits a value from a parent resource will disable inheritance for that resource type.<br/>
+<br/>
+Children: <a href="#ref_CHILDREN">CHILDREN</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_rm"/>rm</h3>
This element and its attributes define resources (for example an IP address) required to create HA cluster services, the HA cluster services themselves, and failover domains for the HA cluster services.<br/>
<br/>
@@ -1002,7 +1012,7 @@ This element and its attributes define resources (for example an IP address) req
<tr><td><b>status_poll_interval</b></td><td>Scan the resource tree every X seconds for resources which need to be checked.</td></tr>
<tr><td><b>transition_throttling</b></td><td>During transitions, keep the event processor alive for this many seconds.</td></tr>
</table><br/>
-Children: <a href="#tag_failoverdomains">failoverdomains</a> <a href="#tag_events">events</a> <a href="#tag_resources">resources</a> <a href="#ref_SERVICE">SERVICE</a> <a href="#ref_VM">VM</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
+Children: <a href="#tag_failoverdomains">failoverdomains</a> <a href="#tag_events">events</a> <a href="#tag_resources">resources</a> <a href="#tag_resource-defaults">resource-defaults</a> <a href="#ref_SERVICE">SERVICE</a> <a href="#ref_VM">VM</a> <br/><a href="#" onClick="history.go(-1)" />Back</a> | <a href="#toc_tag_reference">Contents</a>
<h3><a name="tag_samba"/>samba</h3>
Dynamic smbd/nmbd resource agent<br/>
<br/>
13 years, 8 months
cluster: STABLE3 - config: Add resource-defaults to ldif
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e9a8b4e4ed9463902620683e69750b71930e3b15
Parent: 17db8d14d8a3b9a79e025310a22c7a532fb67d97
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Sep 2 09:59:16 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Sep 2 09:59:16 2010 -0400
config: Add resource-defaults to ldif
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/plugins/ldap/99cluster.ldif | 7 ++++++-
config/plugins/ldap/ldap-base.csv | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index 9043321..5ad8f71 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2010-09-02 09:06:41
+# Auto-generated @ 2010-09-02 09:59:03
dn: cn=schema
attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version'
@@ -1763,6 +1763,11 @@ objectClasses: (
#objectClasses: (
# 1.3.6.1.4.1.2312.8.1.2.27 NAME 'rhcsResources' SUP top STRUCTURAL
# )
+### Placeholder for rhcsResource-defaults
+### This object class currently has no attributes
+#objectClasses: (
+# 1.3.6.1.4.1.2312.8.1.2.62 NAME 'rhcsResource-defaults' SUP top STRUCTURAL
+# )
objectClasses: (
1.3.6.1.4.1.2312.8.1.2.59 NAME 'rhcsClvmd' SUP top STRUCTURAL
MAY ( rhcsInterface )
diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv
index 1dc5029..ee8a560 100644
--- a/config/plugins/ldap/ldap-base.csv
+++ b/config/plugins/ldap/ldap-base.csv
@@ -1,5 +1,5 @@
# Max attribute value: 289
-# Max object class value: 61
+# Max object class value: 62
obj,rhcsCluster,cluster,1
obj,rhcsCman,cman,3
obj,rhcsTotem,totem,4
@@ -349,3 +349,4 @@ attr,rhcsDelay,delay,286
attr,rhcsMissing-as-off,missing_as_off,287
attr,rhcsEsh,esh,288
attr,rhcsQuiet,quiet,289
+obj,rhcsResource-defaults,resource-defaults,62
13 years, 8 months
cluster: STABLE3 - config: Add resource-defaults section
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 17db8d14d8a3b9a79e025310a22c7a532fb67d97
Parent: 5bddd1e21098a183560f64a569dd15fa8fdca1a8
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Sep 2 09:58:42 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Sep 2 09:58:42 2010 -0400
config: Add resource-defaults section
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index e5ee893..fad30ad 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -901,6 +901,13 @@ To validate your cluster.conf against this schema, run:
</zeroOrMore>
</element>
</optional>
+ <optional>
+ <element name="resource-defaults" rha:description="This section allows the administrator to change defaults for resource agents. Overriding parameters which must be unique is not allowed. Overriding a value which, by default, inherits a value from a parent resource will disable inheritance for that resource type.">
+ <zeroOrMore>
+ <ref name="CHILDREN"/>
+ </zeroOrMore>
+ </element>
+ </optional>
<zeroOrMore>
<ref name="SERVICE"/>
</zeroOrMore>
13 years, 8 months
cluster: STABLE3 - rgmanager: Add resource-defaults section
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 5bddd1e21098a183560f64a569dd15fa8fdca1a8
Parent: f30bf21ec0a72f214aa51669644301d35f7f4676
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Fri Apr 30 15:09:55 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Sep 2 09:28:15 2010 -0400
rgmanager: Add resource-defaults section
Allows resources to have defaults assigned in cluster.conf so
that they do not need to be copied to each resource individually.
* You cannot set defaults on unique/primary attributes
* You cannoy currently override actions in the resource-defaults
section.
<rm>
<resource-defaults>
<vm migration_mapping="host1:host1-priv,host2:host2-priv"
path="/mnt/guests/configs:/mnt/guests2/configs" />
</resource-defaults>
<vm name="foo" />
<vm name="foo2" /> <!-- will both have above migration_mapping
and path attributes -->
</rm>
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/include/reslist.h | 2 +
rgmanager/src/daemons/groups.c | 2 +
rgmanager/src/daemons/reslist.c | 97 ++++++++++++++++++++++++++++++++++++++
rgmanager/src/daemons/resrules.c | 10 ++++-
rgmanager/src/daemons/test.c | 3 +
5 files changed, 113 insertions(+), 1 deletions(-)
diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h
index 79cbbb4..575db8a 100644
--- a/rgmanager/include/reslist.h
+++ b/rgmanager/include/reslist.h
@@ -42,6 +42,7 @@
#define RESOURCE_ROOTDIR SHAREDIR
#define RESOURCE_TREE_ROOT "/cluster/rm"
#define RESOURCE_BASE RESOURCE_TREE_ROOT "/resources"
+#define RESOURCE_DEFAULTS RESOURCE_TREE_ROOT "/resource-defaults"
#define RESOURCE_ROOT_FMT RESOURCE_TREE_ROOT "/%s[%d]"
#define RESOURCE_MAX_LEVELS 100
@@ -146,6 +147,7 @@ int resource_tree_delta(resource_node_t **, resource_node_t **);
Load/kill resource rule sets
*/
int load_resource_rules(const char *rpath, resource_rule_t **rules);
+int load_resource_defaults(int ccsfd, resource_rule_t **rules);
void print_resource_rule(FILE *fp, resource_rule_t *rule);
void print_resource_rules(resource_rule_t **rules);
void dump_resource_rules(FILE *fp, resource_rule_t **rules);
diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c
index afce054..9e85186 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -1686,6 +1686,8 @@ init_resource_groups(int reconfigure, int do_init)
return -1;
}
+ load_resource_defaults(fd, &rulelist);
+
if (build_resource_tree(fd, &tree, &rulelist, &reslist) != 0) {
logt_print(LOG_CRIT, "#7: Error building resource tree\n");
destroy_resource_tree(&tree);
diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c
index c908166..e1695fb 100644
--- a/rgmanager/src/daemons/reslist.c
+++ b/rgmanager/src/daemons/reslist.c
@@ -890,3 +890,100 @@ load_resources(int ccsfd, resource_t **reslist, resource_rule_t **rulelist)
return 0;
}
+
+/**
+ Try to load all the attributes in our rule set. If none are found,
+ or an error occurs, return NULL and move on to the next one.
+
+ @param ccsfd File descriptor connected to CCS
+ @param rule Resource rule set to use when looking for data
+ @param base Base XPath path to start with.
+ @return New resource if legal or NULL on failure/error
+ */
+static int
+load_defaults(int ccsfd, resource_rule_t *rule, char *base)
+{
+ char ccspath[1024];
+ char *attrname, *attr;
+ int x, flags;
+
+ for (x = 0; rule->rr_attrs && rule->rr_attrs[x].ra_name; x++) {
+
+ flags = rule->rr_attrs[x].ra_flags;
+
+ /* Defaults for primary/unique may not be assigned */
+ if (flags & (RA_PRIMARY | RA_UNIQUE))
+ continue;
+ attrname = strdup(rule->rr_attrs[x].ra_name);
+ if (!attrname)
+ return -1;
+
+ attr = NULL;
+ snprintf(ccspath, sizeof(ccspath), "%s/@%s", base, attrname);
+
+#ifndef NO_CCS
+ if (ccs_get(ccsfd, ccspath, &attr) != 0) {
+#else
+ if (conf_get(ccspath, &attr) != 0) {
+#endif
+ free(attrname);
+ continue;
+ }
+
+ if (rule->rr_attrs[x].ra_value &&
+ !strcmp(rule->rr_attrs[x].ra_value, attr)) {
+ free(attrname);
+ free(attr);
+ continue;
+ }
+
+ if (rule->rr_attrs[x].ra_value) {
+ printf("changing default for %s attr %s from %s to %s\n", rule->rr_type,
+ rule->rr_attrs[x].ra_name, rule->rr_attrs[x].ra_value,
+ attr);
+ } else {
+ printf("setting default for %s attr %s to %s\n", rule->rr_type,
+ rule->rr_attrs[x].ra_name, attr);
+ }
+
+ flags &= ~RA_INHERIT;
+
+ /*
+ * Overwrite defaults
+ */
+ if (attrname && attr)
+ store_attribute(&rule->rr_attrs, attrname, attr, flags);
+ }
+
+ /* FIXME - add action support */
+
+ return 0;
+}
+
+
+/**
+ Read all resources in the resource manager block in CCS.
+
+ @param ccsfd File descriptor connected to CCS.
+ @param rulelist List of rules to use when searching CCS.
+ @return 0 on success, nonzero on failure.
+ */
+int
+load_resource_defaults(int ccsfd, resource_rule_t **rulelist)
+{
+ int rid = 0;
+ resource_rule_t *currule;
+ char tok[256];
+
+ list_for(rulelist, currule, rid) {
+
+ snprintf(tok, sizeof(tok), RESOURCE_DEFAULTS "/%s",
+ currule->rr_type);
+
+ if (load_defaults(ccsfd, currule, tok) != 0)
+ return -1;
+ }
+
+ return 0;
+}
+
diff --git a/rgmanager/src/daemons/resrules.c b/rgmanager/src/daemons/resrules.c
index 576c349..41bb6e8 100644
--- a/rgmanager/src/daemons/resrules.c
+++ b/rgmanager/src/daemons/resrules.c
@@ -467,7 +467,15 @@ store_attribute(resource_attr_t **attrsp, char *name, char *value, int flags)
return 0;
}
- for (x = 0; attrs[x].ra_name; x++);
+ for (x = 0; attrs[x].ra_name; x++) {
+ if (strcmp(attrs[x].ra_name, name) == 0) {
+ free(name);
+ free(attrs[x].ra_value);
+ attrs[x].ra_value = value;
+ attrs[x].ra_flags = flags;
+ return 0;
+ }
+ }
attrs = realloc(attrs, sizeof(resource_attr_t) * (x+2));
if (!attrs)
diff --git a/rgmanager/src/daemons/test.c b/rgmanager/src/daemons/test.c
index 1c7cae9..1982995 100644
--- a/rgmanager/src/daemons/test.c
+++ b/rgmanager/src/daemons/test.c
@@ -133,6 +133,7 @@ test_func(int argc, char **argv)
}
load_resource_rules(agentpath, &rulelist);
+ load_resource_defaults(ccsfd, &rulelist);
construct_domains(ccsfd, &domains);
construct_events(ccsfd, &events);
load_resources(ccsfd, &reslist, &rulelist);
@@ -283,6 +284,7 @@ tree_delta_test(int argc, char **argv)
}
load_resource_rules(agentpath, &rulelist);
+ load_resource_defaults(ccsfd, &rulelist);
load_resources(ccsfd, &reslist, &rulelist);
build_resource_tree(ccsfd, &tree, &rulelist, &reslist);
ccs_unlock(ccsfd);
@@ -297,6 +299,7 @@ tree_delta_test(int argc, char **argv)
}
load_resource_rules(agentpath, &rulelist2);
+ load_resource_defaults(ccsfd, &rulelist);
load_resources(ccsfd, &reslist2, &rulelist2);
build_resource_tree(ccsfd, &tree2, &rulelist2, &reslist2);
ccs_unlock(ccsfd);
13 years, 8 months
cluster: STABLE3 - config: Add hints for more fencing agents to cluster.rng
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: f30bf21ec0a72f214aa51669644301d35f7f4676
Parent: 48079d389591ad5a4ae6f1b8a981b50e2563dea6
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Sep 2 09:23:26 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Sep 2 09:23:26 2010 -0400
config: Add hints for more fencing agents to cluster.rng
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index a9366d9..e5ee893 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -2224,7 +2224,7 @@ To validate your cluster.conf against this schema, run:
<!-- begin non-generated device definitions -->
<!-- RPS10 -->
- <group rha:description="RPS10 Serial Switch" >
+ <group rha:fence_agent="fence_rps10" rha:description="RPS10 Serial Switch" >
<attribute name="device" rha:description="The device the switch
is connected to on the controlling host."
rha:sample="/dev/ttys2"/>
@@ -2235,6 +2235,8 @@ To validate your cluster.conf against this schema, run:
the auth and lanplus attributes. Those attributes apply only to
the impilan fence device.-->
<!-- Brocade, McData, SANBox2, Bladecenter,bullpap, ipmilan -->
+ <!-- FIXME split apart and add rha:fence_agent hints for
+ configuration utilities -->
<group>
<attribute name="ipaddr" rha:description="IP address or the name
of the device." rha:sample="rack007"/>
@@ -2264,7 +2266,7 @@ To validate your cluster.conf against this schema, run:
</optional>
</group>
<!-- Vixel -->
- <group>
+ <group rha:fence_agent="fence_vixel">
<optional>
<attribute name="ipaddr" rha:description="IP address or the
name of the device." rha:sample="10.1.0.1"/>
@@ -2282,7 +2284,7 @@ To validate your cluster.conf against this schema, run:
</optional>
</group>
<!-- scsi reservations -->
- <group>
+ <group rha:fence_agent="fence_scsi">
<optional>
<attribute name="nodename" rha:description="Name of the node to
be fenced. Refer to fence_scsi(8) for more
@@ -2310,7 +2312,7 @@ To validate your cluster.conf against this schema, run:
</optional>
</group>
<!-- GNBD -->
- <group>
+ <group rha:fence_agent="fence_gnbd">
<attribute name="servers" rha:description="The hostname of each
GNBD to disable. For multiple hostnames, separate each
hostname with a space." rha:sample=""/>
@@ -2321,7 +2323,7 @@ To validate your cluster.conf against this schema, run:
and pserver parameters. Also, in Conga, the esh parameter is
an optional ESH path. Presumably those should be attributes in
the schema. We need more invormation on this. -->
- <group>
+ <group rha:fence_agent="fence_egenera">
<optional>
<attribute name="cserver" rha:description="The hostname (and
optionally the username in the form of username@hostname)
@@ -2350,11 +2352,11 @@ To validate your cluster.conf against this schema, run:
<!-- FIXME: It appears that xCat is no longer supported. Found no
fence agents for x Cat in RHEL 5.3. -->
<!-- xCAT -->
- <group>
+ <group rha:fence_agent="fence_xcat">
<attribute name="rpowerpath" rha:description="" rha:sample=""/>
</group>
<!-- fence_xvm ( provided by fence-virt package ) -->
- <group>
+ <group rha:fence_agent="fence_xvm">
<optional>
<attribute name="option"/> <!-- deprecated; for compatibility. use "action" -->
</optional>
@@ -2399,8 +2401,7 @@ To validate your cluster.conf against this schema, run:
</optional>
</group>
- <!-- fence_virt -->
- <group>
+ <group rha:fence_agent="fence_virt">
<optional>
<attribute name="option"/> <!-- deprecated; for compatibility. use "action" -->
</optional>
@@ -2433,8 +2434,7 @@ To validate your cluster.conf against this schema, run:
</optional>
</group>
- <!-- fence_na -->
- <group>
+ <group rha:fence_agent="fence_na" rha:description="Node Assassin">
<optional>
<attribute name="option"/> <!-- deprecated; for compatibility. use "action" -->
</optional>
13 years, 8 months
cluster: the annotated tag cluster-3.0.16 has been created
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: cc0c68a80caac5620731b1242027cc53948c27f2
Parent: 0000000000000000000000000000000000000000
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: 2010-09-02 12:38 +0000
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: 2010-09-02 12:38 +0000
annotated tag: cluster-3.0.16 has been created
at cc0c68a80caac5620731b1242027cc53948c27f2 (tag)
tagging 48079d389591ad5a4ae6f1b8a981b50e2563dea6 (commit)
replaces cluster-3.0.15
cluster-3.0.16 release
Fabio M. Di Nitto (1):
cman: fix build with old headers (f12 and older)
13 years, 8 months
cluster: STABLE3 - cman: fix build with old headers (f12 and older)
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 48079d389591ad5a4ae6f1b8a981b50e2563dea6
Parent: 8287bba339dd09143e8c72296c789b3a3dc9b110
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Sep 2 13:02:29 2010 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Sep 2 13:02:29 2010 +0200
cman: fix build with old headers (f12 and older)
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/cman_tool/main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
index 886e6a7..61d29aa 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -4,6 +4,8 @@
#include <time.h>
#include <corosync/confdb.h>
#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include "copyright.cf"
#include "libcman.h"
#include "cman_tool.h"
13 years, 8 months
cluster: the annotated tag cluster-3.0.15 has been created
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 04aaac9ed4b920cc4292ac19d4fb21e5fc6bbd92
Parent: 0000000000000000000000000000000000000000
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: 2010-09-02 10:37 +0000
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: 2010-09-02 10:37 +0000
annotated tag: cluster-3.0.15 has been created
at 04aaac9ed4b920cc4292ac19d4fb21e5fc6bbd92 (tag)
tagging 8287bba339dd09143e8c72296c789b3a3dc9b110 (commit)
replaces cluster-3.0.14
cluster-3.0.15 release
Bob Peterson (3):
gfs2-utils: mkfs can't fsync device with 32MB RGs
fsck.gfs2 deletes directories if they get too big
fsck.gfs2 segfaults if journals are missing
David Teigland (5):
dlm_controld: fix save_plocks initialization
dlm_controld: fix plock owner syncing
dlm_controld: fix plock signature in stored message
Revert "dlm_controld: fix save_plocks initialization"
dlm_controld: ignore plocks until checkpoint time
Fabio M. Di Nitto (11):
cman: do not propagate old configurations around
fence_na: import files pristine from upstream
build: fix man page install from outside source tree
fence_na: first cut at the Makefile
fence_na: add example config file
build: rename CONFFILEEXAMPLE to EXTRACONFFILE
fence_na: generate files based on configure invokation
fence_na: fix last installation bits required to work in our build env
fence_na: add copyright/author information
fence_na: add support to the validation schema
config: Update ldif schema
Lon Hohberger (13):
cman: Make qdiskd exit if removed from configuration
cman: Clarify man page on config distribution
rgmanager: Fix clustat return code
rgmanager: Honor restricted FDs during migrations
config: Add missing fence-agent options to RNG schema
config: Add missing fence-agent options to LDAP schema
rgmanager: Present flags in clustat output
config: Fix broken fence_egenera options
config: Add fence_egenera options to ldif
doc: Update autogenerated documentation
rgmanager: fix compiler warning in clulog.c
config: Present fencing agent name in metadata
config: Add fencing agent name to group for clarity
Marek 'marx' Grac (5):
fence_drac5: make "port" a synonym of "module_name" for drac5
fencing: Method to cause one node to delay fencing
fencing: Method to cause one node to delay fencing [2]
fencing: Method to cause one node to delay fencing - drac, egenera
fencing: Method to cause one node to delay fencing - ipmilan
Ryan O'Hara (1):
Fix syntax error in code that opens logfile.
13 years, 8 months
cluster: STABLE3 - config: Update ldif schema
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 8287bba339dd09143e8c72296c789b3a3dc9b110
Parent: d2e88b84eb6878e310ec4c2bfba67f601157f02a
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Sep 2 09:10:01 2010 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Sep 2 09:10:01 2010 +0200
config: Update ldif schema
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
config/plugins/ldap/99cluster.ldif | 12 +++++++++---
config/plugins/ldap/ldap-base.csv | 3 ++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index f66996c..9043321 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2010-08-31 10:12:20
+# Auto-generated @ 2010-09-02 09:06:41
dn: cn=schema
attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version'
@@ -679,6 +679,12 @@ attributeTypes: (
SINGLE-VALUE
)
attributeTypes: (
+ 1.3.6.1.4.1.2312.8.1.1.289 NAME 'rhcsQuiet'
+ EQUALITY caseExactIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE
+ )
+attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.59 NAME 'rhcsExec'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
@@ -1718,7 +1724,7 @@ objectClasses: (
objectClasses: (
1.3.6.1.4.1.2312.8.1.2.5 NAME 'rhcsFencedevice' SUP top STRUCTURAL
MUST ( rhcsAgent $ name )
- MAY ( rhcsRibcl $ rhcsSsl $ rhcsIo-fencing $ rhcsSwitch $ rhcsModule-name $ rhcsDrac-version $ rhcsUdpport $ rhcsSnmp-priv-passwd-script $ rhcsSnmp-priv-passwd $ rhcsSnmp-priv-prot $ rhcsSnmp-sec-level $ rhcsSnmp-auth-prot $ rhcsCommunity $ rhcsSnmp-version $ rhcsMissing-as-off $ rhcsInet6-only $ rhcsInet4-only $ rhcsCmd-prompt $ rhcsHmc-version $ rhcsManaged $ rhcsPartition $ rhcsRetry-on $ rhcsPower-wait $ rhcsLogin-timeout $ rhcsShell-timeout $ rhcsPower-timeout $ rhcsSeparator $ rhcsHelp $ rhcsVersion $ rhcsVerbose $ rhcsVmware-datacenter $ rhcsIdentity-file $ rhcsSecure $ rhcsVmware-type $ rhcsExec $ rhcsChannel-address $ rhcsSerial-params $ rhcsSerial-device $ rhcsTimeout $ rhcsUse-uuid $ rhcsDomain $ rhcsKey-file $ rhcsHash $ rhcsRetrans $ rhcsIpport $ rhcsMulticast-address $ rhcsIp-family $ rhcsDebug $ rhcsOption $ rhcsRpowerpath $ rhcsDelay $ rhcsUser $ rhcsEsh $ rhcsLpan $ rhcsPserver $ rhcsCserver $ rhcsServers $ rhcsAptpl $ rhcsLogfile $ rhcsAction $ rhcsDevices $ rhcsKey $ rhcsNodename $ rhcsLanplus $ rhcsAuth $ rhcsPasswd-script $ rhcsPasswd $ rhcsLogin $ rhcsIpaddr $ rhcsPort $ rhcsDevice )
+ MAY ( rhcsRibcl $ rhcsSsl $ rhcsIo-fencing $ rhcsSwitch $ rhcsModule-name $ rhcsDrac-version $ rhcsUdpport $ rhcsSnmp-priv-passwd-script $ rhcsSnmp-priv-passwd $ rhcsSnmp-priv-prot $ rhcsSnmp-sec-level $ rhcsSnmp-auth-prot $ rhcsCommunity $ rhcsSnmp-version $ rhcsMissing-as-off $ rhcsInet6-only $ rhcsInet4-only $ rhcsCmd-prompt $ rhcsHmc-version $ rhcsManaged $ rhcsPartition $ rhcsRetry-on $ rhcsPower-wait $ rhcsLogin-timeout $ rhcsShell-timeout $ rhcsPower-timeout $ rhcsSeparator $ rhcsHelp $ rhcsVersion $ rhcsVerbose $ rhcsVmware-datacenter $ rhcsIdentity-file $ rhcsSecure $ rhcsVmware-type $ rhcsExec $ rhcsQuiet $ rhcsChannel-address $ rhcsSerial-params $ rhcsSerial-device $ rhcsTimeout $ rhcsUse-uuid $ rhcsDomain $ rhcsKey-file $ rhcsHash $ rhcsRetrans $ rhcsIpport $ rhcsMulticast-address $ rhcsIp-family $ rhcsDebug $ rhcsOption $ rhcsRpowerpath $ rhcsDelay $ rhcsUser $ rhcsEsh $ rhcsLpan $ rhcsPserver $ rhcsCserver $ rhcsServers $ rhcsAptpl $ rhcsLogfile $ rhcsAction $ rhcsDevices $ rhcsKey $ rhcsNodename $ rhcsLanplus $ rhcsAuth $ rhcsPasswd-script $ rhcsPasswd $ rhcsLogin $ rhcsIpaddr $ rhcsPort $ rhcsDevice )
)
objectClasses: (
1.3.6.1.4.1.2312.8.1.2.21 NAME 'rhcsRm' SUP top STRUCTURAL
@@ -1884,5 +1890,5 @@ objectClasses: (
objectClasses: (
1.3.6.1.4.1.2312.8.1.2.6 NAME 'rhcsDevice' SUP top STRUCTURAL
MUST ( name )
- MAY ( rhcsRibcl $ rhcsSsl $ rhcsIo-fencing $ rhcsSwitch $ rhcsModule-name $ rhcsDrac-version $ rhcsUdpport $ rhcsSnmp-priv-passwd-script $ rhcsSnmp-priv-passwd $ rhcsSnmp-priv-prot $ rhcsSnmp-sec-level $ rhcsSnmp-auth-prot $ rhcsCommunity $ rhcsSnmp-version $ rhcsMissing-as-off $ rhcsInet6-only $ rhcsInet4-only $ rhcsCmd-prompt $ rhcsHmc-version $ rhcsManaged $ rhcsPartition $ rhcsRetry-on $ rhcsPower-wait $ rhcsLogin-timeout $ rhcsShell-timeout $ rhcsPower-timeout $ rhcsSeparator $ rhcsHelp $ rhcsVersion $ rhcsVerbose $ rhcsVmware-datacenter $ rhcsIdentity-file $ rhcsSecure $ rhcsVmware-type $ rhcsExec $ rhcsChannel-address $ rhcsSerial-params $ rhcsSerial-device $ rhcsTimeout $ rhcsUse-uuid $ rhcsDomain $ rhcsKey-file $ rhcsHash $ rhcsRetrans $ rhcsIpport $ rhcsMulticast-address $ rhcsIp-family $ rhcsDebug $ rhcsOption $ rhcsRpowerpath $ rhcsDelay $ rhcsUser $ rhcsEsh $ rhcsLpan $ rhcsPserver $ rhcsCserver $ rhcsServers $ rhcsAptpl $ rhcsLogfile $ rhcsAction $ rhcsDevices $ rhcsKey $ rhcsNodename $ rhcsLanplus $ rhcsAuth $ rhcsPasswd-script $ rhcsPasswd $ rhcsLogin $ rhcsIpaddr $ rhcsPort $ rhcsDevice )
+ MAY ( rhcsRibcl $ rhcsSsl $ rhcsIo-fencing $ rhcsSwitch $ rhcsModule-name $ rhcsDrac-version $ rhcsUdpport $ rhcsSnmp-priv-passwd-script $ rhcsSnmp-priv-passwd $ rhcsSnmp-priv-prot $ rhcsSnmp-sec-level $ rhcsSnmp-auth-prot $ rhcsCommunity $ rhcsSnmp-version $ rhcsMissing-as-off $ rhcsInet6-only $ rhcsInet4-only $ rhcsCmd-prompt $ rhcsHmc-version $ rhcsManaged $ rhcsPartition $ rhcsRetry-on $ rhcsPower-wait $ rhcsLogin-timeout $ rhcsShell-timeout $ rhcsPower-timeout $ rhcsSeparator $ rhcsHelp $ rhcsVersion $ rhcsVerbose $ rhcsVmware-datacenter $ rhcsIdentity-file $ rhcsSecure $ rhcsVmware-type $ rhcsExec $ rhcsQuiet $ rhcsChannel-address $ rhcsSerial-params $ rhcsSerial-device $ rhcsTimeout $ rhcsUse-uuid $ rhcsDomain $ rhcsKey-file $ rhcsHash $ rhcsRetrans $ rhcsIpport $ rhcsMulticast-address $ rhcsIp-family $ rhcsDebug $ rhcsOption $ rhcsRpowerpath $ rhcsDelay $ rhcsUser $ rhcsEsh $ rhcsLpan $ rhcsPserver $ rhcsCserver $ rhcsServers $ rhcsAptpl $ rhcsLogfile $ rhcsAction $ rhcsDevices $ rhcsKey $ rhcsNodename $ rhcsLanplus $ rhcsAuth $ rhcsPasswd-script $ rhcsPasswd $ rhcsLogin $ rhcsIpaddr $ rhcsPort $ rhcsDevice )
)
diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv
index 7e6ccf3..1dc5029 100644
--- a/config/plugins/ldap/ldap-base.csv
+++ b/config/plugins/ldap/ldap-base.csv
@@ -1,4 +1,4 @@
-# Max attribute value: 288
+# Max attribute value: 289
# Max object class value: 61
obj,rhcsCluster,cluster,1
obj,rhcsCman,cman,3
@@ -348,3 +348,4 @@ attr,rhcsRetry-on,retry_on,285
attr,rhcsDelay,delay,286
attr,rhcsMissing-as-off,missing_as_off,287
attr,rhcsEsh,esh,288
+attr,rhcsQuiet,quiet,289
13 years, 8 months