cluster-commits January 2011

cluster-commits@lists.stg.fedorahosted.org

7 participants
62 discussions

cluster: STABLE31 - ccs_tool: completely remove references to update/upgrades
by Fabio M. Di Nitto 06 Jan '11

06 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3d… Commit: 3dc277e676bcc1fdb6be9d1746132594da64638b Parent: 26d29b91174bfbf6e1b0942d59eb0216f7624406 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Thu Jan 6 10:58:23 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Thu Jan 6 10:59:44 2011 +0100 ccs_tool: completely remove references to update/upgrades Drop parsing of CF options and update man page to better reflect what ccs_tool is and does. Resolves: rhbz#577874 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- config/tools/ccs_tool/editconf.c | 10 +++++----- config/tools/man/ccs_tool.8 | 37 ++++++++----------------------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/config/tools/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c index 9477d4e..fe52665 100644 --- a/config/tools/ccs_tool/editconf.c +++ b/config/tools/ccs_tool/editconf.c @@ -1170,7 +1170,7 @@ static int parse_commonw_options(int argc, char **argv, memset(ninfo, 0, sizeof(*ninfo)); - while ( (opt = getopt_long(argc, argv, "o:c:CFh?", commonw_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "o:c:h?", commonw_options, NULL)) != EOF) { switch(opt) { @@ -1359,7 +1359,7 @@ void add_node(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); ninfo.votes = "1"; - while ( (opt = getopt_long(argc, argv, "v:n:a:f:o:c:CFh?", addnode_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "v:n:a:f:o:c:h?", addnode_options, NULL)) != EOF) { switch(opt) { @@ -1546,7 +1546,7 @@ void add_service(int argc, char **argv) ninfo.autostart = "1"; ninfo.recovery = "relocate"; - while ( (opt = getopt_long(argc, argv, "a:d:x:r:f:o:c:s:i:CFh?", addservice_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "a:d:x:r:f:o:c:s:i:h?", addservice_options, NULL)) != EOF) { switch(opt) { @@ -1787,7 +1787,7 @@ void add_fs(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); - while ( (opt = getopt_long(argc, argv, "t:p:o:c:CFh?kus", addfs_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "t:p:o:c:h?kus", addfs_options, NULL)) != EOF) { switch(opt) { @@ -1858,7 +1858,7 @@ void add_fdomain(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); - while ( (opt = getopt_long(argc, argv, "pro:c:CFh?", addfdomain_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "pro:c:h?", addfdomain_options, NULL)) != EOF) { switch(opt) { diff --git a/config/tools/man/ccs_tool.8 b/config/tools/man/ccs_tool.8 index dd409e4..0f52f18 100644 --- a/config/tools/man/ccs_tool.8 +++ b/config/tools/man/ccs_tool.8 @@ -1,6 +1,6 @@ .TH "ccs_tool" "8" "" "" "" .SH "NAME" -ccs_tool \- The tool used to make online updates of CCS config files. +ccs_tool \- The tool used to make online queries to the cluster configuration. .SH "SYNOPSIS" .B ccs_tool @@ -8,10 +8,9 @@ ccs_tool \- The tool used to make online updates of CCS config files. .SH "DESCRIPTION" -\fBccs_tool\fP is part of the Cluster Configuration System (CCS). It is -used to make online updates to cluster.conf. It can also be used to -upgrade old style (GFS <= 6.0) CCS archives to the new xml cluster.conf -format. +\fBccs_tool\fP is part of the Cluster Configuration System (CCS). It used +to peform different kind of queries to the cluster configuration and has support +for some cluster.conf editing functions. .SH "OPTIONS" .TP @@ -24,6 +23,10 @@ Print the version information. sub\-commands have their own options, see below for more detail .SH "COMMANDS" +.TP +\fBquery\fP \fI<xpath query>\fP +Perform an xpath query on running cluster configuration. + .TP \fBaddnode\fP [options] \fI<node> [<fenceoption=value>]...\fP Adds a new node to the cluster configuration file. Fencing device options @@ -51,12 +54,6 @@ section must already have been added to the file, probably using the addfence co \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. @@ -71,12 +68,6 @@ and add it back in with the new properties. \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. @@ -93,12 +84,6 @@ device. \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. .TP \fBdelfence\fP [options] \fI<node>\fP @@ -112,12 +97,6 @@ invalid configuration file if you don't add it back in again. \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. .TP

1 0

cluster: STABLE31 - groupd: remove oom_adj
by Fabio M. Di Nitto 05 Jan '11

05 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=26… Commit: 26d29b91174bfbf6e1b0942d59eb0216f7624406 Parent: 4b14989b663d064a81bbb1b2a3eb6a1552a1ca61 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Jan 5 09:01:24 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Jan 5 09:01:24 2011 +0100 groupd: remove oom_adj even if groupd is "dead", let's keep it current as long as we ship the code. Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- group/daemon/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/group/daemon/main.c b/group/daemon/main.c index 3218f92..317a29c 100644 --- a/group/daemon/main.c +++ b/group/daemon/main.c @@ -983,18 +983,6 @@ static void read_arguments(int argc, char **argv) } } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - static void set_scheduler(void) { struct sched_param sched_param; @@ -1035,7 +1023,6 @@ int main(int argc, char *argv[]) log_level(LOG_INFO, "groupd %s", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); set_scheduler(); - set_oom_adj(-16); loop();

1 0

cluster: STABLE31 - cmannotifyd: remove oom_adj
by Fabio M. Di Nitto 05 Jan '11

05 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4b… Commit: 4b14989b663d064a81bbb1b2a3eb6a1552a1ca61 Parent: 1be8e09df7c95523f018298fc2e977e37a1dd278 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Jan 5 09:00:00 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Wed Jan 5 09:00:00 2011 +0100 cmannotifyd: remove oom_adj kernel ABI will change and I agree with David that, if necessary, something else should set it. Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/notifyd/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index d5c90c5..133706f 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -152,18 +152,6 @@ static void sigterm_handler(int sig) daemon_quit = 1; } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - static void set_scheduler(void) { struct sched_param sched_param; @@ -415,7 +403,6 @@ int main(int argc, char **argv) lockfile(); init_logging(0); signal(SIGTERM, sigterm_handler); - set_oom_adj(-16); if (rr) set_scheduler();

1 0

cluster: STABLE31 - Revert "cman: Fix udpb handling in cman-preconfig"
by Lon Hohberger 04 Jan '11

04 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1b… Commit: 1be8e09df7c95523f018298fc2e977e37a1dd278 Parent: f3c755ed73d052d8a8514c804cfdf910c2f96572 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Jan 4 15:05:35 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Tue Jan 4 15:05:35 2011 -0500 Revert "cman: Fix udpb handling in cman-preconfig" This reverts commit 161f81ed5d0acfcb01b85a889251e704819897b0. Apparently, this case was handled in a roundabout way and I was completely incorrect. --- cman/daemon/cman-preconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c index 5d608a7..5239d89 100644 --- a/cman/daemon/cman-preconfig.c +++ b/cman/daemon/cman-preconfig.c @@ -286,7 +286,7 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr, int ret = 0; const char *tx_mech_to_str[] = { [TX_MECH_UDP] = "udp", - [TX_MECH_UDPB] = "udpb", + [TX_MECH_UDPB] = "udp", [TX_MECH_UDPU] = "udpu", [TX_MECH_RDMA] = "iba", };

1 0

fence: master - fenced: remove oom_adj
by David Teigland 04 Jan '11

04 Jan '11

Gitweb: http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=c36edd… Commit: c36edde1d07fa8ba54cc9e9f78a3b4905b8b4f68 Parent: 216875bdc79edd22def7feb6d5a8c73a216191b9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jan 4 09:54:58 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jan 4 09:54:58 2011 -0600 fenced: remove oom_adj kernel abi changed, and I don't think we should be setting this ourselves in the future anyway Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/fence/fenced/main.c b/fence/fenced/main.c index 580afce..2a4678f 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -956,18 +956,6 @@ static void read_arguments(int argc, char **argv) } } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - int main(int argc, char **argv) { INIT_LIST_HEAD(&domains); @@ -988,7 +976,6 @@ int main(int argc, char **argv) init_logging(); log_level(LOG_INFO, "fenced %s started", VERSION); signal(SIGTERM, sigterm_handler); - set_oom_adj(-16); loop();

1 0

cluster: STABLE31 - fenced, dlm_controld: remove oom_adj
by David Teigland 04 Jan '11

04 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f3… Commit: f3c755ed73d052d8a8514c804cfdf910c2f96572 Parent: 161f81ed5d0acfcb01b85a889251e704819897b0 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jan 4 09:53:32 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jan 4 09:53:32 2011 -0600 fenced, dlm_controld: remove oom_adj kernel abi has changed, and I don't think we should be setting this ourselves in the future anyway Signed-off-by: David Teigland <teigland(a)redhat.com> --- fence/fenced/main.c | 13 ------------- group/dlm_controld/main.c | 13 ------------- 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/fence/fenced/main.c b/fence/fenced/main.c index e5ab568..1c61962 100644 --- a/fence/fenced/main.c +++ b/fence/fenced/main.c @@ -1008,18 +1008,6 @@ static void read_arguments(int argc, char **argv) } } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - int main(int argc, char **argv) { INIT_LIST_HEAD(&domains); @@ -1040,7 +1028,6 @@ int main(int argc, char **argv) init_logging(); log_level(LOG_INFO, "fenced %s started", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); - set_oom_adj(-16); loop(); diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index ce88a83..b3be2fc 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -1274,18 +1274,6 @@ static void read_arguments(int argc, char **argv) } } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - static void set_scheduler(void) { struct sched_param sched_param; @@ -1322,7 +1310,6 @@ int main(int argc, char **argv) log_level(LOG_INFO, "dlm_controld %s started", RELEASE_VERSION); signal(SIGTERM, sigterm_handler); set_scheduler(); - set_oom_adj(-16); loop();

1 0

gfs2-utils: master - gfs_controld: remove oom_adj
by David Teigland 04 Jan '11

04 Jan '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: 84f68cec946fa50148815062512109c687958af5 Parent: b2287ab25756f2e7c384af92a9dfebc8ffab2b83 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jan 4 09:51:47 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jan 4 09:51:47 2011 -0600 gfs_controld: remove oom_adj kernel abi has changed, and I don't think we should be setting this ourselves in the future anyway. Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/gfs_controld/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 3fe4227..252965a 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -1423,18 +1423,6 @@ static void read_arguments(int argc, char **argv) } } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - static void set_scheduler(void) { struct sched_param sched_param; @@ -1471,7 +1459,6 @@ int main(int argc, char **argv) log_level(LOG_INFO, "gfs_controld %s started", VERSION); signal(SIGTERM, sigterm_handler); set_scheduler(); - set_oom_adj(-16); loop();

1 0

dlm: master - dlm_controld: remove oom_adj
by David Teigland 04 Jan '11

04 Jan '11

Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=9ccd853b6d… Commit: 9ccd853b6d36e99af1100548d1e389fc921f10d4 Parent: 940d8896eb1ef1056ea752ac45cb332314ca68ba Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jan 4 09:49:49 2011 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jan 4 09:50:54 2011 -0600 dlm_controld: remove oom_adj kernel abi has changed, and I don't think we should be setting this ourselves in the future anyway. Signed-off-by: David Teigland <teigland(a)redhat.com> --- group/dlm_controld/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index 0ce2c39..0436205 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -1213,18 +1213,6 @@ static void read_arguments(int argc, char **argv) } } -static void set_oom_adj(int val) -{ - FILE *fp; - - fp = fopen("/proc/self/oom_adj", "w"); - if (!fp) - return; - - fprintf(fp, "%i", val); - fclose(fp); -} - static void set_scheduler(void) { struct sched_param sched_param; @@ -1261,7 +1249,6 @@ int main(int argc, char **argv) log_level(LOG_INFO, "dlm_controld %s started", VERSION); signal(SIGTERM, sigterm_handler); set_scheduler(); - set_oom_adj(-16); loop();

1 0

cluster: RHEL6 - resource-agents: Stop using '-' as 1st char of log messages
by Lon Hohberger 03 Jan '11

03 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ca… Commit: ca38fb4ad8caaf1f670fb0c7aedf08baae8e3a84 Parent: ab93700c01af315656c63a5c5bd7387a347a390d Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Tue Sep 14 10:44:51 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Jan 3 15:21:02 2011 -0500 resource-agents: Stop using '-' as 1st char of log messages Resolves: rhbz#633856 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> Reviewed-by: Jonathan Brassow <jbrassow(a)redhat.com> --- rgmanager/src/resources/lvm.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index 7f174ca..e71460c 100644 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -28,7 +28,7 @@ function ha_lvm_proper_setup_check ## if ! lvm dumpconfig activation/volume_list >& /dev/null; then ocf_log err "HA LVM: Improper setup detected" - ocf_log err "- \"volume_list\" not specified in lvm.conf." + ocf_log err "* \"volume_list\" not specified in lvm.conf." return $OCF_ERR_GENERIC fi @@ -38,7 +38,7 @@ function ha_lvm_proper_setup_check ## if ! lvm dumpconfig activation/volume_list | grep $(local_node_name); then ocf_log err "HA LVM: Improper setup detected" - ocf_log err "- @$(local_node_name) missing from \"volume_list\" in lvm.conf" + ocf_log err "* @$(local_node_name) missing from \"volume_list\" in lvm.conf" return $OCF_ERR_GENERIC fi @@ -49,7 +49,7 @@ function ha_lvm_proper_setup_check ## if lvm dumpconfig activation/volume_list | grep "\"$OCF_RESKEY_vg_name\""; then ocf_log err "HA LVM: Improper setup detected" - ocf_log err "- $OCF_RESKEY_vg_name found in \"volume_list\" in lvm.conf" + ocf_log err "* $OCF_RESKEY_vg_name found in \"volume_list\" in lvm.conf" return $OCF_ERR_GENERIC fi @@ -61,7 +61,7 @@ function ha_lvm_proper_setup_check # Fixme: we might be able to perform a better check... if [ "$(find /boot -name *.img -newer /etc/lvm/lvm.conf)" == "" ]; then ocf_log err "HA LVM: Improper setup detected" - ocf_log err "- initrd image needs to be newer than lvm.conf" + ocf_log err "* initrd image needs to be newer than lvm.conf" return $OCF_ERR_GENERIC fi

1 0

cluster: STABLE31 - cman: Fix udpb handling in cman-preconfig
by Lon Hohberger 03 Jan '11

03 Jan '11

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=16… Commit: 161f81ed5d0acfcb01b85a889251e704819897b0 Parent: 2f3e00c93d582f8ecbb8030fed21311ba9c5fed9 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Mon Jan 3 13:18:33 2011 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Mon Jan 3 13:21:31 2011 -0500 cman: Fix udpb handling in cman-preconfig Makes handling match line 708 in cman-preconfig.c. Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- cman/daemon/cman-preconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c index 5239d89..5d608a7 100644 --- a/cman/daemon/cman-preconfig.c +++ b/cman/daemon/cman-preconfig.c @@ -286,7 +286,7 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr, int ret = 0; const char *tx_mech_to_str[] = { [TX_MECH_UDP] = "udp", - [TX_MECH_UDPB] = "udp", + [TX_MECH_UDPB] = "udpb", [TX_MECH_UDPU] = "udpu", [TX_MECH_RDMA] = "iba", };

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits January 2011