May 2012 - cluster-commits - Fedora mailing-lists

dlm: master - dlm_tool: print lockspace toss debugfs list
by David Teigland 14 May '12

14 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=81… Commit: 81525d747202084fd878f27b51bba10156485467 Parent: 995ead49d7aeab6c3e65a55119976ae85a4d3767 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Aug 19 10:46:51 2011 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri May 4 14:41:09 2012 -0500 dlm_tool: print lockspace toss debugfs list Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_tool/main.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlm_tool/main.c b/dlm_tool/main.c index 36f8bf8..a512f9c 100644 --- a/dlm_tool/main.c +++ b/dlm_tool/main.c @@ -119,6 +119,7 @@ struct summary { unsigned int lkb_local_copy; unsigned int lkb_process_copy; unsigned int expect_replies; + unsigned int toss_total; }; static const char *mode_str(int mode) @@ -735,6 +736,63 @@ static void print_lkb(char *line, struct rinfo *ri) printf("%s\n", pr_verbose(&lkb)); } +static void print_rsb_toss(char *line) +{ + char type[4], namefmt[4], *p; + char addr[64]; + char toss_time[16]; + int res_nodeid, master_nodeid, dir_nodeid, our_nodeid; + int rv, namelen; + uint32_t flags; + + rv = sscanf(line, "%s %s %d %d %d %d %s %u %u %s", + type, + addr, + &res_nodeid, + &master_nodeid, + &dir_nodeid, + &our_nodeid, + toss_time, + &flags, + &namelen, + namefmt); + + if (rv != 10) + goto fail; + + p = strchr(line, '\n'); + if (!p) + goto fail; + *p = '\0'; + + p = strstr(line, namefmt); + if (!p) + goto fail; + p += 4; + + strcat(addr, " "); + + if (!strncmp(namefmt, "str", 3)) + printf("Resource len %2d \"%s\"\n", namelen, p); + else if (!strncmp(namefmt, "hex", 3)) + printf("Resource len %2d hex %s\n", namelen, p); + else + goto fail; + + printf("Dir %d master %d our %d ", + dir_nodeid, master_nodeid, our_nodeid); + + if (master_nodeid == our_nodeid && res_nodeid != 0) + printf("res %d", res_nodeid); + + printf("\n"); + + return; + + fail: + fprintf(stderr, "print_rsb error rv %d line \"%s\"\n", rv, line); +} + static void clear_rinfo(struct rinfo *ri) { memset(ri, 0, sizeof(struct rinfo)); @@ -780,13 +838,14 @@ static void count_rinfo(struct summary *s, struct rinfo *ri) static void print_summary(struct summary *s) { printf("rsb\n"); - printf(" total %u\n", s->rsb_total); + printf(" active %u\n", s->rsb_total); printf(" master %u\n", s->rsb_master); printf(" remote master %u\n", s->rsb_local); printf(" lookup master %u\n", s->rsb_lookup); printf(" with lvb %u\n", s->rsb_with_lvb); printf(" with no locks %u\n", s->rsb_no_locks); printf(" nodeid error %u\n", s->rsb_nodeid_error); + printf(" inactive %u\n", s->toss_total); printf("\n"); printf("lkb\n"); @@ -860,6 +919,31 @@ static void do_waiters(char *name, struct summary *sum) fclose(file); } +static void do_toss(char *name, struct summary *sum) +{ + FILE *file; + char path[PATH_MAX]; + char line[LOCK_LINE_MAX]; + + snprintf(path, PATH_MAX, "/sys/kernel/debug/dlm/%s_toss", name); + + file = fopen(path, "r"); + if (!file) + return; + + while (fgets(line, LOCK_LINE_MAX, file)) { + if (!strncmp(line, "version", 7)) + continue; + + if (!strncmp(line, "rsb", 3)) { + print_rsb_toss(line); + sum->toss_total++; + printf("\n"); + } + } + fclose(file); +} + static void do_lockdebug(char *name) { struct summary summary; @@ -914,8 +998,13 @@ static void do_lockdebug(char *name) raw: printf("%s", line); } + count_rinfo(&summary, &info); + clear_rinfo(&info); + printf("\n"); fclose(file); + do_toss(name, &summary); + do_waiters(name, &summary); if (summarize) {

1 0

cluster: RHEL6 - cpglockd: Fix a hang triggered when fencing completes in less than 1s
by Ryan McCabe 14 May '12

14 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e0… Commit: e01a564837cc5f5310a046da3c71f995c301e649 Parent: e577c6d731c33b8309f02d7805d5a6fa59da5773 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Mon May 14 10:34:48 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon May 14 10:43:53 2012 -0400 cpglockd: Fix a hang triggered when fencing completes in less than 1s Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/cpglockd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/cpglockd.c b/rgmanager/src/daemons/cpglockd.c index 1a5832c..95cb371 100644 --- a/rgmanager/src/daemons/cpglockd.c +++ b/rgmanager/src/daemons/cpglockd.c @@ -1655,9 +1655,9 @@ main(int argc, char **argv) lft = fn.last_fenced_time; } - if (lft > pf_node->fail_time) { + if (lft >= pf_node->fail_time) { logt_print(LOG_DEBUG, - "Fencing for node %d finished at %ld (>%ld)\n", + "Fencing for node %d finished at %ld (lost at %ld)\n", pf_node->nodeid, lft, pf_node->fail_time); list_remove(&pending_fencing, pf_node); free(pf_node);

1 0

cluster: STABLE32 - cpglockd: Fix a hang triggered when fencing completes in less than 1s
by Ryan McCabe 14 May '12

14 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=19… Commit: 199101a3d89bc14ff99394f69cd0861b37b862b3 Parent: 6329b3688fca66f5821dedb3f98268c06d2ef122 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Mon May 14 10:34:48 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Mon May 14 10:34:48 2012 -0400 cpglockd: Fix a hang triggered when fencing completes in less than 1s Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/cpglockd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/cpglockd.c b/rgmanager/src/daemons/cpglockd.c index 1a5832c..95cb371 100644 --- a/rgmanager/src/daemons/cpglockd.c +++ b/rgmanager/src/daemons/cpglockd.c @@ -1655,9 +1655,9 @@ main(int argc, char **argv) lft = fn.last_fenced_time; } - if (lft > pf_node->fail_time) { + if (lft >= pf_node->fail_time) { logt_print(LOG_DEBUG, - "Fencing for node %d finished at %ld (>%ld)\n", + "Fencing for node %d finished at %ld (lost at %ld)\n", pf_node->nodeid, lft, pf_node->fail_time); list_remove(&pending_fencing, pf_node); free(pf_node);

1 0

cluster: RHEL62 - cmannotifyd: deliver cluster status at startup and fix daemon init
by Fabio M. Di Nitto 09 May '12

09 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=18… Commit: 188a980e506b14cfdf94de9129360dd10f5a53d6 Parent: 17bacf59aea4f2d021ba8127f71e9d840703b692 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue May 8 14:22:25 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed May 9 20:30:14 2012 +0200 cmannotifyd: deliver cluster status at startup and fix daemon init cmannotifyd is very often (if not always) started _after_ cman is completely settled. That means cmannotifyd does not receive/dispatch any notifications on the current cluster status at startup. change cman connection loop to generate a fake notification that config and membership have changed (we can't poll if they did) and use those information internally too, to reinit logging with new cman connection. Resolves: rhbz#820357 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- cman/notifyd/main.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index d5c90c5..a5fe323 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -201,6 +201,10 @@ static void init_logging(int reconf) ccs_read_logging(ccs_handle, "cmannotifyd", &debug, &mode, &syslog_facility, &syslog_priority, &logfile_priority, logfile); ccs_disconnect(ccs_handle); + } else { + if (debug) { + logfile_priority = LOG_DEBUG; + } } if (!daemonize) @@ -320,6 +324,8 @@ static void byebye_cman(void) static void setup_cman(int forever) { int init = 0, active = 0; + int quorate; + const char *str = NULL; retry_init: cman_handle = cman_init(NULL); @@ -355,6 +361,14 @@ retry_active: exit(EXIT_FAILURE); } + logt_print(LOG_DEBUG, "Dispatching first cluster status\n"); + init_logging(1); + str = "CMAN_REASON_CONFIG_UPDATE"; + dispatch_notification(str, 0); + str = "CMAN_REASON_STATECHANGE"; + quorate = cman_is_quorate(cman_handle); + dispatch_notification(str, &quorate); + return; out:

1 0

cluster: RHEL6 - cmannotifyd: deliver cluster status at startup and fix daemon init
by Fabio M. Di Nitto 08 May '12

08 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e5… Commit: e577c6d731c33b8309f02d7805d5a6fa59da5773 Parent: 854cf3464251cdb132b9768cefb849d49ec1d4a9 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue May 8 14:22:25 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue May 8 15:27:03 2012 +0200 cmannotifyd: deliver cluster status at startup and fix daemon init cmannotifyd is very often (if not always) started _after_ cman is completely settled. That means cmannotifyd does not receive/dispatch any notifications on the current cluster status at startup. change cman connection loop to generate a fake notification that config and membership have changed (we can't poll if they did) and use those information internally too, to reinit logging with new cman connection. Resolves: rhbz#819787 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- cman/notifyd/main.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index d5c90c5..a5fe323 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -201,6 +201,10 @@ static void init_logging(int reconf) ccs_read_logging(ccs_handle, "cmannotifyd", &debug, &mode, &syslog_facility, &syslog_priority, &logfile_priority, logfile); ccs_disconnect(ccs_handle); + } else { + if (debug) { + logfile_priority = LOG_DEBUG; + } } if (!daemonize) @@ -320,6 +324,8 @@ static void byebye_cman(void) static void setup_cman(int forever) { int init = 0, active = 0; + int quorate; + const char *str = NULL; retry_init: cman_handle = cman_init(NULL); @@ -355,6 +361,14 @@ retry_active: exit(EXIT_FAILURE); } + logt_print(LOG_DEBUG, "Dispatching first cluster status\n"); + init_logging(1); + str = "CMAN_REASON_CONFIG_UPDATE"; + dispatch_notification(str, 0); + str = "CMAN_REASON_STATECHANGE"; + quorate = cman_is_quorate(cman_handle); + dispatch_notification(str, &quorate); + return; out:

1 0

cluster: RHEL6 - qdisk: Fix man page example (take 2)
by Fabio M. Di Nitto 08 May '12

08 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=85… Commit: 854cf3464251cdb132b9768cefb849d49ec1d4a9 Parent: 7a97ab473e6c2c82fe5bfd964e545895aea81d8e Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue May 8 06:02:13 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue May 8 15:25:38 2012 +0200 qdisk: Fix man page example (take 2) Resolves: rhbz#745538 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> Reviewed-by: Lon Hohberger <lhh(a)redhat.com> --- cman/man/qdisk.5 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cman/man/qdisk.5 b/cman/man/qdisk.5 index e0b0ff6..ca974fa 100644 --- a/cman/man/qdisk.5 +++ b/cman/man/qdisk.5 @@ -479,11 +479,11 @@ by the qdiskd timeout. .br <quorumd interval="1" tko="10" votes="3" label="testing"> .in 12 -<heuristic program="ping A -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping A -c1 -w1" score="1" interval="2" tko="3"/> .br -<heuristic program="ping B -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping B -c1 -w1" score="1" interval="2" tko="3"/> .br -<heuristic program="ping C -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping C -c1 -w1" score="1" interval="2" tko="3"/> .br .in 8 </quorumd>

1 0

cluster: STABLE32 - cmannotifyd: deliver cluster status at startup and fix daemon init
by Fabio M. Di Nitto 08 May '12

08 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=63… Commit: 6329b3688fca66f5821dedb3f98268c06d2ef122 Parent: dcdb07c5d999d5f4b567a253268c71a14c5475cb Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue May 8 14:22:25 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue May 8 14:22:25 2012 +0200 cmannotifyd: deliver cluster status at startup and fix daemon init cmannotifyd is very often (if not always) started _after_ cman is completely settled. That means cmannotifyd does not receive/dispatch any notifications on the current cluster status at startup. change cman connection loop to generate a fake notification that config and membership have changed (we can't poll if they did) and use those information internally too, to reinit logging with new cman connection. Resolves: rhbz#819787 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/notifyd/main.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index 3091d2f..4a9f868 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -189,6 +189,10 @@ static void init_logging(int reconf) ccs_read_logging(ccs_handle, "cmannotifyd", &debug, &mode, &syslog_facility, &syslog_priority, &logfile_priority, logfile); ccs_disconnect(ccs_handle); + } else { + if (debug) { + logfile_priority = LOG_DEBUG; + } } if (!daemonize) @@ -311,6 +315,8 @@ static void byebye_cman(void) static void setup_cman(int forever) { int init = 0, active = 0; + int quorate; + const char *str = NULL; retry_init: cman_handle = cman_init(NULL); @@ -346,6 +352,14 @@ retry_active: exit(EXIT_FAILURE); } + logt_print(LOG_DEBUG, "Dispatching first cluster status\n"); + init_logging(1); + str = "CMAN_REASON_CONFIG_UPDATE"; + dispatch_notification(str, 0); + str = "CMAN_REASON_STATECHANGE"; + quorate = cman_is_quorate(cman_handle); + dispatch_notification(str, &quorate); + return; out:

1 0

cluster: STABLE32 - qdisk: Fix man page example (take 2)
by Fabio M. Di Nitto 07 May '12

07 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=dc… Commit: dcdb07c5d999d5f4b567a253268c71a14c5475cb Parent: c97149047acc1ba3ee502887877d1cfefbb94ea2 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue May 8 06:02:13 2012 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue May 8 06:02:13 2012 +0200 qdisk: Fix man page example (take 2) Resolves: rhbz#745538 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/man/qdisk.5 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cman/man/qdisk.5 b/cman/man/qdisk.5 index e0b0ff6..ca974fa 100644 --- a/cman/man/qdisk.5 +++ b/cman/man/qdisk.5 @@ -479,11 +479,11 @@ by the qdiskd timeout. .br <quorumd interval="1" tko="10" votes="3" label="testing"> .in 12 -<heuristic program="ping A -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping A -c1 -w1" score="1" interval="2" tko="3"/> .br -<heuristic program="ping B -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping B -c1 -w1" score="1" interval="2" tko="3"/> .br -<heuristic program="ping C -c1 -t1" score="1" interval="2" tko="3"/> +<heuristic program="ping C -c1 -w1" score="1" interval="2" tko="3"/> .br .in 8 </quorumd>

1 0

cluster: RHEL6 - rgmanager: Fix dependent service handling during recovery
by Ryan McCabe 04 May '12

04 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7a… Commit: 7a97ab473e6c2c82fe5bfd964e545895aea81d8e Parent: 9743f3742d4fab72320c9ce726c15b4c9b0abd80 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Fri May 4 15:59:15 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Fri May 4 16:10:09 2012 -0400 rgmanager: Fix dependent service handling during recovery Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> Acked-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/default_event_script.sl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index c54c068..c9cde4b 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -500,8 +500,6 @@ define default_service_event_handler() } ()=move_or_start(service_name, nodes); - - return; } % @@ -556,6 +554,10 @@ define default_service_event_handler() } } + if (service_state == "recovering") { + return; + } + % % Try to restart exclusive service which might have been recently % stopped in order to make room for other exclusive services.

1 0

cluster: STABLE32 - rgmanager: Fix dependent service handling during recovery
by Ryan McCabe 04 May '12

04 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c9… Commit: c97149047acc1ba3ee502887877d1cfefbb94ea2 Parent: 9ee68d33726c9d5b7d5dd5daf16bdef23047cee5 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Fri May 4 15:59:15 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Fri May 4 15:59:15 2012 -0400 rgmanager: Fix dependent service handling during recovery Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> Acked-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/default_event_script.sl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl index c54c068..c9cde4b 100644 --- a/rgmanager/src/resources/default_event_script.sl +++ b/rgmanager/src/resources/default_event_script.sl @@ -500,8 +500,6 @@ define default_service_event_handler() } ()=move_or_start(service_name, nodes); - - return; } % @@ -556,6 +554,10 @@ define default_service_event_handler() } } + if (service_state == "recovering") { + return; + } + % % Try to restart exclusive service which might have been recently % stopped in order to make room for other exclusive services.

1 0

cluster: STABLE32 - rgmanager: Fix return with lock held
by Ryan McCabe 02 May '12

02 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9e… Commit: 9ee68d33726c9d5b7d5dd5daf16bdef23047cee5 Parent: 7ec6da281db5c9ad521147c4ed5203d3bb1101dc Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Wed May 2 13:02:41 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Wed May 2 13:02:41 2012 -0400 rgmanager: Fix return with lock held Fix a return on an error path in rg_state.c where we could return without unlocking exclusive_mutex. Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/rg_state.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 5b7991d..5d16af4 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -2107,6 +2107,8 @@ handle_start_req(char *svcName, int req, int *new_owner) _svc_stop_finish(svcName, 0, RG_STATE_STOPPED); } + if (need_check) + pthread_mutex_unlock(&exclusive_mutex); return RG_EDEPEND; }

1 0

cluster: STABLE32 - rgmanager: Clean up lock handling in groups.c
by Ryan McCabe 02 May '12

02 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7e… Commit: 7ec6da281db5c9ad521147c4ed5203d3bb1101dc Parent: 23cbaf1816760187fef869da88cad417a4e5f535 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Wed May 2 12:51:06 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Wed May 2 12:51:06 2012 -0400 rgmanager: Clean up lock handling in groups.c Fix two error paths where we returned without releasing locks we have taken. Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/groups.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index ff80caa..4a72cb7 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -399,12 +399,14 @@ check_depend_safe(const char *rg_name) pthread_rwlock_rdlock(&resource_lock); res = find_root_by_ref(&_resources, rg_name); - if (!res) - return -1; + if (!res) { + ret = -1; + goto out_unlock; + } ret = check_depend(res); +out_unlock: pthread_rwlock_unlock(&resource_lock); - return ret; } @@ -933,7 +935,7 @@ group_migratory(const char *groupname, int lock) res = find_root_by_ref(&_resources, groupname); if (!res) { /* Nonexistent or non-TL RG cannot be migrated */ - return 0; + goto out_unlock; } for (x = 0; res->r_rule->rr_actions[x].ra_name; x++) {

1 0

cluster: STABLE32 - rgmanager: Fix the function prototypes for act_dup() which were broken by commit 5b7c605ceb1b2d6686f63fe3f10e56d5ce4bd439
by Ryan McCabe 02 May '12

02 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=23… Commit: 23cbaf1816760187fef869da88cad417a4e5f535 Parent: 87b2cb784db02fad1c54e76af93ea264ea52d1de Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Wed May 2 12:50:29 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Wed May 2 12:50:29 2012 -0400 rgmanager: Fix the function prototypes for act_dup() which were broken by commit 5b7c605ceb1b2d6686f63fe3f10e56d5ce4bd439 Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/include/reslist.h | 2 +- rgmanager/src/daemons/restree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/include/reslist.h b/rgmanager/include/reslist.h index 68ea032..e254ecc 100644 --- a/rgmanager/include/reslist.h +++ b/rgmanager/include/reslist.h @@ -175,7 +175,7 @@ void print_resource_tree(resource_node_t **tree); void dump_resource_tree(FILE *fp, resource_node_t **tree); void destroy_resource_tree(resource_node_t **tree); -void *act_dup(resource_act_t *acts); +resource_act_t *act_dup(resource_act_t *acts); void dump_resource_info(FILE *fp); diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index cfa1893..9b70334 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -27,7 +27,7 @@ static inline int _res_op_internal(resource_node_t **tree, resource_t *first, resource_node_t *node); /* XXX from reslist.c */ -void * act_dup(resource_act_t *acts); +resource_act_t *act_dup(resource_act_t *acts); time_t get_time(char *action, int depth, resource_node_t *node);

1 0

dlm: master - dlm_controld: poll lockspace recovery while waiting for quorum
by David Teigland 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=99… Commit: 995ead49d7aeab6c3e65a55119976ae85a4d3767 Parent: 77565cca9f99167e1aa04b7608afd9b8f60f1bee Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 1 15:40:26 2012 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue May 1 15:40:26 2012 -0500 dlm_controld: poll lockspace recovery while waiting for quorum Was getting stuck when quorum was regained. Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index 6e508d2..0318b98 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -598,6 +598,7 @@ static int wait_conditions_done(struct lockspace *ls) if (opt(enable_quorum_lockspace_ind) && !cluster_quorate) { log_group(ls, "wait for quorum"); ls->wait_debug = DLMC_LS_WAIT_QUORUM; + poll_lockspaces++; return 0; }

1 0

dlm: master - libdlm/dlm_tool: remove NODIR flag
by David Teigland 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=77… Commit: 77565cca9f99167e1aa04b7608afd9b8f60f1bee Parent: 9832cc8a622c195701ca28127c261aec8832c7e6 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 1 11:16:32 2012 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue May 1 11:16:32 2012 -0500 libdlm/dlm_tool: remove NODIR flag NODIR is no longer configured with an api flag, but is configured by dlm_controld through sysfs. Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_tool/main.c | 14 +------------- libdlm/libdlm.h | 1 - libdlm/man/dlm_create_lockspace.3 | 1 - 3 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlm_tool/main.c b/dlm_tool/main.c index 1ffd788..36f8bf8 100644 --- a/dlm_tool/main.c +++ b/dlm_tool/main.c @@ -47,7 +47,6 @@ static char *lsname; static int operation; static int opt_ind; static int ls_all_nodes = 0; -static int opt_dir = 0; static int opt_excl = 0; static int opt_fs = 0; static int dump_mstcpy = 0; @@ -192,7 +191,6 @@ static void print_usage(void) printf("\n"); printf("Options:\n"); printf(" -n Show all node information in ls\n"); - printf(" -d 0|1 Resource directory off/on in join, default 0\n"); printf(" -e 0|1 Exclusive create off/on in join, default 0\n"); printf(" -f 0|1 FS (filesystem) flag off/on in join, default 0\n"); printf(" -m <mode> Permission mode for lockspace device (octal), default 0600\n"); @@ -204,7 +202,7 @@ static void print_usage(void) printf("\n"); } -#define OPTION_STRING "MhVnd:m:e:f:vws" +#define OPTION_STRING "MhVnm:e:f:vws" static void decode_arguments(int argc, char **argv) { @@ -217,10 +215,6 @@ static void decode_arguments(int argc, char **argv) optchar = getopt(argc, argv, OPTION_STRING); switch (optchar) { - case 'd': - opt_dir = atoi(optarg); - break; - case 'e': opt_excl = atoi(optarg); break; @@ -418,9 +412,6 @@ static char *flag_str(uint32_t flags) strcat(join_flags, "flags "); - if (flags & DLM_LSFL_NODIR) - strcat(join_flags, "NODIR "); - if (flags & DLM_LSFL_NEWEXCL) strcat(join_flags, "NEWEXCL "); @@ -435,9 +426,6 @@ static void do_join(char *name) dlm_lshandle_t *dh; uint32_t flags = 0; - if (!opt_dir) - flags |= DLM_LSFL_NODIR; - if (opt_excl) flags |= DLM_LSFL_NEWEXCL; diff --git a/libdlm/libdlm.h b/libdlm/libdlm.h index 7b6e681..d025ef8 100644 --- a/libdlm/libdlm.h +++ b/libdlm/libdlm.h @@ -42,7 +42,6 @@ struct dlm_lksb { #define DLM_SBF_ALTMODE 0x04 /* dlm_new_lockspace flags */ -#define DLM_LSFL_NODIR 0x00000001 #define DLM_LSFL_TIMEWARN 0x00000002 #define DLM_LSFL_FS 0x00000004 #define DLM_LSFL_NEWEXCL 0x00000008 diff --git a/libdlm/man/dlm_create_lockspace.3 b/libdlm/man/dlm_create_lockspace.3 index 3879e85..93ffc54 100644 --- a/libdlm/man/dlm_create_lockspace.3 +++ b/libdlm/man/dlm_create_lockspace.3 @@ -45,7 +45,6 @@ Performs the same function as .B dlm_create_lockspace() above, but passes some creation flags to the call that affect the lockspace being created. Currently supported flags are: .nf -DLM_LSFL_NODIR the lockspace should not use a resource directory DLM_LSFL_TIMEWARN the dlm should emit warnings over netlink when locks have been waiting too long; required for deadlock detection

1 0

cluster: STABLE32 - Apply fixes from John Ruemker to fix some obscure error cases when central processing is enabled.
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=87… Commit: 87b2cb784db02fad1c54e76af93ea264ea52d1de Parent: 18a65378fdb97db310131fb917a7c3821772c8b0 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Tue May 1 15:29:43 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:29:43 2012 -0400 Apply fixes from John Ruemker to fix some obscure error cases when central processing is enabled. Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/main.c | 8 +++++++- rgmanager/src/daemons/rg_event.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 02ec5ef..369ea7e 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -458,7 +458,13 @@ dispatch_msg(msgctx_t *ctx, int nodeid, int need_close) /* Centralized processing or request is from clusvcadm */ nid = event_master(); - if (nid != my_id()) { + if (nid < 0) { + logt_print(LOG_ERR, "#40b: Unable to determine " + "event master\n"); + ret = -1; + goto out; + } + else if (nid != my_id()) { /* Forward the message to the event master */ forward_message(ctx, msg_sm, nid); } else { diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c index a3c12c5..2b78b49 100644 --- a/rgmanager/src/daemons/rg_event.c +++ b/rgmanager/src/daemons/rg_event.c @@ -255,7 +255,7 @@ find_master(void) m = member_list(); if (vf_read(m, "Transition-Master", &vn, - (void **)(&data), &sz) < 0) { + (void **)(&data), &sz) != VFR_OK) { logt_print(LOG_ERR, "Unable to discover master" " status\n"); masterinfo = NULL;

1 0

cluster: STABLE32 - rgmanager: various cleanups regarding string functions
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=18… Commit: 18a65378fdb97db310131fb917a7c3821772c8b0 Parent: a14f3920a9a8c3be930a8b8958414768a0698240 Author: jpokorny(a)redhat.com <jpokorny(a)redhat.com> AuthorDate: Fri Apr 6 18:28:09 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:22:12 2012 -0400 rgmanager: various cleanups regarding string functions Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/groups.c | 12 +++++++++--- rgmanager/src/daemons/main.c | 2 +- rgmanager/src/daemons/restree.c | 1 + rgmanager/src/daemons/rg_state.c | 12 ++++++++---- rgmanager/src/daemons/rg_thread.c | 3 ++- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index 78b9de9..ff80caa 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -1140,7 +1140,8 @@ _group_property(const char *groupname, const char *property, for (; res->r_attrs[x].ra_name; x++) { if (strcasecmp(res->r_attrs[x].ra_name, property)) continue; - strncpy(ret, res->r_attrs[x].ra_value, len); + strncpy(ret, res->r_attrs[x].ra_value, len-1); + ret[len-1] = '\0'; return 0; } @@ -1837,14 +1838,19 @@ get_recovery_policy(const char *rg_name, char *buf, size_t buflen) resource_t *res; const char *val; + assert(buflen >= 1); /* and expect partial result if doesn't fit */ + pthread_rwlock_rdlock(&resource_lock); - strncpy(buf, "restart", buflen); + strncpy(buf, "restart", buflen-1); + buf[buflen-1] = '\0'; + res = find_root_by_ref(&_resources, rg_name); if (res) { val = res_attr_value(res, "recovery"); if (val) { - strncpy(buf, val, buflen); + strncpy(buf, val, buflen-1); + /* Already terminated */ } } diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 15f6215..02ec5ef 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -52,7 +52,7 @@ segfault(int __attribute__ ((unused)) sig) char ow[64]; int err; // dumb error checking... will be replaced by logsys - snprintf(ow, sizeof(ow)-1, "PID %d Thread %d: SIGSEGV\n", getpid(), + snprintf(ow, sizeof(ow), "PID %d Thread %d: SIGSEGV\n", getpid(), gettid()); err = write(2, ow, strlen(ow)); while(1) diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c index e29a2e8..cfa1893 100644 --- a/rgmanager/src/daemons/restree.c +++ b/rgmanager/src/daemons/restree.c @@ -105,6 +105,7 @@ add_ocf_stuff(resource_t *res, char **env, int depth, int refcnt, int timeout) strncpy(ver, OCF_API_VERSION, sizeof(ver)-1); else strncpy(ver, res->r_rule->rr_version, sizeof(ver)-1); + ver[sizeof(ver)-1] = '\0'; minor = strchr(ver, '.'); if (minor) { diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c index 80b992a..5b7991d 100644 --- a/rgmanager/src/daemons/rg_state.c +++ b/rgmanager/src/daemons/rg_state.c @@ -207,8 +207,10 @@ set_rg_state(const char *name, rg_state_t *svcblk) int ret, tries = 0; #endif - if (name) - strncpy(svcblk->rs_name, name, sizeof(svcblk->rs_name)); + if (name) { + strncpy(svcblk->rs_name, name, sizeof(svcblk->rs_name)-1); + svcblk->rs_name[sizeof(svcblk->rs_name)-1] = '\0'; + } snprintf(res, sizeof(res), "rg=\"%s\"", name); @@ -270,7 +272,8 @@ get_rg_state(const char *name, rg_state_t *svcblk) return -1; } - strncpy(svcblk->rs_name, name, sizeof(svcblk->rs_name)); + strncpy(svcblk->rs_name, name, sizeof(svcblk->rs_name)-1); + svcblk->rs_name[sizeof(svcblk->rs_name)-1]; snprintf(res, sizeof(res),"rg=\"%s\"", svcblk->rs_name); @@ -367,7 +370,8 @@ get_rg_state_local(const char *name, rg_state_t *svcblk) errno = EINVAL; return -1; } - strncpy(svcblk->rs_name, name, sizeof(svcblk->rs_name)); + strncpy(svcblk->rs_name, name, sizeof(svcblk->rs_name)-1); + svcblk->rs_name[sizeof(svcblk->rs_name)-1] = '\0'; snprintf(res, sizeof(res),"rg=\"%s\"", svcblk->rs_name); diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c index 75af6f1..a7bf3f9 100644 --- a/rgmanager/src/daemons/rg_thread.c +++ b/rgmanager/src/daemons/rg_thread.c @@ -179,7 +179,8 @@ resgroup_thread_main(void *arg) rg_inc_threads(); - strncpy(myname, arg, 256); + strncpy(myname, arg, sizeof(myname)-1); + myname[sizeof(myname)-1] = '\0'; dbg_printf("Thread %s (tid %d) starting\n",myname,gettid()); pthread_mutex_init(&my_queue_mutex, NULL);

1 0

cluster: STABLE32 - rgmanager: reslist: another string related cleanup
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a1… Commit: a14f3920a9a8c3be930a8b8958414768a0698240 Parent: 5b7c605ceb1b2d6686f63fe3f10e56d5ce4bd439 Author: Jan Pokorný <jpokorny(a)redhat.com> AuthorDate: Fri Apr 6 21:38:03 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:20:48 2012 -0400 rgmanager: reslist: another string related cleanup Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/reslist.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c index b75f4b0..43430cd 100644 --- a/rgmanager/src/daemons/reslist.c +++ b/rgmanager/src/daemons/reslist.c @@ -107,9 +107,12 @@ _attr_value(resource_node_t *node, const char *attrname, const char *ptype) /* Difference guaranteed to be non-negative (for x >= 0: &ra->ra_value[x] >= &ra->ra_value[0]) */ len = (c - ra->ra_value); - memset(p_type, 0, sizeof(p_type)); + if (len >= sizeof(p_type)) + len = sizeof(p_type) - 1; + memcpy(p_type, ra->ra_value, len); - + p_type[sizeof(p_type)-1] = '\0'; + /* Skip the "%" and recurse */ return _attr_value(node->rn_parent, ++c, p_type); }

1 0

cluster: STABLE32 - rgmanager: reslist: sanitize act_dup
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5b… Commit: 5b7c605ceb1b2d6686f63fe3f10e56d5ce4bd439 Parent: efa9aed4cfb5a4501ccc2862a477eb5c370f0690 Author: Jan Pokorný <jpokorny(a)redhat.com> AuthorDate: Fri Apr 6 19:53:33 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:20:45 2012 -0400 rgmanager: reslist: sanitize act_dup Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/reslist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c index f9924cd..b75f4b0 100644 --- a/rgmanager/src/daemons/reslist.c +++ b/rgmanager/src/daemons/reslist.c @@ -626,10 +626,10 @@ print_resources(resource_t **resources) } -void * +resource_act_t * act_dup(resource_act_t *acts) { - int x; + size_t x; resource_act_t *newacts; for (x = 0; acts[x].ra_name; x++);

1 0

cluster: STABLE32 - rgmanager: reslist: nothing avoids using size_t
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ef… Commit: efa9aed4cfb5a4501ccc2862a477eb5c370f0690 Parent: bff872891fc58d3f8895361e562be7c8416c937b Author: Jan Pokorný <jpokorny(a)redhat.com> AuthorDate: Fri Apr 6 19:44:20 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:20:43 2012 -0400 rgmanager: reslist: nothing avoids using size_t + fix comment typo Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/reslist.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/reslist.c b/rgmanager/src/daemons/reslist.c index e1695fb..f9924cd 100644 --- a/rgmanager/src/daemons/reslist.c +++ b/rgmanager/src/daemons/reslist.c @@ -70,7 +70,7 @@ _attr_value(resource_node_t *node, const char *attrname, const char *ptype) resource_t *res; resource_attr_t *ra; char *c, p_type[32]; - ssize_t len; + size_t len; int x; if (!node) @@ -99,11 +99,13 @@ _attr_value(resource_node_t *node, const char *attrname, const char *ptype) c = strchr(ra->ra_value, '%'); if (!c) { /* Someone doesn't care or uses older - semantics on inheritance */ + semantics of inheritance */ return _attr_value(node->rn_parent, ra->ra_value, NULL); } + /* Difference guaranteed to be non-negative + (for x >= 0: &ra->ra_value[x] >= &ra->ra_value[0]) */ len = (c - ra->ra_value); memset(p_type, 0, sizeof(p_type)); memcpy(p_type, ra->ra_value, len);

1 0

cluster: STABLE32 - rgmanager: resrules: simplify getting attributes + avoid memleaks
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bf… Commit: bff872891fc58d3f8895361e562be7c8416c937b Parent: 17fbc520ac69a3b9eb4f33a738cdf6e0b11e4e22 Author: Jan Pokorný <jpokorny(a)redhat.com> AuthorDate: Mon Apr 2 18:29:46 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:10:05 2012 -0400 rgmanager: resrules: simplify getting attributes + avoid memleaks These memleaks (connected with attrname, dflt and ret) could occur in some recoverable error corner cases. Getting of default value is postponed until it is actually needed (i.e., the value is not inherited which should have the priority, at least as per in-code comment). update v2: Now, also avoid memleak upon store_attribute failure. Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/resrules.c | 39 ++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/rgmanager/src/daemons/resrules.c b/rgmanager/src/daemons/resrules.c index 353ead4..557ef9c 100644 --- a/rgmanager/src/daemons/resrules.c +++ b/rgmanager/src/daemons/resrules.c @@ -711,28 +711,20 @@ static int _get_rule_attrs(xmlDocPtr doc, xmlXPathContextPtr ctx, char *base, resource_rule_t *rr) { - char *ret, *attrname, *dflt = NULL, xpath[256]; + char *ret, *attrname, xpath[256]; int x, flags, primary_found = 0; for (x = 1; 1; x++) { snprintf(xpath, sizeof(xpath), "%s/parameter[%d]/@name", base, x); - ret = xpath_get_one(doc,ctx,xpath); - if (!ret) + attrname = xpath_get_one(doc,ctx,xpath); + if (!attrname) break; flags = 0; - attrname = ret; /* - See if there's a default value. - */ - snprintf(xpath, sizeof(xpath), - "%s/parameter[%d]/content/@default", base, x); - dflt = xpath_get_one(doc,ctx,xpath); - - /* See if this is either the primary identifier or a required field. */ @@ -761,6 +753,7 @@ _get_rule_attrs(xmlDocPtr doc, xmlXPathContextPtr ctx, char *base, if ((atoi(ret) != 0) || (ret[0] == 'y')) { if (primary_found) { free(ret); + free(attrname); printf("Multiple primary " "definitions for " "resource type %s\n", @@ -786,7 +779,8 @@ _get_rule_attrs(xmlDocPtr doc, xmlXPathContextPtr ctx, char *base, } /* - See if this is supposed to be inherited + See if this is supposed to be inherited; + inheritance supercedes a specified default value */ snprintf(xpath, sizeof(xpath), "%s/parameter[%d]/@inherit", base, x); @@ -795,31 +789,32 @@ _get_rule_attrs(xmlDocPtr doc, xmlXPathContextPtr ctx, char *base, if (flags & (RA_REQUIRED | RA_PRIMARY | RA_UNIQUE)) { free(ret); + free(attrname); printf("Can not inherit and be primary, " "unique, or required\n"); return -1; } - /* - don't free ret. Store as attr value. If we had - a default value specified from above, free it; - inheritance supercedes a specified default value. - */ - if (dflt) - free(dflt); + + /* Don't free ret */ + } else { /* Use default value, if specified, as the attribute value. */ - ret = dflt; + snprintf(xpath, sizeof(xpath), + "%s/parameter[%d]/content/@default", base, x); + ret = xpath_get_one(doc,ctx,xpath); } /* Store the attribute. We'll ensure all required attributes are present soon. */ - if (attrname) - store_attribute(&rr->rr_attrs, attrname, ret, flags); + if (store_attribute(&rr->rr_attrs, attrname, ret, flags) != 0) { + free(attrname); + free(ret); + } } return 0;

1 0

cluster: STABLE32 - resrules: print_resource_rule doc comment conformance
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=17… Commit: 17fbc520ac69a3b9eb4f33a738cdf6e0b11e4e22 Parent: 215dd94070707fdb421197bfe625fb9d531ecbec Author: Jan Pokorný <jpokorny(a)redhat.com> AuthorDate: Mon Apr 2 13:37:38 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:10:05 2012 -0400 resrules: print_resource_rule doc comment conformance (when changing doc. comment, do it properly) (due to previously misconfigured MUA, sorry for inconvenience) Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/resrules.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/resrules.c b/rgmanager/src/daemons/resrules.c index 581be9e..353ead4 100644 --- a/rgmanager/src/daemons/resrules.c +++ b/rgmanager/src/daemons/resrules.c @@ -556,9 +556,10 @@ store_childtype(resource_child_t **childp, char *name, int start, /** - Print a resource_t structure to stdout + Print a resource_t structure to specified stream @param rr Resource rule to print. + @param fp Destination stream. */ void print_resource_rule(FILE *fp, resource_rule_t *rr)

1 0

cluster: STABLE32 - resrules: fix free while passing the pointer to caller
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=21… Commit: 215dd94070707fdb421197bfe625fb9d531ecbec Parent: 1e6034e5d698192f48b2317065b10d61410ac824 Author: Jan Pokorný <jpokorny(a)redhat.com> AuthorDate: Mon Apr 2 13:29:52 2012 +0200 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 15:10:05 2012 -0400 resrules: fix free while passing the pointer to caller (due to previously misconfigured MUA, sorry for inconvenience) The version ("OCF API Version" as declared in the code) for resource rules cannot be obtained correctly as the memory is being immediately freed before passing up to the caller. What's worse, the caller could then access uninitialized memory through this pointer (e.g., print_resource_rule). The patch fixes this, making no difference between success and failure in getting the version. Both should be handled correctly when either dumping resource rule or destroying it. Aside: was this version field ever actively used of is this a legacy part not expected to be triggered? [ I have no test case at hand, this was random spot, sorry. ] Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/src/daemons/resrules.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rgmanager/src/daemons/resrules.c b/rgmanager/src/daemons/resrules.c index cc59e30..581be9e 100644 --- a/rgmanager/src/daemons/resrules.c +++ b/rgmanager/src/daemons/resrules.c @@ -205,11 +205,8 @@ _get_version(xmlDocPtr doc, xmlXPathContextPtr ctx, char *base, snprintf(xpath, sizeof(xpath), "%s/@version", base); ret = xpath_get_one(doc, ctx, xpath); - if (ret) { - rr->rr_version = ret; - free(ret); - } - rr->rr_version = NULL; + /* NULL or actual result of the query */ + rr->rr_version = ret; }

1 0

cluster: RHEL6 - rgmanager: Install the new cpglockd man page
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=97… Commit: 9743f3742d4fab72320c9ce726c15b4c9b0abd80 Parent: 320e12394d7010c139e271f4345d97a70eec2529 Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Tue May 1 12:49:08 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 13:12:23 2012 -0400 rgmanager: Install the new cpglockd man page Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/man/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rgmanager/man/Makefile b/rgmanager/man/Makefile index 0d8f3aa..4d6a1dd 100644 --- a/rgmanager/man/Makefile +++ b/rgmanager/man/Makefile @@ -5,7 +5,8 @@ MANTARGET= \ rgmanager.8 \ clurgmgrd.8 \ clustat.8 \ - clusvcadm.8 + clusvcadm.8 \ + cpglockd.8 include ../../make/defines.mk include $(OBJDIR)/make/install.mk

1 0

cluster: STABLE32 - rgmanager: Install the new cpglockd man page
by Ryan McCabe 01 May '12

01 May '12

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1e… Commit: 1e6034e5d698192f48b2317065b10d61410ac824 Parent: 7e44784a83001516ab02ec66495fc1b83255ea3a Author: Ryan McCabe <rmccabe(a)redhat.com> AuthorDate: Tue May 1 12:49:08 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com> CommitterDate: Tue May 1 12:49:08 2012 -0400 rgmanager: Install the new cpglockd man page Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> --- rgmanager/man/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rgmanager/man/Makefile b/rgmanager/man/Makefile index 0d8f3aa..4d6a1dd 100644 --- a/rgmanager/man/Makefile +++ b/rgmanager/man/Makefile @@ -5,7 +5,8 @@ MANTARGET= \ rgmanager.8 \ clurgmgrd.8 \ clustat.8 \ - clusvcadm.8 + clusvcadm.8 \ + cpglockd.8 include ../../make/defines.mk include $(OBJDIR)/make/install.mk

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits May 2012