cluster-commits February 2011

cluster-commits@lists.fedorahosted.org

7 participants
135 discussions

cluster: RHEL6 - rgmanager: Header cleanup
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=52… Commit: 5203d9eefe530a13525dc32d9f48568fbabfd495 Parent: ca924c428bbf149531f896b52c9ba6f1597c634b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Aug 25 13:32:19 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:29:56 2011 -0500 rgmanager: Header cleanup Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/res-ocf.h | 1 + rgmanager/include/resgroup.h | 3 +++ rgmanager/include/reslist.h | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/res-ocf.h b/rgmanager/include/res-ocf.h index 557e128..cc65a4d 100644 --- a/rgmanager/include/res-ocf.h +++ b/rgmanager/include/res-ocf.h @@ -48,5 +48,6 @@ #define RS_MIGRATE (13) #define RS_RECONFIG (14) #define RS_STATUS_INQUIRY (15) /** Quick status */ +#define RS_CONVALESCE (16) #endif diff --git a/rgmanager/include/resgroup.h b/rgmanager/include/resgroup.h index c639315..13b4dae 100644 --- a/rgmanager/include/resgroup.h +++ b/rgmanager/include/resgroup.h @@ -100,6 +100,7 @@ extern size_t rg_state_t_version_sizes[]; #define RG_FREEZE 23 #define RG_UNFREEZE 24 #define RG_STATUS_INQUIRY 25 +#define RG_CONVALESCE 26 #define RG_NONE 999 const char *rg_req_str(int req); @@ -129,6 +130,8 @@ int handle_start_remote_req(char *svcName, int req); /* Resource group flags (for now) */ #define RG_FLAG_FROZEN (1<<0) /** Resource frozen */ +#define RG_FLAG_PARTIAL (1<<1) /** One or more non-critical + resources offline */ const char *rg_state_str(int val); const char *rg_flag_str(int val); diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 8376478..142fce6 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -28,7 +28,7 @@ resource class if you delete it from the configuration */ #define RF_ENFORCE_TIMEOUTS (1<<9) /** Enforce timeouts for this node */ -#define RF_NON_CRITCIAL (1<<10) /** stop this resource if it fails */ +#define RF_NON_CRITICAL (1<<10) /** stop this resource if it fails */

1 0

cluster: RHEL6 - rgmanager: Add non-critical base behavior
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ca… Commit: ca924c428bbf149531f896b52c9ba6f1597c634b Parent: 16ab187d7733c653dddc3e1b9cd90524ccdf8947 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed Aug 25 13:17:24 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:29:29 2011 -0500 rgmanager: Add non-critical base behavior Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/restree.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 5f37716..e480cc8 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -663,6 +663,13 @@ do_load_resource(int ccsfd, char *base, curres->r_flags &= ~RF_NON_CRITICAL; } + if (curres->r_flags & RF_NON_CRITICAL) { + /* Independent subtree is implied if a + * resource is non-critical + */ + node->rn_flags |= RF_NON_CRITICAL | RF_INDEPENDENT; + } + *newnode = node; list_insert(tree, node); @@ -1451,8 +1458,13 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree, the resource tree. */ if (op == RS_STATUS && (rv & SFL_FAILURE) && (node->rn_flags & RF_INDEPENDENT)) { - mark_nodes(node, RES_FAILED, - RF_NEEDSTART | RF_NEEDSTOP, 0); + if (node->rn_flags & RF_NON_CRITICAL) + /* if non-critical, just stop */ + mark_nodes(node, RES_FAILED, + RF_NEEDSTOP, 0); + else + mark_nodes(node, RES_FAILED, + RF_NEEDSTOP | RF_NEEDSTART, 0); rv = SFL_RECOVERABLE; } }

1 0

cluster: RHEL6 - rgmanager: Add non-critical flag to resources
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=16… Commit: 16ab187d7733c653dddc3e1b9cd90524ccdf8947 Parent: 0a4a433df0274085d6cb530c529740b77fbb93f0 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Thu Aug 12 16:28:59 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 12:29:08 2011 -0500 rgmanager: Add non-critical flag to resources Resolves: rhbz#634277 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/include/reslist.h | 1 + rgmanager/src/daemons/restree.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 79cbbb4..8376478 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -28,6 +28,7 @@ resource class if you delete it from the configuration */ #define RF_ENFORCE_TIMEOUTS (1<<9) /** Enforce timeouts for this node */ +#define RF_NON_CRITCIAL (1<<10) /** stop this resource if it fails */ diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index 1ae9746..5f37716 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -605,8 +605,11 @@ do_load_resource(int ccsfd, char *base, #else if (conf_get(tok, &ref) == 0) { #endif - if (atoi(ref) > 0 || strcasecmp(ref, "yes") == 0) + if (atoi(ref) == 1 || strcasecmp(ref, "yes") == 0) node->rn_flags |= RF_INDEPENDENT; + if (atoi(ref) == 2 || strcasecmp(ref, "non-critical") == 0) { + curres->r_flags |= RF_NON_CRITICAL; + } free(ref); } @@ -653,6 +656,13 @@ do_load_resource(int ccsfd, char *base, curres->r_refs++; + if (curres->r_refs > 1 && + (curres->r_flags & RF_NON_CRITICAL)) { + res_build_name(tok, sizeof(tok), curres); + printf("Non-critical flag for %s is being cleared due to multiple references.\n", tok); + curres->r_flags &= ~RF_NON_CRITICAL; + } + *newnode = node; list_insert(tree, node); @@ -941,6 +951,8 @@ _print_resource_tree(FILE *fp, resource_node_t **tree, int level) fprintf(fp, "DESTROY "); if (node->rn_flags & RF_ENFORCE_TIMEOUTS) fprintf(fp, "ENFORCE-TIMEOUTS "); + if (node->rn_flags & RF_NON_CRITICAL) + fprintf(fp, "NON-CRITICAL "); fprintf(fp, "]"); } fprintf(fp, " {\n");

1 0

cluster: RHEL6 - qdisk: Informational syslog message indicating label overrides device
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0a… Commit: 0a4a433df0274085d6cb530c529740b77fbb93f0 Parent: b0aa94c16ee8b018858c138c8b997e1673828610 Author: Jeremy Miller <csf1dsh(a)ups.com> AuthorDate: Tue Feb 1 11:52:54 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 11:54:44 2011 -0500 qdisk: Informational syslog message indicating label overrides device When user specifies both quorum label and quorum device (ccs allows this), the user isn't notified that the label will override the device when searching through disks for the quorum partition. This can mislead the user into thinking that qdiskd will in fact use the quorum device they specified. This can have serious consequences when the user intends qdiskd to use a specified a multipath device such as "/dev/mapper/qdisk", but in actuality qdiskd will just use the first device it finds with matching user specified label (for example "/dev/dm-17"). According to Red Hat documentation, when using multipath, one should always use /dev/mapper/xxx devices to ensure proper path failover, rather than /dev/dm-xx or /dev/mpath/xxx devices. Resolves: rhbz#635413 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/qdisk/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 617a705..ebdb018 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1746,6 +1746,11 @@ get_static_config_data(qd_ctx *ctx, int ccsfd) snprintf(query, sizeof(query), "/cluster/quorumd/@label"); if (ccs_get(ccsfd, query, &val) == 0) { ctx->qc_label = val; + /* courtesy info message */ + if (ctx->qc_device) + logt_print(LOG_INFO, "Quorum Label (%s) will be used to " + "locate quorum partition, overriding Quorum Device\n", + ctx->qc_label); } if (!ctx->qc_device && !ctx->qc_label) {

1 0

cluster: STABLE31 - qdisk: Informational syslog message indicating label overrides device
by Lon Hohberger 01 Feb '11

01 Feb '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8c… Commit: 8cb4fbc7e7ffc16cfffcc1a14a3253830a77f69d Parent: 5822073b63d1b83af623bb3c72dccc97f4eb2e27 Author: Jeremy Miller <csf1dsh(a)ups.com> AuthorDate: Tue Feb 1 11:52:54 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Feb 1 11:52:54 2011 -0500 qdisk: Informational syslog message indicating label overrides device When user specifies both quorum label and quorum device (ccs allows this), the user isn't notified that the label will override the device when searching through disks for the quorum partition. This can mislead the user into thinking that qdiskd will in fact use the quorum device they specified. This can have serious consequences when the user intends qdiskd to use a specified a multipath device such as "/dev/mapper/qdisk", but in actuality qdiskd will just use the first device it finds with matching user specified label (for example "/dev/dm-17"). According to Red Hat documentation, when using multipath, one should always use /dev/mapper/xxx devices to ensure proper path failover, rather than /dev/dm-xx or /dev/mpath/xxx devices. Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/qdisk/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 617a705..ebdb018 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1746,6 +1746,11 @@ get_static_config_data(qd_ctx *ctx, int ccsfd) snprintf(query, sizeof(query), "/cluster/quorumd/@label"); if (ccs_get(ccsfd, query, &val) == 0) { ctx->qc_label = val; + /* courtesy info message */ + if (ctx->qc_device) + logt_print(LOG_INFO, "Quorum Label (%s) will be used to " + "locate quorum partition, overriding Quorum Device\n", + ctx->qc_label); } if (!ctx->qc_device && !ctx->qc_label) {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits February 2011