cluster-commits October 2009

cluster-commits@lists.fedorahosted.org

9 participants
151 discussions

cluster: STABLE3 - fence_xvmd: Allow interface assignment in cluster.conf
by Lon Hohberger 13 Oct '09

13 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0c… Commit: 0caea07f1f8fb197b8c7a2d3b2b49aed65371a79 Parent: a781c07dcad8acc7bc29c2bbf04ef0b8e17fae2b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 13 16:44:08 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 13 16:44:08 2009 -0400 fence_xvmd: Allow interface assignment in cluster.conf Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- fence/agents/xvm/options.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c index 4a92179..96975f0 100644 --- a/fence/agents/xvm/options.c +++ b/fence/agents/xvm/options.c @@ -317,7 +317,7 @@ static struct arg_info _arg_info[] = { "IP port (default=1229)", assign_port }, - { 'I', "-I <interface>", "multicast_address", + { 'I', "-I <interface>", "interface", "Network interface name to listen on", assign_interface },

1 0

cluster: master - cman: Move token timeout into header file
by Lon Hohberger 13 Oct '09

13 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f3… Commit: f3eaf86591ef2fd9f2bede06f4277b10614ea508 Parent: a9ef89ce68381955d35288eb329d249e37b31618 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 13 12:21:44 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 13 12:25:37 2009 -0400 cman: Move token timeout into header file Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- cman/config/cman-preconfig.c | 3 ++- cman/config/cman.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cman/config/cman-preconfig.c b/cman/config/cman-preconfig.c index 1ba48ae..b22f359 100644 --- a/cman/config/cman-preconfig.c +++ b/cman/config/cman-preconfig.c @@ -710,8 +710,9 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb) /* Set the token timeout is 10 seconds, but don't overrride anything that might be in cluster.conf */ if (objdb_get_string(objdb, object_handle, "token", &value)) { + snprintf(tmp, sizeof(tmp), "%d", DEFAULT_TOKEN_TIMEOUT); objdb->object_key_create(object_handle, "token", strlen("token"), - "10000", strlen("10000")+1); + tmp, strlen(tmp)+1); } if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) { objdb->object_key_create(object_handle, "token_retransmits_before_loss_const", diff --git a/cman/config/cman.h b/cman/config/cman.h index ba0843d..8e04d21 100644 --- a/cman/config/cman.h +++ b/cman/config/cman.h @@ -9,6 +9,7 @@ #define DEFAULT_PORT 5405 #define DEFAULT_CLUSTER_NAME "RHCluster" #define DEFAULT_MAX_QUEUED 128 +#define DEFAULT_TOKEN_TIMEOUT 10000 #define DEFAULT_QUORUMDEV_POLL 10000 #define DEFAULT_SHUTDOWN_TIMEOUT 5000 #define DEFAULT_CCSD_POLL 1000

1 0

cluster: STABLE3 - cman: Move token timeout into header file
by Lon Hohberger 13 Oct '09

13 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a7… Commit: a781c07dcad8acc7bc29c2bbf04ef0b8e17fae2b Parent: d02babbaf18c9fc3449ac744444b50fc45e7406b Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Oct 13 12:21:44 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Oct 13 12:21:44 2009 -0400 cman: Move token timeout into header file Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- cman/daemon/cman-preconfig.c | 3 ++- cman/daemon/cman.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c index b39ca4c..4bd3d95 100644 --- a/cman/daemon/cman-preconfig.c +++ b/cman/daemon/cman-preconfig.c @@ -690,8 +690,9 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb) /* Set the token timeout is 10 seconds, but don't overrride anything that might be in cluster.conf */ if (objdb_get_string(objdb, object_handle, "token", &value)) { + snprintf(tmp, sizeof(tmp), "%d", DEFAULT_TOKEN_TIMEOUT); objdb->object_key_create(object_handle, "token", strlen("token"), - "10000", strlen("10000")+1); + tmp, strlen(tmp)+1); } if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) { objdb->object_key_create(object_handle, "token_retransmits_before_loss_const", diff --git a/cman/daemon/cman.h b/cman/daemon/cman.h index 67f76d3..dfcf014 100644 --- a/cman/daemon/cman.h +++ b/cman/daemon/cman.h @@ -11,6 +11,7 @@ extern int our_nodeid(void); #define DEFAULT_PORT 5405 #define DEFAULT_CLUSTER_NAME "RHCluster" #define DEFAULT_MAX_QUEUED 128 +#define DEFAULT_TOKEN_TIMEOUT 10000 #define DEFAULT_QUORUMDEV_POLL 10000 #define DEFAULT_SHUTDOWN_TIMEOUT 5000 #define DEFAULT_CCSD_POLL 1000

1 0

gfs2-utils: master - gfs_controld: Clean up & fixes
by Steven Whitehouse 13 Oct '09

13 Oct '09

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 5d273407fb08ff954992b812df9812c7fe2b3dd6 Parent: 457549978cfc2ad00c56df2cca0dccfcf6f49cb6 Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Tue Oct 13 09:48:23 2009 +0100 Committer: Steven Whitehouse <swhiteho(a)redhat.com> CommitterDate: Tue Oct 13 09:48:23 2009 +0100 gfs_controld: Clean up & fixes The following patch cleans up some old code in gfs_controld and also fixes one or two issues along the way. After this patch has been applied, gfs_controld no longer reads from sysfs, but instead gathers all its information from the uevents. The uevents in question have been in all recent versions of GFS & GFS2 and so there should be no backward compatibility issues (even so, this is for the master branch only, at least at the moment). The diffstat shows a net reduction of about 100 lines of code. group/gfs_controld/cpg-new.c | 161 ++++++++++++++-------------------------- group/gfs_controld/gfs_daemon.h | 6 - group/gfs_controld/main.c | 99 ++++++++++-------------- group/gfs_controld/util.c | 43 ---------- 4 files changed, 106 insertions(+), 203 deletions(-) There are some bugs fixes with this patch too: - process_uevent() was checking for the string "/fs/gfs" anywhere in the uevent DEVPATH, whereas the correct check was for a DEVPATH starting with that string. - There can now be no confusion between the CHANGE uevent from a first mount event and a CHANGE uevent from a recovery done event. In the old code, this was worked out according to the expected state of the cluster. The new code uses the uevent messages to do that, and hence should be more robust. - In the old code, the recovery uevent process was still reading sysfs files, even when it had all the information required from the uevent which is why my recent kernel patch had to be backed out. This patch fixes that as well. Some other notes: - ping_kernel_mount() used to have a side effect with the old CPG code, but with the new CPG it does nothing useful and thus can be removed. - This is the first step in a process to eventually remove mount.gfs2 (and let gfs_controld handle the complete mount process itself). - While testing I spotted this in the logs: 1255337409 myfs set /sys/fs/gfs2/plurality:myfs/lock_module/block to 0 1255337409 myfs set open /sys/fs/gfs2/plurality:myfs/lock_module/block error -1 2 This happens even without the below patch and I believe it is caused by trying to write to the sysfs file before the filesystem has been mounted. It seems to be harmless and probably we can just remove the code which tries to do this. I need to do some more investigation to confirm that though. Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> Acked-by: David Teigland <teigland(a)redhat.com> --- group/gfs_controld/cpg-new.c | 161 +++++++++++++++------------------------ group/gfs_controld/gfs_daemon.h | 6 +- group/gfs_controld/main.c | 99 ++++++++++-------------- group/gfs_controld/util.c | 43 ---------- 4 files changed, 106 insertions(+), 203 deletions(-) diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index 6def20c..23b7a86 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -2201,114 +2201,81 @@ static void apply_changes(struct mountgroup *mg) } } -/* We send messages with the info from kernel uevents or mount.gfs ipc, - and then process the uevent/ipc upon receiving the message for it, so - that it can be processed in the same order by all nodes. */ - -void process_recovery_uevent(char *name, int jid, int recover_status, - int first_done) +void process_first_mount(struct mountgroup *mg) { - struct mountgroup *mg; - struct journal *j; - int rv; + /* + * Assumption here is that only the first mounter will get + * uevents when first_recovery_needed is set. + */ - mg = find_mg(name); - if (!mg) { - log_error("recovery_uevent mg not found %s", name); - return; - } + /* make a local record of jid and recover_status; we may want + to check below that we've seen uevents for all jids + during first recovery before sending first_recovery_done. */ - if (jid < 0) { - /* for back compat, sysfs file deprecated */ - rv = read_sysfs_int(mg, "recover_done", &jid); - if (rv < 0) { - log_error("recovery_uevent recover_done read %d", rv); - return; - } - } + log_group(mg, "recovery_uevent mg %s first recovery done", mg->name); - if (recover_status < 0) { - /* for back compat, sysfs file deprecated */ - rv = read_sysfs_int(mg, "recover_status", &recover_status); - if (rv < 0) { - log_error("recovery_uevent recover_status read %d", rv); - return; - } - } + /* ignore extraneous uevent from others_may_mount */ + if (mg->first_done_uevent) + return; - if (!mg->first_recovery_needed) { - if (!mg->local_recovery_busy) { - /* This will happen in two known situations: - - we get a recovery_done uevent for our own journal - when we mount (jid == mg->our_jid) - - the first mounter can read first_done and clear - first_recovery_needed before seeing the change - uevent from others_may_mount */ - log_group(mg, "recovery_uevent jid %d ignore", jid); - return; - } + log_group(mg, "recovery_uevent first_done"); + mg->first_done_uevent = 1; + send_first_recovery_done(mg); - mg->local_recovery_busy = 0; + apply_changes_recovery(mg); +} - if (mg->local_recovery_jid != jid) { - log_error("recovery_uevent jid %d expected %d", jid, - mg->local_recovery_jid); - return; - } +/* We send messages with the info from kernel uevents or mount.gfs ipc, + and then process the uevent/ipc upon receiving the message for it, so + that it can be processed in the same order by all nodes. */ - j = find_journal(mg, jid); - if (!j) { - log_error("recovery_uevent no journal %d", jid); - return; - } +void process_recovery_uevent(struct mountgroup *mg, int jid, int recover_status) +{ + struct journal *j; - log_group(mg, "recovery_uevent jid %d status %d " - "local_recovery_done %d needs_recovery %d", - jid, recover_status, j->local_recovery_done, - j->needs_recovery); + if (mg->first_recovery_needed) + return; - j->local_recovery_done = 1; - j->local_recovery_result = recover_status; + if (!mg->local_recovery_busy) { + /* This will happen in two known situations: + - we get a recovery_done uevent for our own journal + when we mount (jid == mg->our_jid) + - the first mounter can read first_done and clear + first_recovery_needed before seeing the change + uevent from others_may_mount */ + log_group(mg, "recovery_uevent jid %d ignore", jid); + return; + } - /* j->needs_recovery will be cleared when we receive this - recovery_result message. if it's already set, then - someone else has completed the recovery and there's - no need to send our result */ + mg->local_recovery_busy = 0; - if (j->needs_recovery) - send_recovery_result(mg, jid, recover_status); - } else { - /* - * Assumption here is that only the first mounter will get - * uevents when first_recovery_needed is set. - */ + if (mg->local_recovery_jid != jid) { + log_error("recovery_uevent jid %d expected %d", jid, + mg->local_recovery_jid); + return; + } - /* make a local record of jid and recover_status; we may want - to check below that we've seen uevents for all jids - during first recovery before sending first_recovery_done. */ + j = find_journal(mg, jid); + if (!j) { + log_error("recovery_uevent no journal %d", jid); + return; + } - log_group(mg, "recovery_uevent jid %d first recovery done %d", - jid, mg->first_done_uevent); + log_group(mg, "recovery_uevent jid %d status %d " + "local_recovery_done %d needs_recovery %d", + jid, recover_status, j->local_recovery_done, + j->needs_recovery); - /* ignore extraneous uevent from others_may_mount */ - if (mg->first_done_uevent) - return; + j->local_recovery_done = 1; + j->local_recovery_result = recover_status; - if (first_done < 0) { - /* for back compat, sysfs file deprecated */ - rv = read_sysfs_int(mg, "first_done", &first_done); - if (rv < 0) { - log_error("recovery_uevent first_done read %d", rv); - return; - } - } + /* j->needs_recovery will be cleared when we receive this + recovery_result message. if it's already set, then + someone else has completed the recovery and there's + no need to send our result */ - if (first_done) { - log_group(mg, "recovery_uevent first_done"); - mg->first_done_uevent = 1; - send_first_recovery_done(mg); - } - } + if (j->needs_recovery) + send_recovery_result(mg, jid, recover_status); apply_changes_recovery(mg); } @@ -2830,17 +2797,9 @@ static void leave_mountgroup(struct mountgroup *mg, int mnterr) log_error("cpg_leave error %d", error); } -void do_leave(char *name, int mnterr) +void do_leave(struct mountgroup *mg, int mnterr) { - struct mountgroup *mg; - - log_debug("do_leave %s mnterr %d", name, mnterr); - - mg = find_mg(name); - if (!mg) { - log_error("do_leave: %s not found", name); - return; - } + log_debug("do_leave %s mnterr %d", mg->name, mnterr); if (mg->withdraw_uevent) { log_group(mg, "do_leave: ignored during withdraw"); diff --git a/group/gfs_controld/gfs_daemon.h b/group/gfs_controld/gfs_daemon.h index fe9bd73..1d89497 100644 --- a/group/gfs_controld/gfs_daemon.h +++ b/group/gfs_controld/gfs_daemon.h @@ -175,10 +175,11 @@ void process_cpg_daemon(int ci); int setup_dlmcontrol(void); void process_dlmcontrol(int ci); int set_protocol(void); -void process_recovery_uevent(char *name, int jid, int status, int first); +void process_recovery_uevent(struct mountgroup *mg, int jid, int status); +void process_first_mount(struct mountgroup *mg); void process_mountgroups(void); int gfs_join_mountgroup(struct mountgroup *mg); -void do_leave(char *name, int mnterr); +void do_leave(struct mountgroup *mg, int mnterr); void gfs_mount_done(struct mountgroup *mg); void send_remount(struct mountgroup *mg, struct gfsc_mount_args *ma); void send_withdraw(struct mountgroup *mg); @@ -219,7 +220,6 @@ void kick_node_from_cluster(int nodeid); /* util.c */ int we_are_in_fence_domain(void); int set_sysfs(struct mountgroup *mg, const char *field, int val); -int read_sysfs_int(struct mountgroup *mg, const char *field, int *val_out); int run_dmsetup_suspend(struct mountgroup *mg, char *dev); void update_dmsetup_wait(void); void update_flow_control_status(void); diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 64a388c..2b5a87e 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -23,7 +23,7 @@ struct client { struct mountgroup *mg; }; -static void do_withdraw(char *name); +static void do_withdraw(struct mountgroup *mg); int do_read(int fd, void *buf, size_t count) { @@ -189,20 +189,6 @@ struct mountgroup *find_mg_id(uint32_t id) return NULL; } -static void ping_kernel_mount(char *name) -{ - struct mountgroup *mg; - int rv, val; - - mg = find_mg(name); - if (!mg) - return; - - rv = read_sysfs_int(mg, "block", &val); - - log_group(mg, "ping_kernel_mount %d", rv); -} - enum { Env_ACTION = 0, Env_SUBSYSTEM, @@ -260,29 +246,21 @@ static void decode_uevent(const char *buf, unsigned len, const char *vars[], } } -static char *uevent_fsname(const char *vars[]) +static char *uevent_fsname(const char *vals[]) { char *name = NULL; - if (vars[Env_LOCKTABLE]) - name = strchr(vars[Env_LOCKTABLE], ':'); - - /* When all kernels are converted, we can dispose with the following - * grotty bit. This is for backward compatibility only. - */ - if (!name && vars[Env_DEVPATH]) { - name = strchr(vars[Env_DEVPATH], ':'); - if (name) { - char *end = strstr(name, "/lock_module"); - if (end) - *end = 0; - } + if (vals[Env_LOCKTABLE]) { + name = strchr(vals[Env_LOCKTABLE], ':'); + if (name && *name) + name++; } - return (name && name[0]) ? name + 1 : NULL; + return name; } static void process_uevent(int ci) { + struct mountgroup *mg; char buf[UEVENT_BUF_SIZE]; const char *uevent_vals[Env_Last]; char *fsname; @@ -306,7 +284,7 @@ static void process_uevent(int ci) !uevent_vals[Env_SUBSYSTEM]) return; - if (!strstr(uevent_vals[Env_DEVPATH], "/fs/gfs")) + if (strncmp(uevent_vals[Env_DEVPATH], "/fs/gfs", 7) != 0) return; log_debug("uevent %s %s %s", @@ -323,6 +301,12 @@ static void process_uevent(int ci) return; } + mg = find_mg(fsname); + if (!mg) { + log_error("mount group %s not found", fsname); + return; + } + if (!strcmp(uevent_vals[Env_ACTION], "remove")) { /* We want to trigger the leave at the very end of the kernel's unmount process, i.e. at the end of put_super(), so we do the @@ -330,33 +314,37 @@ static void process_uevent(int ci) if (strcmp(uevent_vals[Env_SUBSYSTEM], "lock_dlm") == 0) return; - do_leave(fsname, 0); + do_leave(mg, 0); + return; + } - } else if (!strcmp(uevent_vals[Env_ACTION], "change")) { - int jid, status = -1, first = -1; + if (!strcmp(uevent_vals[Env_ACTION], "change")) { + int jid, status = -1; - if (!uevent_vals[Env_JID] || - (sscanf(uevent_vals[Env_JID], "%d", &jid) != 1)) - jid = -1; if (uevent_vals[Env_RECOVERY]) { + if (!uevent_vals[Env_JID] || + (sscanf(uevent_vals[Env_JID], "%d", &jid) != 1)) + return; if (strcmp(uevent_vals[Env_RECOVERY], "Done") == 0) status = LM_RD_SUCCESS; if (strcmp(uevent_vals[Env_RECOVERY], "Failed") == 0) status = LM_RD_GAVEUP; + if (status < 0) + return; + process_recovery_uevent(mg, jid, status); + return; } if (uevent_vals[Env_FIRSTMOUNT] && - (strcmp(uevent_vals[Env_FIRSTMOUNT], "Done") == 0)) - first = 1; - - process_recovery_uevent(fsname, jid, status, first); - - } else if (!strcmp(uevent_vals[Env_ACTION], "offline")) { - do_withdraw(fsname); - } else { - ping_kernel_mount(fsname); + (strcmp(uevent_vals[Env_FIRSTMOUNT], "Done") == 0)) { + process_first_mount(mg); + } + return; } + + if (!strcmp(uevent_vals[Env_ACTION], "offline")) + do_withdraw(mg); } static int setup_uevent(void) @@ -724,24 +712,17 @@ static void do_join(int ci, struct gfsc_mount_args *ma) and when it's been removed from the group, it tells the locally withdrawing gfs to clear out locks. */ -static void do_withdraw(char *name) +static void do_withdraw(struct mountgroup *mg) { - struct mountgroup *mg; int rv; - log_debug("withdraw: %s", name); + log_debug("withdraw: %s", mg->name); if (!cfgd_enable_withdraw) { log_error("withdraw feature not enabled"); return; } - mg = find_mg(name); - if (!mg) { - log_error("do_withdraw no mountgroup %s", name); - return; - } - mg->withdraw_uevent = 1; rv = run_dmsetup_suspend(mg, mg->mount_args.dev); @@ -819,6 +800,7 @@ void process_connection(int ci) struct gfsc_header h; struct gfsc_mount_args empty; struct gfsc_mount_args *ma; + struct mountgroup *mg; char *extra = NULL; int rv, extra_len; @@ -875,7 +857,12 @@ void process_connection(int ci) break; case GFSC_CMD_FS_LEAVE: - do_leave(ma->table, h.data); + mg = find_mg(ma->table); + if (!mg) { + log_error("do_leave: %s not found", ma->table); + break; + } + do_leave(mg, h.data); break; case GFSC_CMD_FS_MOUNT_DONE: diff --git a/group/gfs_controld/util.c b/group/gfs_controld/util.c index 44d8827..d6d46ee 100644 --- a/group/gfs_controld/util.c +++ b/group/gfs_controld/util.c @@ -76,49 +76,6 @@ int set_sysfs(struct mountgroup *mg, const char *field, int val) return rv; } -static int get_sysfs(struct mountgroup *mg, const char *field, char *buf, int len) -{ - char fname[PATH_MAX], *p; - int fd, rv; - - snprintf(fname, PATH_MAX, "%s/%s/%s/lock_module/%s", - SYSFS_DIR, mg->mount_args.type, mg->mount_args.table, field); - - fd = open(fname, O_RDONLY); - if (fd < 0) { - log_group(mg, "get open %s error %d %d", fname, fd, errno); - return -1; - } - - rv = read(fd, buf, len); - if (rv < 0) - log_error("read %s error %d %d", fname, rv, errno); - else { - rv = 0; - p = strchr(buf, '\n'); - if (p) - *p = '\0'; - } - - close(fd); - return rv; -} - -int read_sysfs_int(struct mountgroup *mg, const char *field, int *val_out) -{ - char buf[SYSFS_BUFLEN]; - int rv; - - memset(buf, 0, sizeof(buf)); - - rv = get_sysfs(mg, field, buf, sizeof(buf)); - if (rv < 0) - return rv; - - *val_out = atoi(buf); - return 0; -} - int run_dmsetup_suspend(struct mountgroup *mg, char *dev) { struct sched_param sched_param;

1 0

fence: master - libfence: replace strcat
by David Teigland 12 Oct '09

12 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=10fe5c… Commit: 10fe5cff7b048244d2f362d8b890176e43916db3 Parent: d3d58caa28d779c76b6034a5d2abfe6d6ab368dd Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 12 14:19:23 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 12 14:23:58 2009 -0500 libfence: replace strcat with snprintf which is just better and safer all around. Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/libfence/agent.c | 76 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 18 deletions(-) diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c index adf12b1..deb378f 100644 --- a/fence/libfence/agent.c +++ b/fence/libfence/agent.c @@ -115,15 +115,19 @@ static int run_agent(char *agent, char *args, int *agent_result) static int make_args(int cd, char *victim, char *method, int d, char *device, char **args_out) { - char path[PATH_MAX], arg[PATH_MAX]; + char path[PATH_MAX]; char *args, *str; - int error, cnt = 0; + int error, ret, cnt = 0; + size_t len, pos; args = malloc(FENCE_AGENT_ARGS_MAX); if (!args) return -ENOMEM; memset(args, 0, FENCE_AGENT_ARGS_MAX); + len = FENCE_AGENT_ARGS_MAX - 1; + pos = 0; + /* node-specific args for victim */ memset(path, 0, PATH_MAX); @@ -140,17 +144,26 @@ static int make_args(int cd, char *victim, char *method, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* add nodename of victim to args */ if (!strstr(args, "nodename=")) { - memset(arg, 0, PATH_MAX); - snprintf(arg, PATH_MAX, "nodename=%s\n", victim); - strcat(args, arg); + ret = snprintf(args + pos, len - pos, "nodename=%s\n", victim); + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* device-specific args */ @@ -169,13 +182,20 @@ static int make_args(int cd, char *victim, char *method, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } if (cnt) error = 0; + out: if (error) { free(args); args = NULL; @@ -414,15 +434,19 @@ int fence_node(char *victim, struct fence_log *log, int log_size, static int make_args_unfence(int cd, char *victim, int d, char *device, char **args_out) { - char path[PATH_MAX], arg[PATH_MAX]; + char path[PATH_MAX]; char *args, *str; - int error, cnt = 0; + int error, ret, cnt = 0; + size_t len, pos; args = malloc(FENCE_AGENT_ARGS_MAX); if (!args) return -ENOMEM; memset(args, 0, FENCE_AGENT_ARGS_MAX); + len = FENCE_AGENT_ARGS_MAX - 1; + pos = 0; + /* node-specific args for victim */ memset(path, 0, PATH_MAX); @@ -439,17 +463,26 @@ static int make_args_unfence(int cd, char *victim, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* add nodename of victim to args */ if (!strstr(args, "nodename=")) { - memset(arg, 0, PATH_MAX); - snprintf(arg, PATH_MAX, "nodename=%s\n", victim); - strcat(args, arg); + ret = snprintf(args + pos, len - pos, "nodename=%s\n", victim); + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* device-specific args */ @@ -468,13 +501,20 @@ static int make_args_unfence(int cd, char *victim, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } if (cnt) error = 0; + out: if (error) { free(args); args = NULL;

1 0

fence: master - libfence: increase FENCE_AGENT_ARGS_MAX to 4096
by David Teigland 12 Oct '09

12 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=d3d58c… Commit: d3d58caa28d779c76b6034a5d2abfe6d6ab368dd Parent: f4a59315a43bfac94f58493feaeea9680c05b5d7 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 12 11:38:28 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 12 14:23:53 2009 -0500 libfence: increase FENCE_AGENT_ARGS_MAX to 4096 The previous limit of 1024 may be a bit small in some cases. Also fix and clean up the handling of terminating \0 in the agent and args strings. The MAX values now include space for the terminating \0, and snprintfs are responsible for ensuring a \0. (Have tested and verified that the fence_log struct size change does not cause compatibility problems.) Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/libfence/agent.c | 6 +++--- fence/libfence/libfence.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c index 0749a52..adf12b1 100644 --- a/fence/libfence/agent.c +++ b/fence/libfence/agent.c @@ -264,7 +264,7 @@ static int use_device(int cd, char *victim, char *method, int d, goto out; } - strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX); + strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX-1); error = make_args(cd, victim, method, d, device, &args); if (error) { @@ -272,7 +272,7 @@ static int use_device(int cd, char *victim, char *method, int d, goto out_agent; } - strncpy(lp->agent_args, args, FENCE_AGENT_ARGS_MAX); + strncpy(lp->agent_args, args, FENCE_AGENT_ARGS_MAX-1); error = run_agent(agent, args, &lp->error); @@ -531,7 +531,7 @@ static int use_device_unfence(int cd, char *victim, int d, goto out; } - strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX); + strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX-1); error = make_args_unfence(cd, victim, d, device, &args); if (error) { diff --git a/fence/libfence/libfence.h b/fence/libfence/libfence.h index e3d2148..33f493a 100644 --- a/fence/libfence/libfence.h +++ b/fence/libfence/libfence.h @@ -16,15 +16,15 @@ extern "C" { #define FE_READ_METHOD 9 /* read (ccs) error on method */ #define FE_READ_DEVICE 10 /* read (ccs) error on method/device */ -#define FENCE_AGENT_NAME_MAX 256 -#define FENCE_AGENT_ARGS_MAX 1024 +#define FENCE_AGENT_NAME_MAX 256 /* including terminating \0 */ +#define FENCE_AGENT_ARGS_MAX 4096 /* including terminating \0 */ struct fence_log { int error; int method_num; int device_num; - char agent_name[FENCE_AGENT_NAME_MAX+1]; - char agent_args[FENCE_AGENT_ARGS_MAX+1]; + char agent_name[FENCE_AGENT_NAME_MAX]; + char agent_args[FENCE_AGENT_ARGS_MAX]; }; int fence_node(char *name, struct fence_log *log, int log_size, int *log_count);

1 0

fence: master - libfence: add nodename to agent args (for unfence)
by David Teigland 12 Oct '09

12 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=f4a593… Commit: f4a59315a43bfac94f58493feaeea9680c05b5d7 Parent: be7540a18c2cbc1c4e7daf0dfb2be57a426c6d52 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 12 11:26:21 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 12 14:23:49 2009 -0500 libfence: add nodename to agent args (for unfence) Add nodename of victim to agent args if it is not set explicitly as a per-node device arg. Some agents in the past, and probably the future, will want the nodename of the victim. It's so simple to add automatically that there's no reason not to always include it, and avoid requiring people to sometimes duplicate the name in the fence section. (same as previous commit but for unfence args) Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/libfence/agent.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c index d18c3a2..0749a52 100644 --- a/fence/libfence/agent.c +++ b/fence/libfence/agent.c @@ -414,7 +414,8 @@ int fence_node(char *victim, struct fence_log *log, int log_size, static int make_args_unfence(int cd, char *victim, int d, char *device, char **args_out) { - char path[PATH_MAX], *args, *str; + char path[PATH_MAX], arg[PATH_MAX]; + char *args, *str; int error, cnt = 0; args = malloc(FENCE_AGENT_ARGS_MAX); @@ -443,6 +444,14 @@ static int make_args_unfence(int cd, char *victim, int d, free(str); } + /* add nodename of victim to args */ + + if (!strstr(args, "nodename=")) { + memset(arg, 0, PATH_MAX); + snprintf(arg, PATH_MAX, "nodename=%s\n", victim); + strcat(args, arg); + } + /* device-specific args */ memset(path, 0, PATH_MAX);

1 0

fence: master - libfence: add nodename to agent args
by David Teigland 12 Oct '09

12 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=be7540… Commit: be7540a18c2cbc1c4e7daf0dfb2be57a426c6d52 Parent: d38cf8b6cfadd8d59ff28778400b6eacf6bc6381 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 12 10:56:51 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 12 14:23:46 2009 -0500 libfence: add nodename to agent args Add nodename of victim to agent args if it is not set explicitly as a per-node device arg. Some agents in the past, and probably the future, will want the nodename of the victim. It's so simple to add automatically that there's no reason not to always include it, and avoid requiring people to sometimes duplicate the name in the fence section. Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/libfence/agent.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c index c454f1b..d18c3a2 100644 --- a/fence/libfence/agent.c +++ b/fence/libfence/agent.c @@ -115,7 +115,8 @@ static int run_agent(char *agent, char *args, int *agent_result) static int make_args(int cd, char *victim, char *method, int d, char *device, char **args_out) { - char path[PATH_MAX], *args, *str; + char path[PATH_MAX], arg[PATH_MAX]; + char *args, *str; int error, cnt = 0; args = malloc(FENCE_AGENT_ARGS_MAX); @@ -144,6 +145,14 @@ static int make_args(int cd, char *victim, char *method, int d, free(str); } + /* add nodename of victim to args */ + + if (!strstr(args, "nodename=")) { + memset(arg, 0, PATH_MAX); + snprintf(arg, PATH_MAX, "nodename=%s\n", victim); + strcat(args, arg); + } + /* device-specific args */ memset(path, 0, PATH_MAX);

1 0

cluster: STABLE3 - libfence: replace strcat
by David Teigland 12 Oct '09

12 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d0… Commit: d02babbaf18c9fc3449ac744444b50fc45e7406b Parent: b2230a5adff95b1db62deb9acfbf0f37553101b9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 12 14:19:23 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 12 14:19:23 2009 -0500 libfence: replace strcat with snprintf which is just better and safer all around. Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/libfence/agent.c | 76 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 18 deletions(-) diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c index 4c19f10..5577fda 100644 --- a/fence/libfence/agent.c +++ b/fence/libfence/agent.c @@ -113,15 +113,19 @@ static int run_agent(char *agent, char *args, int *agent_result) static int make_args(int cd, char *victim, char *method, int d, char *device, char **args_out) { - char path[PATH_MAX], arg[PATH_MAX]; + char path[PATH_MAX]; char *args, *str; - int error, cnt = 0; + int error, ret, cnt = 0; + size_t len, pos; args = malloc(FENCE_AGENT_ARGS_MAX); if (!args) return -ENOMEM; memset(args, 0, FENCE_AGENT_ARGS_MAX); + len = FENCE_AGENT_ARGS_MAX - 1; + pos = 0; + /* node-specific args for victim */ memset(path, 0, PATH_MAX); @@ -138,17 +142,26 @@ static int make_args(int cd, char *victim, char *method, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* add nodename of victim to args */ if (!strstr(args, "nodename=")) { - memset(arg, 0, PATH_MAX); - snprintf(arg, PATH_MAX, "nodename=%s\n", victim); - strcat(args, arg); + ret = snprintf(args + pos, len - pos, "nodename=%s\n", victim); + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* device-specific args */ @@ -167,13 +180,20 @@ static int make_args(int cd, char *victim, char *method, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } if (cnt) error = 0; + out: if (error) { free(args); args = NULL; @@ -412,15 +432,19 @@ int fence_node(char *victim, struct fence_log *log, int log_size, static int make_args_unfence(int cd, char *victim, int d, char *device, char **args_out) { - char path[PATH_MAX], arg[PATH_MAX]; + char path[PATH_MAX]; char *args, *str; - int error, cnt = 0; + int error, ret, cnt = 0; + size_t len, pos; args = malloc(FENCE_AGENT_ARGS_MAX); if (!args) return -ENOMEM; memset(args, 0, FENCE_AGENT_ARGS_MAX); + len = FENCE_AGENT_ARGS_MAX - 1; + pos = 0; + /* node-specific args for victim */ memset(path, 0, PATH_MAX); @@ -437,17 +461,26 @@ static int make_args_unfence(int cd, char *victim, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* add nodename of victim to args */ if (!strstr(args, "nodename=")) { - memset(arg, 0, PATH_MAX); - snprintf(arg, PATH_MAX, "nodename=%s\n", victim); - strcat(args, arg); + ret = snprintf(args + pos, len - pos, "nodename=%s\n", victim); + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } /* device-specific args */ @@ -466,13 +499,20 @@ static int make_args_unfence(int cd, char *victim, int d, continue; } - strcat(args, str); - strcat(args, "\n"); + ret = snprintf(args + pos, len - pos, "%s\n", str); + free(str); + + if (ret >= len - pos) { + error = -E2BIG; + goto out; + } + pos += ret; } if (cnt) error = 0; + out: if (error) { free(args); args = NULL;

1 0

cluster: STABLE3 - libfence: increase FENCE_AGENT_ARGS_MAX to 4096
by David Teigland 12 Oct '09

12 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b2… Commit: b2230a5adff95b1db62deb9acfbf0f37553101b9 Parent: 65c092ae930b3ac8589406812d57204998ae46d0 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Oct 12 11:38:28 2009 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Oct 12 11:38:28 2009 -0500 libfence: increase FENCE_AGENT_ARGS_MAX to 4096 The previous limit of 1024 may be a bit small in some cases. Also fix and clean up the handling of terminating \0 in the agent and args strings. The MAX values now include space for the terminating \0, and snprintfs are responsible for ensuring a \0. (Have tested and verified that the fence_log struct size change does not cause compatibility problems.) Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/libfence/agent.c | 6 +++--- fence/libfence/libfence.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c index a4b30e8..4c19f10 100644 --- a/fence/libfence/agent.c +++ b/fence/libfence/agent.c @@ -262,7 +262,7 @@ static int use_device(int cd, char *victim, char *method, int d, goto out; } - strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX); + strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX-1); error = make_args(cd, victim, method, d, device, &args); if (error) { @@ -270,7 +270,7 @@ static int use_device(int cd, char *victim, char *method, int d, goto out_agent; } - strncpy(lp->agent_args, args, FENCE_AGENT_ARGS_MAX); + strncpy(lp->agent_args, args, FENCE_AGENT_ARGS_MAX-1); error = run_agent(agent, args, &lp->error); @@ -529,7 +529,7 @@ static int use_device_unfence(int cd, char *victim, int d, goto out; } - strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX); + strncpy(lp->agent_name, agent, FENCE_AGENT_NAME_MAX-1); error = make_args_unfence(cd, victim, d, device, &args); if (error) { diff --git a/fence/libfence/libfence.h b/fence/libfence/libfence.h index e3d2148..33f493a 100644 --- a/fence/libfence/libfence.h +++ b/fence/libfence/libfence.h @@ -16,15 +16,15 @@ extern "C" { #define FE_READ_METHOD 9 /* read (ccs) error on method */ #define FE_READ_DEVICE 10 /* read (ccs) error on method/device */ -#define FENCE_AGENT_NAME_MAX 256 -#define FENCE_AGENT_ARGS_MAX 1024 +#define FENCE_AGENT_NAME_MAX 256 /* including terminating \0 */ +#define FENCE_AGENT_ARGS_MAX 4096 /* including terminating \0 */ struct fence_log { int error; int method_num; int device_num; - char agent_name[FENCE_AGENT_NAME_MAX+1]; - char agent_args[FENCE_AGENT_ARGS_MAX+1]; + char agent_name[FENCE_AGENT_NAME_MAX]; + char agent_args[FENCE_AGENT_ARGS_MAX]; }; int fence_node(char *name, struct fence_log *log, int log_size, int *log_count);

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2009