[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-80-ga87f95f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a87f95fa74fc4376915fb661b8c681ccd5641145
The branch, master has been updated
via a87f95fa74fc4376915fb661b8c681ccd5641145 (commit)
from 1b71d4bfcc3f42974b0cc34dc81a98f3c5224a8b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit a87f95fa74fc4376915fb661b8c681ccd5641145
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jul 29 07:12:37 2008 +0200
config: allow users to override default config file in xmlconfig
By setting CLUSTER_CONFIG_FILE either in the enviroment it is possible
to use an alternate cluster.conf.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
config/plugins/xml/config.c | 20 +---
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c
index 84eee55..1328bca 100644
--- a/config/plugins/xml/config.c
+++ b/config/plugins/xml/config.c
@@ -13,11 +13,13 @@
#include logging.h
static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string);
-static int init_config(struct objdb_iface_ver0 *objdb, char *error_string);
+static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, char
*error_string);
static char error_reason[1024];
static int xmllistindex = 0;
static char previous_query[PATH_MAX];
+#define DEFAULT_CONFIG DEFAULT_CONFIG_DIR / DEFAULT_CONFIG_FILE
+
/*
* Exports the interface for the service
*/
@@ -237,16 +239,20 @@ static int read_config_for(xmlXPathContextPtr ctx, struct
objdb_iface_ver0 *objd
static int xml_readconfig(struct objdb_iface_ver0 *objdb, char **error_string)
{
- int ret;
+ int ret = 0;
+ char *configfile = DEFAULT_CONFIG;
/* We need to set this up to internal defaults too early */
openlog(openais, LOG_CONS|LOG_PID, SYSLOGFACILITY);
+ if(getenv(CLUSTER_CONFIG_FILE))
+ configfile = getenv(CLUSTER_CONFIG_FILE);
+
/* Read low-level totem/aisexec etc config from cluster.conf */
- if ( !(ret = init_config(objdb, error_reason)) )
- sprintf (error_reason, %s, Successfully read config from
DEFAULT_CONFIG_DIR / DEFAULT_CONFIG_FILE \n);
+ if ( !(ret = init_config(objdb, configfile, error_reason)) )
+ sprintf (error_reason, Successfully read config from %s\n,
configfile);
else
- sprintf (error_reason, %s, Unable to read config from
DEFAULT_CONFIG_DIR / DEFAULT_CONFIG_FILE \n);
+ sprintf (error_reason, Unable to read config from %s\n,
configfile);
*error_string = error_reason;
@@ -254,7 +260,7 @@ static int xml_readconfig(struct objdb_iface_ver0 *objdb,
char **error_string)
}
-static int init_config(struct objdb_iface_ver0 *objdb, char *error_string)
+static int init_config(struct objdb_iface_ver0 *objdb, char *configfile, char
*error_string)
{
int err = 0;
xmlDocPtr doc = NULL;
@@ -262,7 +268,7 @@ static int init_config(struct objdb_iface_ver0 *objdb, char
*error_string)
/* openfile */
- doc = xmlParseFile(DEFAULT_CONFIG_DIR / DEFAULT_CONFIG_FILE);
+ doc = xmlParseFile(configfile);
if (!doc) {
err = -1;
goto fail;
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-75-ge14f899
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e14f8997dc1e672523fbf4f942ddc0a75ae9b8a1
The branch, master has been updated
via e14f8997dc1e672523fbf4f942ddc0a75ae9b8a1 (commit)
from 4b063b36535e69b2226170d63d8f94c16d6055c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit e14f8997dc1e672523fbf4f942ddc0a75ae9b8a1
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jul 28 06:23:11 2008 +0200
cman: init script should not user cluster.conf directly
fence_xvmd function needs to query the config to know if the daemon
should start or not.
switch an xmllint call to a ccs_tool query and remove hardcoded
dependency on cluster.conf
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/init.d/Makefile | 16
cman/init.d/{cman.in = cman} | 17 ++---
2 files changed, 14 insertions(+), 19 deletions(-)
rename cman/init.d/{cman.in = cman} (98%)
diff --git a/cman/init.d/Makefile b/cman/init.d/Makefile
index 954dd27..1f7f5f4 100644
--- a/cman/init.d/Makefile
+++ b/cman/init.d/Makefile
@@ -1,19 +1,11 @@
-TARGET=cman
+TARGET=cman qdiskd
-INITDT=$(TARGET) qdiskd
+INITDT=$(TARGET)
-all: $(TARGET)
+all:
include ../../make/defines.mk
-include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-$(TARGET):
- cat $(S)/$(TARGET).in | sed \
- -e '[EMAIL PROTECTED]@#${CONFDIR}#g' \
- -e '[EMAIL PROTECTED]@#${CONFFILE}#g' \
-$(TARGET)
- chmod 755 $(TARGET)
-
-clean: generalclean
+clean:
diff --git a/cman/init.d/cman.in b/cman/init.d/cman
similarity index 98%
rename from cman/init.d/cman.in
rename to cman/init.d/cman
index 1134e80..f489dd1 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/BIN/BAsh
#
# cman - Cluster Manager init script
#
@@ -235,17 +235,20 @@ fence_xvmd_enabled()
# running on a machine capable of running xvmd.
#
which xm /dev/null || return 1
-
+
#
# Check for presence of /cluster/fence_xvmd in cluster.conf
# (If -X is specified, it doesn't matter if it's in cluster.conf;
# we'll start it anyway since ccsd is not required)
#
-if [ $FENCE_XVMD_OPTS = ${FENCE_XVMD_OPTS/-X/} ]; then
-xmllint --shell @CONFDIR@/@CONFFILE@ 2 /dev/null \
- (echo ls cluster) | grep -q fence_xvmd || return 1
-fi
-
+/sbin/cman_tool status /dev/null
+if [ $? -eq 0 ]
+then
+ if [ $FENCE_XVMD_OPTS = ${FENCE_XVMD_OPTS/-X/} ]; then
+ ccs_tool query /cluster/fence_xvmd || return 1
+ fi
+fi
+
return 0
}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-76-g8b939cb
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8b939cb1231ad3ff267e0d94f4937edfe2a54908
The branch, master has been updated
via 8b939cb1231ad3ff267e0d94f4937edfe2a54908 (commit)
from e14f8997dc1e672523fbf4f942ddc0a75ae9b8a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 8b939cb1231ad3ff267e0d94f4937edfe2a54908
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jul 28 06:34:52 2008 +0200
rgmanager: init script does not need network config
rgmanager init LSB header already express the requirement for network
via Required-Start: cman that in chain Required-Start: $network.
Lack of network will not start cman and as consequence rgmanager.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
rgmanager/init.d/rgmanager | 11 ---
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/rgmanager/init.d/rgmanager b/rgmanager/init.d/rgmanager
index 6ae333a..d307c17 100644
--- a/rgmanager/init.d/rgmanager
+++ b/rgmanager/init.d/rgmanager
@@ -16,9 +16,6 @@
# Source function library
. /etc/init.d/functions
-# Grab the network config file
-. /etc/sysconfig/network
-
# Grab cluster start config if it exists
[ -f /etc/sysconfig/cluster ] . /etc/sysconfig/cluster
@@ -83,14 +80,6 @@ stop_cluster()
case $1 in
start)
- #
- # If we're not configured, then don't start anything.
- #
- if [ ${NETWORKING} != yes ]; then
- echo Cannot start $ID: Networking not configured
- exit 1
- fi
-
echo -n $Starting $ID:
daemon $RGMGRD $RGMGR_OPTS
ret=$?
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-70-g37f6d47
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=37f6d47cb10977b33267a449e22a755e27164c35 The branch, master has been updated via 37f6d47cb10977b33267a449e22a755e27164c35 (commit) via 45148006e107401911b3c33632ad1a07f7dd3c05 (commit) via 485d0902e6fa115d020a17fdfbbf830c0cac3bf2 (commit) via 108a4bfd6b43acd5456dba85f9795386fa511375 (commit) via c627f11488dc6c28c01ebb5521432157617e7840 (commit) via 02523a530a0b4cb3d63603dda6ff37c496c35614 (commit) from e968098fa53e14d1cc9e60c42a4102674ecb51d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 37f6d47cb10977b33267a449e22a755e27164c35 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 12:03:56 2008 +0200 fence: port scsi agent to use ccs_tool query and drop XML::LibXML requirement The new ccs_tool query is able to answer to the queries from fence_scsi*. Drop the need of XML::LibXML. Use ccs_tool query directly. Abstract from the need of parsing cluster.conf that is not the authoritative config file anymore. Drop unrequire check_config_nodes that's already embedded in the need of cman to run this code. Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] commit 45148006e107401911b3c33632ad1a07f7dd3c05 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 12:03:16 2008 +0200 fence: simplify init script fence_scsi needs cman to run. Verify that cman is running as first thing, before querying for config information that are now stored in cman/aisexec. cman already guarantees that all nodes have a nodeid. Drop this redundant check. Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] commit 485d0902e6fa115d020a17fdfbbf830c0cac3bf2 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 12:02:32 2008 +0200 rgmanger: remove check on cluster.conf from rgmanager init script cluster.conf is not the only authoritative configuration file anymore. LDAP and others could be in place. Remove the check and allow rgmanager to start. Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] commit 108a4bfd6b43acd5456dba85f9795386fa511375 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 12:01:16 2008 +0200 Revert rgmanger: remove check on cluster.conf from rgmanager init script This reverts commit 691c72052655c0f7c8142c35145237e122ae6b86. commit c627f11488dc6c28c01ebb5521432157617e7840 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 12:01:03 2008 +0200 Revert fence: simplify init script This reverts commit 6a0647657348dd732615b7a0b7d6aad89c85b93a. commit 02523a530a0b4cb3d63603dda6ff37c496c35614 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 12:00:49 2008 +0200 Revert fence: port scsi agent to use ccs_tool query and drop XML::LibXML requirement This reverts commit e968098fa53e14d1cc9e60c42a4102674ecb51d2. --- Summary of changes: hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-74-g4b063b3
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4b063b36535e69b2226170d63d8f94c16d6055c6 The branch, master has been updated via 4b063b36535e69b2226170d63d8f94c16d6055c6 (commit) from a54d8cbe8a6fa83b647cdc6da57f15604d5f0f00 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 4b063b36535e69b2226170d63d8f94c16d6055c6 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jul 25 21:58:58 2008 +0200 rgmanager: fix clean target stub clean target in init script Makefile Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: rgmanager/init.d/Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/init.d/Makefile b/rgmanager/init.d/Makefile index 5ead895..f76190b 100644 --- a/rgmanager/init.d/Makefile +++ b/rgmanager/init.d/Makefile @@ -8,6 +8,6 @@ include ../../make/defines.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk -clean: generalclean +clean: check: hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-47-g26ae5a2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e The branch, master has been updated via 26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e (commit) from 599cc3275d45e4f69d2cc8d47cc02196ca3dd8bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e Author: Ryan McCabe [EMAIL PROTECTED] Date: Tue Jul 22 15:56:13 2008 -0400 fence: update apc snmp agent Pushing update to fix bz447414 for jparsons --- Summary of changes: fence/agents/apc_snmp/fence_apc_snmp.py | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index a2faef4..dea529f 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -10,6 +10,7 @@ import getopt, sys import os import datetime +import time import select import signal from glob import glob @@ -341,15 +342,18 @@ def main2(): sys.exit(1) if 'switch' not in params: params['switch'] = '' + + if 'option' not in params: + params['option'] = 'reboot' try: act = params['option'].lower() if act in ['on', 'off', 'reboot', 'status']: params['option'] = act else: - usage() - sys.exit(3) + raise Exception except: - params['option'] = 'reboot' + usage() + sys.exit(3) ### End of validation ### @@ -377,6 +381,7 @@ def main2(): raise Exception, 'Error turning outlet off' elif params['option'] == 'reboot': agent.power_off() + time.sleep(3) if agent.status() != 'off': raise Exception, 'Error turning outlet off' agent.power_on() hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.05-9-g8819aeb
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 The branch, STABLE2 has been updated via 8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 (commit) from 4637645af1bbb086b198a008bf6553dfb8bb0157 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 8819aeb2ea8d74c23c4af717bec8d55f8fcdb263 Author: Ryan McCabe [EMAIL PROTECTED] Date: Tue Jul 22 15:56:13 2008 -0400 fence: update apc snmp agent Pushing update to fix bz447414 for jparsons --- Summary of changes: fence/agents/apc_snmp/fence_apc_snmp.py | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 63de054..b635193 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -10,6 +10,7 @@ import getopt, sys import os import datetime +import time import select import signal from glob import glob @@ -341,15 +342,18 @@ def main2(): sys.exit(1) if 'switch' not in params: params['switch'] = '' + + if 'option' not in params: + params['option'] = 'reboot' try: act = params['option'].lower() if act in ['on', 'off', 'reboot', 'status']: params['option'] = act else: - usage() - sys.exit(3) + raise Exception except: - params['option'] = 'reboot' + usage() + sys.exit(3) ### End of validation ### @@ -377,6 +381,7 @@ def main2(): raise Exception, 'Error turning outlet off' elif params['option'] == 'reboot': agent.power_off() + time.sleep(3) if agent.status() != 'off': raise Exception, 'Error turning outlet off' agent.power_on() hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-48-g0c717ae
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0c717ae41f58c1fd7a7f6fba3056af9dc41746bb
The branch, master has been updated
via 0c717ae41f58c1fd7a7f6fba3056af9dc41746bb (commit)
from 26ae5a24dcfd0ef15582d7018bbb1e0a1c3a595e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0c717ae41f58c1fd7a7f6fba3056af9dc41746bb
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 23 12:54:08 2008 +0200
[BUILD] Cleanup groupd makefile
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
group/daemon/Makefile |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/group/daemon/Makefile b/group/daemon/Makefile
index eea0b93..5d0a96e 100644
--- a/group/daemon/Makefile
+++ b/group/daemon/Makefile
@@ -21,9 +21,10 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
CFLAGS += -I$(S) -I$(S)/../include/ -I$(S)/../lib/
CFLAGS += -I${incdir}
-LDFLAGS += -L${ccslibdir} -lccs -llogsys
-LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg
-
+LDFLAGS += -L${ccslibdir} -lccs
+LDFLAGS += -L${cmanlibdir} -lcman
+LDFLAGS += -L${openaislibdir} -lcpg -llogsys -lpthread
+LDFLAGS += -L${libdir}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-49-gcdfef21
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=cdfef21c7ea49a9ad2af834f92869215b2149338 The branch, master has been updated via cdfef21c7ea49a9ad2af834f92869215b2149338 (commit) from 0c717ae41f58c1fd7a7f6fba3056af9dc41746bb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit cdfef21c7ea49a9ad2af834f92869215b2149338 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jul 24 07:27:12 2008 +0200 build: update .gitignore Add some more files we can ignore Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: .gitignore |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 30194b5..4ca135d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,10 @@ make/defines.mk *.a *.so* *.lcrso +*.po +.*.*o.cmd +.tmp_versions +*.ko +Module.symvers +modules.order +*.mod.c hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.05-8-g4637645
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4637645af1bbb086b198a008bf6553dfb8bb0157
The branch, STABLE2 has been updated
via 4637645af1bbb086b198a008bf6553dfb8bb0157 (commit)
from ba6da460dab95afa3219e1ec910e4ead30e12a81 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 4637645af1bbb086b198a008bf6553dfb8bb0157
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jul 22 06:59:28 2008 +0200
[FENCE] Sync fence_apc_snmp from RHEL47 branch
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/apc_snmp/fence_apc_snmp.py | 576 ++-
1 files changed, 336 insertions(+), 240 deletions(-)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py
b/fence/agents/apc_snmp/fence_apc_snmp.py
index da8a4e8..63de054 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -9,7 +9,7 @@
import getopt, sys
import os
-import time
+import datetime
import select
import signal
from glob import glob
@@ -24,49 +24,251 @@ POWER_ON=outletOn
POWER_OFF=outletOff
POWER_REBOOT=outletReboot
+
+# oid defining fence device
+oid_sysObjectID = '.1.3.6.1.2.1.1.2.0'
+
+
+
+class SNMP:
+ def __init__(self, params):
+ self.hostname = params['ipaddr']
+ self.udpport = params['udpport']
+ self.community = params['community']
+
+ def get(self, oid):
+ args = ['@SNMPBIN@/snmpget']
+ args.append('-Oqn')
+ args.append('-v')
+ args.append('1')
+ args.append('-c')
+ args.append(self.community)
+ args.append('-m')
+ args.append('ALL')
+ args.append(self.hostname + ':' + self.udpport)
+ args.append(oid)
+ strr, code = execWithCaptureStatus(@SNMPBIN@/snmpget, args)
+ if code:
+ raise Exception, 'snmpget failed'
+ l = strr.strip().split()
+ return l[0], ' '.join(l[1:])
+
+ def set_int(self, oid, value):
+ args = ['@SNMPBIN@/snmpset']
+ args.append('-Oqn')
+ args.append('-v')
+ args.append('1')
+ args.append('-c')
+ args.append(self.community)
+ args.append('-m')
+ args.append('ALL')
+ args.append(self.hostname + ':' + self.udpport)
+ args.append(oid)
+ args.append('i')
+ args.append(str(value))
+ strr,code = execWithCaptureStatus(@SNMPBIN@/snmpset, args)
+ if code:
+ raise Exception, 'snmpset failed'
+
+ def walk(self, oid):
+ args = ['@SNMPBIN@/snmpwalk']
+ args.append('-Oqn')
+ args.append('-v')
+ args.append('1')
+ args.append('-c')
+ args.append(self.community)
+ args.append('-m')
+ args.append('ALL')
+ args.append(self.hostname + ':' + self.udpport)
+ args.append(oid)
+ strr,code = execWithCaptureStatus(@SNMPBIN@/snmpwalk, args)
+ if code:
+ raise Exception, 'snmpwalk failed'
+ lines = strr.strip().splitlines()
+ ret = []
+ for line in lines:
+ l = line.strip().split()
+ ret.append((l[0], ' '.join(l[1:]).strip('')))
+ return ret
+
+
+
+class FenceAgent:
+
+ def __init__(self, params):
+ self.snmp = SNMP(params)
+
+ def resolve_outlet(self):
+ raise Exception, 'resolve_outlet() not implemented'
+
+ def status(self):
+ oid = self.status_oid % self.resolve_outlet()
+ dummy, stat = self.snmp.get(oid)
+ if stat == self.state_on or stat == outletStatusOn:
+ return 'on'
+ elif stat == self.state_off or stat == outletStatusOff:
+ return 'off'
+ else:
+ raise Exception, 'invalid status ' + stat
+
+ def power_off(self):
+ oid = self.control_oid % self.resolve_outlet()
+ self.snmp.set_int(oid, self.turn_off)
+
+ def power_on(self):
+ oid = self.control_oid % self.resolve_outlet()
+
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-41-g4c05bff
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4c05bff7a76b6909b350b2d4d1ad06f48f968510
The branch, master has been updated
via 4c05bff7a76b6909b350b2d4d1ad06f48f968510 (commit)
from b3877bc1cb5e24c72a480f48ef05b008471c6627 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 4c05bff7a76b6909b350b2d4d1ad06f48f968510
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jul 22 07:07:18 2008 +0200
[BUILD] Fix LOGDIR usage
LOGDIR was duplicate of logdir. Remove the duplication and use logdir as
it should be.
Also add logdir info to fencebuild, required for fence_apc_snmp
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
doc/Makefile |2 +-
make/defines.mk.input |2 --
make/fencebuild.mk|1 +
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index c54358b..10a076c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,7 +20,7 @@ include $(OBJDIR)/make/clean.mk
$(TARGET):
cat $(S)/$(TARGET).logrotate.in | sed \
- -e '[EMAIL PROTECTED]@#${LOGDIR}#g' \
+ -e '[EMAIL PROTECTED]@#${logdir}#g' \
$(TARGET)
clean: generalclean
diff --git a/make/defines.mk.input b/make/defines.mk.input
index f24a82b..0a457f1 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -88,7 +88,5 @@ S=$(SRCDIR)/$(THISDIR)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
UNINSTALL = perl @SRCDIR@/scripts/uninstall.pl
FENCEPARSE = bash @SRCDIR@/scripts/fenceparse
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 34a8550..73fd26b 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -19,6 +19,7 @@ $(TARGET):
-e '[EMAIL PROTECTED]@#${fenceagentslibdir}#g' \
-e '[EMAIL PROTECTED]@#${mibdir}#g' \
-e '[EMAIL PROTECTED]@#${snmpbin}#g' \
+ -e '[EMAIL PROTECTED]@#${logdir}#g' \
$@
chmod +x $@
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-42-g228cbfc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=228cbfc49f5acbd8a0dc514b7385f7d9fd4ae6c5
The branch, master has been updated
via 228cbfc49f5acbd8a0dc514b7385f7d9fd4ae6c5 (commit)
from 4c05bff7a76b6909b350b2d4d1ad06f48f968510 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 228cbfc49f5acbd8a0dc514b7385f7d9fd4ae6c5
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jul 22 07:10:35 2008 +0200
[FENCE] Fix fence_apc_snmp logging
Move log file together with all the others when invoked in verbose mode.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/apc_snmp/fence_apc_snmp.py |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py
b/fence/agents/apc_snmp/fence_apc_snmp.py
index 63de054..a2faef4 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -215,7 +215,7 @@ def usage():
print -c community SNMP community (default 'private')
print -n num Outlet name/number to act on
print -o string Action: Reboot (default), On, Off and Status
-print -v Verbose mode - write to /tmp/apclog
+print -v Verbose mode - write to
@LOGDIR@/fence_apc_snmp.log
print -V Version
sys.exit(0)
@@ -226,7 +226,7 @@ file_log = None
def set_logging(verbose):
global file_log
if verbose:
- file_log = open('/tmp/apclog', 'a')
+ file_log = open('@LOGDIR@/fence_apc_snmp.log', 'a')
file_log.write('\n--- ')
file_log.write(datetime.datetime.today().ctime())
file_log.write(' ---\n')
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-43-g9f4d378
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9f4d3788296a18ac012354ef616d857cc35a842d
The branch, master has been updated
via 9f4d3788296a18ac012354ef616d857cc35a842d (commit)
from 228cbfc49f5acbd8a0dc514b7385f7d9fd4ae6c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 9f4d3788296a18ac012354ef616d857cc35a842d
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jul 22 07:42:15 2008 +0200
[BUILD] Cleanup linking order for logsys
Collect all openais libs into their own LDFLAGS entry
Linking to logsys requires pthread
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/fenced/Makefile |6 +++---
group/dlm_controld/Makefile |5 ++---
group/gfs_controld/Makefile |5 +++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
index 7804224..f4840c4 100644
--- a/fence/fenced/Makefile
+++ b/fence/fenced/Makefile
@@ -23,11 +23,11 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir}
-I${openaisincdir}
CFLAGS += -I$(S) -I$(S)/../include -I$(S)/../libfenced -I$(SRCDIR)/group/lib
CFLAGS += -I${incdir}
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${openaislibdir} -lccs -lcman -lcpg
-LDFLAGS += -L${fencelibdir} -L${openaislibdir} -lfence -llogsys -lpthread
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
+LDFLAGS += -L${fencelibdir} -lfence
+LDFLAGS += -L${openaislibdir} -lcpg -llogsys -lpthread
LDFLAGS += -L../../group/lib -l group
-
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 175e44b..fed6297 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -31,10 +31,9 @@ CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L${dlmlibdir} -ldlm
-LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread
LDFLAGS += -L../../fence/libfenced/ -lfenced
-LDFLAGS += -L../lib -lgroup -lpthread -llogsys
-
+LDFLAGS += -L../lib -lgroup
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile
index ff1dfc3..6c68a7a 100644
--- a/group/gfs_controld/Makefile
+++ b/group/gfs_controld/Makefile
@@ -29,9 +29,10 @@ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman
-LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol
+LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread
LDFLAGS += -L../../fence/libfenced/ -lfenced
-LDFLAGS += -L../lib -lgroup -llogsys
+LDFLAGS += -L../lib -lgroup
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-21-g2eaca4f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=2eaca4f9e31409f110ae318d1f192673dd744e33
The branch, master has been updated
via 2eaca4f9e31409f110ae318d1f192673dd744e33 (commit)
from f4bcfa1d8e73f7402545dc60ab8affe96c1b01c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 2eaca4f9e31409f110ae318d1f192673dd744e33
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 17 14:29:14 2008 +0200
[RGMANAGER] Use proper ccs_tool query output
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
rgmanager/src/resources/smb.sh | 14 +++---
rgmanager/src/resources/utils/config-utils.sh.in | 14 +++---
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/rgmanager/src/resources/smb.sh b/rgmanager/src/resources/smb.sh
index 9fad178..8131743 100644
--- a/rgmanager/src/resources/smb.sh
+++ b/rgmanager/src/resources/smb.sh
@@ -112,20 +112,12 @@ ccs_get()
key=$*
- outp=$(ccs_tool query -c $key 21)
+ outp=$(ccs_tool query $key 21)
if [ $? -ne 0 ]; then
- if [ $outp = ${outp/No data available/} ]; then
- ocf_log err $outp ($key)
- return $_FAIL
- fi
-
- # no real error, just no data available
- return 0
+ ocf_log err $outp ($key)
+ return $_FAIL
fi
- outp=${outp/*/}
- outp=${outp/*/}
-
echo $outp
return 0
diff --git a/rgmanager/src/resources/utils/config-utils.sh.in
b/rgmanager/src/resources/utils/config-utils.sh.in
index 3222962..c3a92f2 100644
--- a/rgmanager/src/resources/utils/config-utils.sh.in
+++ b/rgmanager/src/resources/utils/config-utils.sh.in
@@ -58,20 +58,12 @@ ccs_get()
key=$*
- outp=$(ccs_tool query -c $key 21)
+ outp=$(ccs_tool query $key 21)
if [ $? -ne 0 ]; then
- if [ $outp = ${outp/No data available/} ]; then
- ocf_log err $outp ($key)
- return $FAIL
- fi
-
- # no real error, just no data available
- return 0
+ ocf_log err $outp ($key)
+ return $FAIL
fi
- outp=${outp/*/}
- outp=${outp/*/}
-
echo $outp
return 0
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-22-g9bf768b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9bf768bfbce13a7a5fa9413d4e353a85c0358c88
The branch, master has been updated
via 9bf768bfbce13a7a5fa9413d4e353a85c0358c88 (commit)
from 2eaca4f9e31409f110ae318d1f192673dd744e33 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 9bf768bfbce13a7a5fa9413d4e353a85c0358c88
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 17 14:33:08 2008 +0200
[BUILD] Fix ccs_tool/ccs_test build with new compat code
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccs_tool/Makefile |9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index 25dd4cc..66cd6af 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -1,15 +1,14 @@
TARGET1 = ccs_tool
+TARGET2 = ccs_test
-SBINDIRT = $(TARGET1)
+SBINDIRT = $(TARGET1) $(TARGET2)
include ../../make/defines.mk
ifdef legacy_code
-TARGET2 = ccs_test
-SBINDIRT += $(TARGET2)
all: depends ${TARGET1} ${TARGET2}
else
-all: ${TARGET1}
+all: ${TARGET1} ${TARGET2}
endif
include $(OBJDIR)/make/cobj.mk
@@ -39,10 +38,10 @@ endif
${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-ifdef legacy_code
${TARGET2}: ${TARGET1}
ln -sf ${TARGET1} ${TARGET2}
+ifdef legacy_code
depends:
$(MAKE) -C ../libccscompat all
endif
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-25-ge5831d2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e5831d26703e03d4c98fa38ab066ab6c14a5948b
The branch, master has been updated
via e5831d26703e03d4c98fa38ab066ab6c14a5948b (commit)
via fb6ba10c0f02de9727e493b2d9de9a593d499a28 (commit)
from 8ff7d32e3a8bfc9d27aa96c733d1011ddf7969ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit e5831d26703e03d4c98fa38ab066ab6c14a5948b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 17 15:32:28 2008 +0200
[RGMANAGER] Port ccs_get to proper ccs_tool output
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit fb6ba10c0f02de9727e493b2d9de9a593d499a28
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 17 15:30:06 2008 +0200
Revert [RGMANAGER] Use proper ccs_tool query output
This reverts commit 2eaca4f9e31409f110ae318d1f192673dd744e33.
---
Summary of changes:
rgmanager/src/resources/smb.sh | 11 ---
rgmanager/src/resources/utils/config-utils.sh.in | 11 ---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/rgmanager/src/resources/smb.sh b/rgmanager/src/resources/smb.sh
index 8131743..af81f05 100644
--- a/rgmanager/src/resources/smb.sh
+++ b/rgmanager/src/resources/smb.sh
@@ -112,10 +112,15 @@ ccs_get()
key=$*
- outp=$(ccs_tool query $key 21)
+ outp=$(ccs_tool query -c $key 21)
if [ $? -ne 0 ]; then
- ocf_log err $outp ($key)
- return $_FAIL
+ if [ $outp = ${outp/No data available/} ] || [ $outp =
${outp/Operation not permitted/} ]; then
+ ocf_log err $outp ($key)
+ return $_FAIL
+ fi
+
+ # no real error, just no data available
+ return 0
fi
echo $outp
diff --git a/rgmanager/src/resources/utils/config-utils.sh.in
b/rgmanager/src/resources/utils/config-utils.sh.in
index c3a92f2..03d4cf8 100644
--- a/rgmanager/src/resources/utils/config-utils.sh.in
+++ b/rgmanager/src/resources/utils/config-utils.sh.in
@@ -58,10 +58,15 @@ ccs_get()
key=$*
- outp=$(ccs_tool query $key 21)
+ outp=$(ccs_tool query -c $key 21)
if [ $? -ne 0 ]; then
- ocf_log err $outp ($key)
- return $FAIL
+ if [ $outp = ${outp/No data available/} ] || [ $outp =
${outp/Operation not permitted/} ]; then
+ ocf_log err $outp ($key)
+ return $FAIL
+ fi
+
+ # no real error, just no data available
+ return 0
fi
echo $outp
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-110-ge7cd689
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e7cd689f414088e96fc58c199d7c38c4b558c93d
The branch, RHEL4 has been updated
via e7cd689f414088e96fc58c199d7c38c4b558c93d (commit)
from 231cd16350113d8aea47200c0d92a31d0691af7c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit e7cd689f414088e96fc58c199d7c38c4b558c93d
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 09:19:11 2008 +0200
[BUILD] Fix all: target for lib fence
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/lib/Makefile |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/lib/Makefile b/fence/agents/lib/Makefile
index 3a0e48d..2214ea6 100644
--- a/fence/agents/lib/Makefile
+++ b/fence/agents/lib/Makefile
@@ -20,7 +20,7 @@ TARGET2= telnet_ssl
top_srcdir=../..
include ${top_srcdir}/make/defines.mk
-all: $(TARGET1)
+all: $(TARGET1) $(TARGET2)
$(TARGET1): $(SOURCE1)
: $(TARGET1)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-6-g92865db
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=92865dbbf6effea4102ff69320a4c6ac3923e793
The branch, master has been updated
via 92865dbbf6effea4102ff69320a4c6ac3923e793 (commit)
from 7b2e7daf60cd57c13e391372a835cf4b22146f1b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 92865dbbf6effea4102ff69320a4c6ac3923e793
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 10:09:48 2008 +0200
[CCS] Fix LEGACY_CODE ifdef
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccs_tool/Makefile |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index 058fe02..3cb84e6 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -25,7 +25,7 @@ endif
LDFLAGS += -L${cmanlibdir} -lcman
LDFLAGS += `xml2-config --libs` -L${libdir}
-ifdef OLD_CCS_CODE
+ifdef LEGACY_CODE
LDFLAGS += -L../libccscompat -lccscompat
else
LDFLAGS += -L${ccslibdir} -lccs
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-7-gda4f93b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76
The branch, master has been updated
via da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76 (commit)
from 92865dbbf6effea4102ff69320a4c6ac3923e793 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 10:21:04 2008 +0200
[BUILD] Implement --enable_legacy_code in the build system
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccs_tool/Makefile |6 ++
configure | 13 +
make/defines.mk.input |1 +
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index 3cb84e6..f984206 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -19,13 +19,11 @@ CFLAGS += -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I${ccslibdir} -I$(S)/../include
CFLAGS += -I$(S)/../libccscompat
CFLAGS += -I${incdir}
-ifdef LEGACY_CODE
-CFLAGS += -DLEGACY_CODE
-endif
LDFLAGS += -L${cmanlibdir} -lcman
LDFLAGS += `xml2-config --libs` -L${libdir}
-ifdef LEGACY_CODE
+
+ifdef legacy_code
LDFLAGS += -L../libccscompat -lccscompat
else
LDFLAGS += -L${ccslibdir} -lccs
diff --git a/configure b/configure
index 707b9b9..ac5ecff 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,7 @@ my %options = (
fence_agents = \$fence_agents,
fenceagentslibdir = \$fenceagentslibdir,
enable_crack_of_the_day = \$enable_crack_of_the_day,
+ enable_legacy_code = \$enable_legacy_code,
enable_xen = \$enable_xen,
somajor = \$somajor,
sominor = \$sominor,
@@ -169,6 +170,7 @@ my $err = GetOptions (\%options,
'fence_agents=s',
'fenceagentslibdir=s',
'enable_crack_of_the_day',
+ 'enable_legacy_code',
'enable_xen',
'without_ccs',
'without_cman',
@@ -258,6 +260,7 @@ if ($help || !$err) {
print \t\tUse --fence_agents=help for a list\n;
print --fenceagentslibdir=\tspecify directory where to install common fence
python lib. (Default: /usr/share/fence)\n;
print --enable_crack_of_the_day\tEnable build of highly experimental
features that rely on code that is not yet available for general use. (Default:
no)\n;
+ print --enable_legacy_code\tEnable build of old/obsolete/unsupported
code/tools. (Default: no)\n;
print --enable_xen\tEnable building of Xen-specific pieces\n;
print --without_ccs\tDisable ccs building (Default: enabled)\n;
print --without_cman\tDisable cman building (Default: enabled)\n;
@@ -574,6 +577,15 @@ if (!$enable_crack_of_the_day) {
print
\n\n;
$cflags=${cflags} -DEXPERIMENTAL_BUILD;
}
+if (!$enable_legacy_code) {
+ $enable_legacy_code=;
+} else {
+ print
\n\n;
+ print WARNING: *you* have explicitly enabled the build of
old/obsoleted/unsupported code/tools\n;
+ print This code is provided *only* for backward compatibility\n;
+ print
\n\n;
+ $cflags=${cflags} -DLEGACY_CODE;
+}
if (!$enable_xen) {
$enable_xen=;
}
@@ -715,6 +727,7 @@ while (IFILE) {
$_ =~ s/[EMAIL PROTECTED]@/$fence_agents/;
$_ =~ s/[EMAIL PROTECTED]@/$fenceagentslibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$enable_crack_of_the_day/;
+ $_ =~ s/[EMAIL PROTECTED]@/$enable_legacy_code/;
$_ =~ s/[EMAIL PROTECTED]@/$enable_xen/;
$_ =~ s/[EMAIL PROTECTED]@/$without_ccs/;
$_ =~ s/[EMAIL PROTECTED]@/$without_cman/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index c465e74..f24a82b 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -66,6 +66,7 @@ virtlibdir ?= @VIRTLIBDIR@
fence_agents ?= @FENCE_AGENTS@
fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
+legacy_code ?= @ENABLE_LEGACY_CODE@
enable_xen ?= @ENABLE_XEN@
without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-8-g0f4b1a9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0f4b1a92d539318065e7c2d9797b53bba0a6cbcb
The branch, master has been updated
via 0f4b1a92d539318065e7c2d9797b53bba0a6cbcb (commit)
from da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0f4b1a92d539318065e7c2d9797b53bba0a6cbcb
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 10:37:57 2008 +0200
[BUILD] Add ccs_test replacement when building legacy_code
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccs_tool/Makefile | 24 ++--
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index f984206..9732a15 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -1,10 +1,17 @@
-TARGET= ccs_tool
+TARGET1 = ccs_tool
-SBINDIRT=$(TARGET)
-
-all: depends ${TARGET}
+SBINDIRT = $(TARGET1)
include ../../make/defines.mk
+
+ifdef legacy_code
+TARGET2 = ccs_test
+SBINDIRT += $(TARGET2)
+all: depends ${TARGET1} ${TARGET2}
+else
+all: ${TARGET1}
+endif
+
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
@@ -29,14 +36,19 @@ else
LDFLAGS += -L${ccslibdir} -lccs
endif
-${TARGET}: ${OBJS}
+${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
+ifdef legacy_code
+${TARGET2}: ${TARGET1}
+ ln -sf ${TARGET1} ${TARGET2}
+
depends:
$(MAKE) -C ../libccscompat all
+endif
clean: generalclean
-.PHONY: all ${TARGET}
+.PHONY: all ${TARGET1}
-include $(OBJS:.o=.d)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-9-gf684e39
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=f684e3920bb00e80ddaf1225c42d53d73e96ca55
The branch, master has been updated
via f684e3920bb00e80ddaf1225c42d53d73e96ca55 (commit)
from 0f4b1a92d539318065e7c2d9797b53bba0a6cbcb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit f684e3920bb00e80ddaf1225c42d53d73e96ca55
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 15:34:00 2008 +0200
[BUILD] Fix ccs.h include path
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccs_tool/Makefile |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index 9732a15..25dd4cc 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -23,7 +23,7 @@ OBJS= ccs_tool.o \
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS += -I${cmanincdir} `xml2-config --cflags`
-CFLAGS += -I${ccslibdir} -I$(S)/../include
+CFLAGS += -I${ccsincdir} -I$(S)/../include
CFLAGS += -I$(S)/../libccscompat
CFLAGS += -I${incdir}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-10-gd493de9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d493de97ef6714d1ee576932adec1dad12428d65
The branch, master has been updated
via d493de97ef6714d1ee576932adec1dad12428d65 (commit)
from f684e3920bb00e80ddaf1225c42d53d73e96ca55 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit d493de97ef6714d1ee576932adec1dad12428d65
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 15:42:37 2008 +0200
[BUILD] Fix doc install target when building objects outside source tree
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
make/install.mk |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/make/install.mk b/make/install.mk
index 2140fe3..6c95d56 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -57,7 +57,9 @@ ifdef FENCEAGENTSLIB
endif
ifdef DOCS
install -d ${docdir}
- install -m644 $(S)/${DOCS} ${docdir}
+ for i in ${DOCS}; do \
+ install -m644 $(S)/$$i ${docdir}; \
+ done
endif
ifdef LOGRORATED
install -d ${logrotatedir}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.06-13-ga2d8eb2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a2d8eb2d13f854b22184e1948f5e5cfa1c107be8
The branch, master has been updated
via a2d8eb2d13f854b22184e1948f5e5cfa1c107be8 (commit)
via b28980808835bc248d658cc0d8771b1f847e9d06 (commit)
from 6818dd7db3d7a1a91192889966f5cf6bd942047a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit a2d8eb2d13f854b22184e1948f5e5cfa1c107be8
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 21:27:32 2008 +0200
[RGMANAGER] Port all resource agents to new ccs interface
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit b28980808835bc248d658cc0d8771b1f847e9d06
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jul 16 15:49:39 2008 +0200
[CCS] Kill obsolted ccs_test
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/man/Makefile |5 +
{config/tools = ccs}/man/ccs_test.8 |0
config/tools/Makefile|2 +-
config/tools/ccs_test/Makefile | 32 -
config/tools/ccs_test/ccs_test.c | 147 --
config/tools/man/Makefile|2 +-
rgmanager/src/resources/apache.sh| 11 +--
rgmanager/src/resources/mysql.sh | 12 +--
rgmanager/src/resources/named.sh | 11 +--
rgmanager/src/resources/openldap.sh | 12 +--
rgmanager/src/resources/postgres-8.sh| 12 +--
rgmanager/src/resources/samba.sh | 12 +--
rgmanager/src/resources/tomcat-5.sh | 12 +--
rgmanager/src/resources/utils/config-utils.sh.in | 59 +
rgmanager/src/resources/utils/messages.sh|4 -
15 files changed, 26 insertions(+), 307 deletions(-)
rename {config/tools = ccs}/man/ccs_test.8 (100%)
delete mode 100644 config/tools/ccs_test/Makefile
delete mode 100644 config/tools/ccs_test/ccs_test.c
diff --git a/ccs/man/Makefile b/ccs/man/Makefile
index f98df0d..43133a6 100644
--- a/ccs/man/Makefile
+++ b/ccs/man/Makefile
@@ -4,4 +4,9 @@ TARGET= cluster.conf.5 \
ccs_tool.8
include ../../make/defines.mk
+
+ifdef legacy_code
+TARGET += ccs_test.8
+endif
+
include $(OBJDIR)/make/man.mk
diff --git a/config/tools/man/ccs_test.8 b/ccs/man/ccs_test.8
similarity index 100%
rename from config/tools/man/ccs_test.8
rename to ccs/man/ccs_test.8
diff --git a/config/tools/Makefile b/config/tools/Makefile
index e2defcf..8b2d2fc 100644
--- a/config/tools/Makefile
+++ b/config/tools/Makefile
@@ -1,4 +1,4 @@
include ../../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=ccs_test ldap man
+SUBDIRS=ldap man
diff --git a/config/tools/ccs_test/Makefile b/config/tools/ccs_test/Makefile
deleted file mode 100644
index f0ebddc..000
--- a/config/tools/ccs_test/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-TARGET= ccs_test
-
-SBINDIRT=$(TARGET)
-
-all: depends ${TARGET}
-
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-include $(OBJDIR)/make/clean.mk
-include $(OBJDIR)/make/install.mk
-include $(OBJDIR)/make/uninstall.mk
-
-OBJS= ccs_test.o
-
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-CFLAGS += -I${ccsincdir}
-CFLAGS += -I${incdir}
-
-LDFLAGS += -L${ccslibdir} -lccs
-
-
-${TARGET}: ${OBJS}
- $(CC) -o $@ $^ $(LDFLAGS)
-
-depends:
- $(MAKE) -C ../../libs all
-
-clean: generalclean
-
-.PHONY: all ${TARGET}
-
--include $(OBJS:.o=.d)
diff --git a/config/tools/ccs_test/ccs_test.c b/config/tools/ccs_test/ccs_test.c
deleted file mode 100644
index 6e6cfa0..000
--- a/config/tools/ccs_test/ccs_test.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include stdio.h
-#include stdlib.h
-#include errno.h
-#include string.h
-
-#include ccs.h
-
-#include copyright.cf
-
-static void print_usage(FILE *stream);
-
-static int disconnect() {
- if (ccs_disconnect(1) 0)
- return 1;
-
- return 0;
-}
-
-int main(int argc, char *argv[]){
- int desc=0;
- int i=0;
- int error = 0;
- int force = 0, blocking = 0;
- char *str=NULL;
- char *cluster_name = NULL;
-
- if(argc = 1){
-print_usage(stderr);
-exit(EXIT_FAILURE);
- }
-
- for(i=1; i argc; i++){
-if(!strcmp(argv[i], -h)){
- print_usage(stdout);
- exit(EXIT_SUCCESS);
-}
-if(!strcmp(argv[i], -V)){
- printf(%s %s (built %s %s)\n, argv[0], RELEASE_VERSION, __DATE__,
__TIME__);
- printf(%s\n, REDHAT_COPYRIGHT);
- exit(EXIT_SUCCESS);
-}
- }
-
-
[Cluster-devel] Cluster Project annotated tag, cluster-2.99.06, created. cluster-2.99.06
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=7f7dba56d51ad8eb1da93f95b9ac3a8b126f68d1 The annotated tag, cluster-2.99.06 has been created at 7f7dba56d51ad8eb1da93f95b9ac3a8b126f68d1 (tag) tagging 12e98c1895efea3c486bfe7aeaf57aca334fc05f (commit) replaces cluster-2.99.05 tagged by Fabio M. Di Nitto on Tue Jul 15 13:19:51 2008 +0200 - Log - cluster-2.99.06 release Benjamin Marzinski (1): [gnbd-kernel] bz 442606: Switch gnbd to use deadline scheduler by default. Bob Peterson (1): gfs2_fsck fails: Unable to read in jindex inode. Christine Caulfield (12): [CONFIG] Add ldap configurator [CONFIG] Make ldap put totem in the right place [CONFIG] Improve LDAP error reporting [CMAN] Add a config update callback [CMAN] Only do timestamp check for older nodes. [CMAN] Fix logging options [CMAN] Remove some redundant code. [CONFIG] Add some more ldap comments [CONFIG] Add ldap loader [CONFIG] rename ldap config generator [CONFIG] Add a man page for confdb2ldif [CMAN] Remove some spurious prints David Teigland (16): gfs_controld: basic fixes fenced: revert logsys commits fenced: use logsys fence_node: use simple logsys api fenced/fence_node: use SYSLOGLEVEL fenced: link with liblogsys gfs_controld: support queries from gfs_control gfs_controld: add query code gfs_controld: add journal for new node fenced/dlm_controld/gfs_controld: ccs/cman setup fenced/dlm_controld: fix quorum waiting fenced: tune logsys settings groupd: sync daemon setup/structure with others fenced: enable new logsys mode flag fenced: fix logsys define dlm_controld: set id before recovery Fabio M. Di Nitto (35): [FENCE] Start porting fenced to logsys [FENCE] Make fenced ready to load logsys config [FENCE] Move logsys configuration calls where they belong [CCS] Set debug from syslog_level only when requested [QDISK] Set debug from syslog_level only when requested [FENCE] Allow fenced to configure logsys [FENCE] fenced: separate concept of fork and debugging [CCS] Use common syslog facility [FENCE] fence_node: use logsys for logging to syslog [CMAN] Remove unrequired includes [FENCE] fenced: update man page [GFS2] hexedit does not need syslog [FENCE] fence_tool: document ls [CCS] Remove duplicate header [CONFIG] Make sure to reset xml index in not in list mode [CONFIG] Add cluster.conf direct loader [CONFIG] Fix several bugs in XML parsing implementations [BUILD] Add configure options for libldap [BUILD] Allow configuration of docdir [BUILD] Fix docdir default path [BUILD] Add install/uninstall snippets for documents [BUILD] Install ldap schemas and example in document directory [MISC] Documentation cleanup [BUILD] Fix install of telnet_ssl [BUILD] Fix telnet_ssl build [BUILD] Allow users to configure default built-in syslog level [MISC] Use default configured SYSLOGLEVEL across the tree [BUILD] Add make oldconfig target [MISC] Update .gitignore [MISC] Fix logging file query [CONFIG] Fix loadldap include [BUILD] Plug confdb to ldap tool [MISC] Create and install logrotate file [BUILD] Clean extra kernel modules files [MISC] Fix build with newer toolchain Lon Hohberger (6): Revert [fence] fence_xvmd: Add KVM support; misc cleanups. [fence] fence_xvmd: Add KVM support; misc cleanups. [rgmanager] Fix erroneous broadcast matching in ip.sh [fence] Port XVM to logsys [fence] Fix XVM's debug.c default [fence] Make fence_xvm[d] use normal log levels Marek 'marx' Grac (1): [FENCE] Bug #448822: fence_ilo doesn't work with iLO root (1): [fence] fence_xvmd: Add KVM support; misc cleanups. --- hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-69-gfae9045
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=fae90458de50aad1916f42f0bd1ca28444c4efa6 The branch, master has been updated via fae90458de50aad1916f42f0bd1ca28444c4efa6 (commit) from e46e8f644a0624e4beb59a26a43932b3065f6146 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit fae90458de50aad1916f42f0bd1ca28444c4efa6 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Mon Jul 14 12:08:08 2008 +0200 [MISC] Fix build with newer toolchain Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: fence/fenced/fd.h |1 + group/tool/main.c |1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h index c1db728..9f9fe4f 100644 --- a/fence/fenced/fd.h +++ b/fence/fenced/fd.h @@ -12,6 +12,7 @@ #include stdint.h #include time.h #include sched.h +#include limits.h #include sys/ioctl.h #include sys/types.h #include sys/stat.h diff --git a/group/tool/main.c b/group/tool/main.c index bbdf52e..854c8b2 100644 --- a/group/tool/main.c +++ b/group/tool/main.c @@ -9,6 +9,7 @@ #include fcntl.h #include string.h #include errno.h +#include limits.h #include netinet/in.h #include linux/dlmconstants.h hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-43-g78a78bc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=78a78bc47644465fbc9cf7acb5d781daf7cb4e5b
The branch, STABLE2 has been updated
via 78a78bc47644465fbc9cf7acb5d781daf7cb4e5b (commit)
from 2ebd2d7537c04c252ca98f03ba0c49a8444e3869 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 78a78bc47644465fbc9cf7acb5d781daf7cb4e5b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jul 14 07:19:23 2008 +0200
[BUILD] Clean extra kernel modules files
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
make/clean.mk |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/make/clean.mk b/make/clean.mk
index 560c4f9..1ae5b03 100644
--- a/make/clean.mk
+++ b/make/clean.mk
@@ -1,6 +1,7 @@
generalclean:
rm -rf *~* *.o *.a *.so *.so.* a.out *.po *.s *.d *.pyc
rm -rf core core.* .depend cscope.* *.orig *.rej
- rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions Module.symvers
.*.o.d modules.order
+ rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions
+ rm -rf Module.symvers Module.markers .*.o.d modules.order
rm -rf ${TARGET} ${TARGETS} ${TARGET}_test
rm -rf ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-68-ge46e8f6
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e46e8f644a0624e4beb59a26a43932b3065f6146
The branch, master has been updated
via e46e8f644a0624e4beb59a26a43932b3065f6146 (commit)
from 7c2bac805f3a60b320a9c95d7be6bcfdf9302bfe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit e46e8f644a0624e4beb59a26a43932b3065f6146
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jul 14 07:19:23 2008 +0200
[BUILD] Clean extra kernel modules files
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
make/clean.mk |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/make/clean.mk b/make/clean.mk
index d4456a6..b31a3fa 100644
--- a/make/clean.mk
+++ b/make/clean.mk
@@ -1,6 +1,7 @@
generalclean:
rm -rf *~* *.o *.a *.so *.so.* a.out *.po *.s *.d *.pyc
rm -rf core core.* .depend cscope.* *.orig *.rej
- rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions Module.symvers
Module.markers .*.o.d modules.order
+ rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions
+ rm -rf Module.symvers Module.markers .*.o.d modules.order
rm -rf ${TARGET} ${TARGETS} ${TARGET}_test
rm -rf ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project annotated tag, cluster-2.03.05, created. cluster-2.03.05
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e18d38b2523209cb5334a1c0f06e66cb80c5d5ef The annotated tag, cluster-2.03.05 has been created at e18d38b2523209cb5334a1c0f06e66cb80c5d5ef (tag) tagging 78a78bc47644465fbc9cf7acb5d781daf7cb4e5b (commit) replaces cluster-2.03.04 tagged by Fabio M. Di Nitto on Mon Jul 14 07:33:39 2008 +0200 - Log - cluster-2.03.05 release Benjamin Marzinski (3): gnbd-kernel: Fix receiver race [gnbd-kernel] bz 449812: disallow sending requests after a send has failed. [gnbd-kernel] bz 442606: Switch gnbd to use deadline scheduler by default. Bob Peterson (12): Added an optional block-size to mkfs.gfs2 Fix build warnings in gfs2-utils. Fix another compiler warning for 32-bit arch. Fix build warnings from libgfs Fix gfs_debug build warning Ignoring gets return value in gfs_mkfs Fix gfs_tool build warnings Fix gfs_fsck build warnings Fix 32-bit warning in super.c. 452004: gfs: BUG: unable to handle kernel paging request. savemeta was not saving gfs1 journals properly. gfs2_fsck fails: Unable to read in jindex inode. Christine Caulfield (2): [CMAN] Fix some compiler warnings on 64 bit systems [CMAN] Only do timestamp check for older nodes. Fabio M. Di Nitto (18): [QDISK] Add better support for Xen virtual block devices [CCS] Fix build warnings on sparc [QDISK] Fix debug type [QDISK] get_config_data cleanup [QDISK] Remove duplicate debugging configuration [MISC] Fix build errors with Fedora default build options [MISC] Fix previous cherry pick build failure in stable branch [QDISK] Major clean up [GFS2] hexedit does not need syslog [CCS] Remove duplicate header [BUILD] Allow configuration of docdir [BUILD] Fix docdir default path [MISC] Documentation cleanup [BUILD] Fix install of telnet_ssl [BUILD] Fix telnet_ssl build [BUILD] Add make oldconfig target [BUILD] Add fence_lpar fencing agent to the build system [BUILD] Clean extra kernel modules files James Parsons (1): Fix for 251358 Lon Hohberger (5): Fix #362351 - make fence_xvmd work in no-cluster mode Ancillary NOCLUSTER mode fixes for fence_xvmd Ancillary NOCLUSTER mode fixes for fence_xvmd [rgmanager] Make rgmanager check pbond links correctly [rgmanager] Fix erroneous broadcast matching in ip.sh Marek 'marx' Grac (2): [FENCE] Bug #448822: fence_ilo doesn't work with iLO [FENCE]: Fix #237266: New fence agent for HMC/LPAR --- hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-65-g98c1237
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=98c12372432e994a5c8310d16a6dbb9f9295043b
The branch, master has been updated
via 98c12372432e994a5c8310d16a6dbb9f9295043b (commit)
from bcf64592c09e6dae7ed0a8d4310c4d267a20fce8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 98c12372432e994a5c8310d16a6dbb9f9295043b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jul 11 08:58:17 2008 +0200
[MISC] Create and install logrotate file
With daemons writing their own log files, we want to rotate them
properly.
Add logrotate snippet in doc/ for who wants to do it manually
Install it in logrotate dir (you will need to rerun configure for this
to be set properly)
Adapt build system to propagate info around
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure|7 +++
doc/Makefile | 11 ++-
doc/cluster.logrotate.in |8
make/defines.mk.input|3 +++
make/install.mk |4
make/uninstall.mk|3 +++
6 files changed, 35 insertions(+), 1 deletions(-)
create mode 100644 doc/cluster.logrotate.in
diff --git a/configure b/configure
index dd77fa8..707b9b9 100755
--- a/configure
+++ b/configure
@@ -73,6 +73,7 @@ my %options = (
sharedir = \$sharedir,
docdir = \$docdir,
logdir = \$logdir,
+ logrotatedir = \$logrotatedir,
syslogfacility = \$syslogfacility,
sysloglevel = \$sysloglevel,
mibdir = \$mibdir,
@@ -155,6 +156,7 @@ my $err = GetOptions (\%options,
'sharedir=s',
'docdir=s',
'logdir=s',
+ 'logrotatedir=s',
'syslogfacility=s',
'sysloglevel=s',
'mibdir=s',
@@ -201,6 +203,7 @@ if ($help || !$err) {
print --sharedir=\tthe base directory for misc cluster files. (Default:
{prefix}/share/cluster)\n;
print --docdir=\tthe base directory for misc cluster documentation files.
(Default: {prefix}/share/doc/cluster)\n;
print --logdir=\tthe base directory for cluster logging files. (Default:
/var/log/cluster/)\n;
+ print --logrotatedir=\tthe base directory for logrorate.d files. (Default:
/etc/logrotate.d/)\n;
print --syslogfacility=\tset the default syslog facility. (Default:
LOG_LOCAL4)\n;
print --sysloglevel=\tset the default syslog level. (Default:
LOG_LEVEL_INFO)\n;
print --mibdir=\tthe base directory for snmp mibs. (Default:
{prefix}/share/snmp/mibs)\n;
@@ -535,6 +538,9 @@ if (!$docdir) {
if (!$logdir) {
$logdir=/var/log/cluster;
}
+if (!$logrotatedir) {
+ $logrotatedir=/etc/logrotate.d;
+}
if (!$syslogfacility) {
$syslogfacility=LOG_LOCAL4;
}
@@ -699,6 +705,7 @@ while (IFILE) {
$_ =~ s/[EMAIL PROTECTED]@/$sharedir/;
$_ =~ s/[EMAIL PROTECTED]@/$docdir/;
$_ =~ s/[EMAIL PROTECTED]@/$logdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$logrotatedir/;
$_ =~ s/[EMAIL PROTECTED]@/$syslogfacility/;
$_ =~ s/[EMAIL PROTECTED]@/$sysloglevel/;
$_ =~ s/[EMAIL PROTECTED]@/$mibdir/;
diff --git a/doc/Makefile b/doc/Makefile
index db61e0b..0ac2075 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,11 +7,20 @@ DOCS =gfs2.txt \
COPYRIGHT \
README.licence
-all:
+TARGET= cluster.logrotate
+
+LOGRORATED = $(TARGET)
+
+all: $(TARGET)
include ../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
include $(OBJDIR)/make/clean.mk
+$(TARGET):
+ cat $(S)/$(TARGET).in | sed \
+ -e '[EMAIL PROTECTED]@#${LOGDIR}#g' \
+$(TARGET)
+
clean: generalclean
diff --git a/doc/cluster.logrotate.in b/doc/cluster.logrotate.in
new file mode 100644
index 000..df7d94c
--- /dev/null
+++ b/doc/cluster.logrotate.in
@@ -0,0 +1,8 @@
[EMAIL PROTECTED]@/*log {
+ missingok
+ compress
+ notifempty
+ daily
+ rotate 7
+ create 0600 root root
+}
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 4cb348e..c465e74 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -6,6 +6,7 @@ libexecdir ?= [EMAIL PROTECTED]@
sharedir ?= [EMAIL PROTECTED]@
docdir ?= [EMAIL PROTECTED]@
logdir ?= [EMAIL PROTECTED]@
+logrotatedir ?= [EMAIL PROTECTED]@
mandir ?= [EMAIL PROTECTED]@
module_dir ?= @MODULE_DIR@
incdir ?= [EMAIL PROTECTED]@
@@ -86,5 +87,7 @@ S=$(SRCDIR)/$(THISDIR)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
UNINSTALL =
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-59-gb67b729
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b67b729e452fa8f76fd13669c1879122cb59fdc6
The branch, master has been updated
via b67b729e452fa8f76fd13669c1879122cb59fdc6 (commit)
from 9172b524b6d638458695f9dc5fab25f051bdc941 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit b67b729e452fa8f76fd13669c1879122cb59fdc6
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 10 06:33:53 2008 +0200
[CONFIG] Fix loadldap include
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
config/tools/ldap/loadldap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/config/tools/ldap/loadldap.c b/config/tools/ldap/loadldap.c
index b25a3d6..c6c8f01 100644
--- a/config/tools/ldap/loadldap.c
+++ b/config/tools/ldap/loadldap.c
@@ -17,7 +17,7 @@
#include sys/un.h
#include openais/saAis.h
-#include openais/service/confdb.h
+#include openais/confdb.h
confdb_callbacks_t callbacks = {
.confdb_change_notify_fn = NULL,
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-51-g0e0d1b9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0e0d1b960e8d03c921170862adc52c7e122a5f22
The branch, master has been updated
via 0e0d1b960e8d03c921170862adc52c7e122a5f22 (commit)
from b9bfda9d714c43d75854c6077f92f936c5acd081 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0e0d1b960e8d03c921170862adc52c7e122a5f22
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jul 4 10:51:41 2008 +0200
[MISC] Fix logging file query
This fix the config key from filename to logfile as it is supposed to
be.
I misread the openais documentation on this specific bit and ended using
filename instead of logfile.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/misc.c |6 +++---
cman/qdisk/main.c |6 +++---
fence/agents/xvm/fence_xvmd.c |6 +++---
fence/fenced/logging.c|4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index 89f04d2..0a9cb07 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -251,14 +251,14 @@ int set_ccs_logging(xmlDocPtr ldoc){
res=NULL;
}
- res = do_simple_xml_query(ctx, /cluster/logging/@filename);
+ res = do_simple_xml_query(ctx, /cluster/logging/@logfile);
if(res) {
if(logsys_config_file_set(error, res))
- log_printf(LOG_ERR, filename: unable to open %s for logging\n, res);
+ log_printf(LOG_ERR, logfile: unable to open %s for logging\n, res);
free(res);
res=NULL;
} else
- log_printf(LOG_DEBUG, filename: use default built-in log file: %s\n,
LOGDIR /ccs.log);
+ log_printf(LOG_DEBUG, logfile: use default built-in log file: %s\n,
LOGDIR /ccs.log);
res = do_simple_xml_query(ctx, /cluster/logging/@syslog_facility);
if(res) {
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index d132cbd..b630efd 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1174,13 +1174,13 @@ get_logsys_config_data(int *debug)
val = NULL;
}
- if (ccs_get(ccsfd, /cluster/logging/@filename, val) == 0) {
+ if (ccs_get(ccsfd, /cluster/logging/@logfile, val) == 0) {
if(logsys_config_file_set(error, val))
- log_printf(LOG_ERR, filename: unable to open %s for
logging\n, val);
+ log_printf(LOG_ERR, logfile: unable to open %s for
logging\n, val);
free(val);
val = NULL;
} else
- log_printf(LOG_DEBUG, filename: use default built-in log file:
%s\n, LOGDIR /qdisk.log);
+ log_printf(LOG_DEBUG, logfile: use default built-in log file:
%s\n, LOGDIR /qdisk.log);
if (ccs_get(ccsfd, /cluster/logging/@syslog_facility, val) == 0) {
facility = logsys_facility_id_get (val);
diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c
index bb336df..888f24b 100644
--- a/fence/agents/xvm/fence_xvmd.c
+++ b/fence/agents/xvm/fence_xvmd.c
@@ -873,13 +873,13 @@ get_logsys_config_data(int *debug)
val = NULL;
}
- if (ccs_get(ccsfd, /cluster/logging/@filename, val) == 0) {
+ if (ccs_get(ccsfd, /cluster/logging/@logfile, val) == 0) {
if(logsys_config_file_set(error, val))
- log_printf(LOG_ERR, filename: unable to open %s for
logging\n, val);
+ log_printf(LOG_ERR, logfile: unable to open %s for
logging\n, val);
free(val);
val = NULL;
} else
- log_printf(LOG_DEBUG, filename: use default built-in log file:
%s\n, LOGDIR /fence_xvmd.log);
+ log_printf(LOG_DEBUG, logfile: use default built-in log file:
%s\n, LOGDIR /fence_xvmd.log);
if (ccs_get(ccsfd, /cluster/logging/@syslog_facility, val) == 0) {
facility = logsys_facility_id_get (val);
diff --git a/fence/fenced/logging.c b/fence/fenced/logging.c
index ed4af39..aee3485 100644
--- a/fence/fenced/logging.c
+++ b/fence/fenced/logging.c
@@ -24,7 +24,7 @@
/cluster/logging/[EMAIL PROTECTED]prog_name\]/@syslog_level
file from
- /cluster/logging/@filename
+ /cluster/logging/@logfile
debug from
/cluster/logging/@debug
@@ -105,7 +105,7 @@ static int read_ccs_logging(int *mode, int *facility, int
*priority, char *file,
strcpy(file, DEFAULT_FILE);
memset(name, 0, sizeof(name));
- read_ccs_name(/cluster/logging/@filename, name);
+
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-45-g1aa8fbf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1aa8fbffa0dd99f36819ad842945186cc42b2cba
The branch, master has been updated
via 1aa8fbffa0dd99f36819ad842945186cc42b2cba (commit)
from 0f7e7fbf0cfd01bec02df4ee2527fb39ed846dc3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 1aa8fbffa0dd99f36819ad842945186cc42b2cba
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 3 12:17:45 2008 +0200
[BUILD] Add make oldconfig target
configure invokation now creates a .configure.sh script file at the top
level of the tree. It contains a shell script to reproduce the last
invokation of configure and it allows to add extra config parameters.
Note that .configure.sh is updated each time you invoke configure.
Add also a make oldconfig that will execute the script.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
.gitignore |1 +
Makefile |8
configure |8
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6df816f..4a6be48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
make/defines.mk
*.d
*.o
+.configure.sh
diff --git a/Makefile b/Makefile
index fe644e5..27f5c5a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,13 @@ gnbd: cman
rgmanager: cman dlm
bindings: cman
+oldconfig:
+ @if [ -f $(OBJDIR)/.configure.sh ]; then \
+ sh $(OBJDIR)/.configure.sh; \
+ else \
+ echo No old configure data found; \
+ fi
+
install: all
set -e for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
@@ -56,6 +63,7 @@ clean:
distclean: clean
rm -f make/defines.mk
+ rm -f .configure.sh
rm -f *tar.gz
rm -rf build
diff --git a/configure b/configure
index 4d936af..dd77fa8 100755
--- a/configure
+++ b/configure
@@ -10,6 +10,8 @@ print \nConfiguring Makefiles for your system...\n;
# Set a bunch of variables
+my @invoke = @ARGV;
+
my $ret = 0;
# this should be only the major version without the extra version
@@ -772,4 +774,10 @@ print OFILE CFLAGS +=
-DRELEASE_VERSION=\\\$release_versionn;
close OFILE;
+open OFILE, ${objdir}/.configure.sh or die Can't redirect stdout;
+print OFILE #!/bin/bash\n;
+print OFILE $0 @invoke [EMAIL PROTECTED];
+print OFILE exit \$?\n;
+close OFILE;
+
print Completed Makefile configuration\n\n;
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-46-g58302ba
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=58302ba8a4b0da965f0827f048070b8c514070c2 The branch, master has been updated via 58302ba8a4b0da965f0827f048070b8c514070c2 (commit) from 1aa8fbffa0dd99f36819ad842945186cc42b2cba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 58302ba8a4b0da965f0827f048070b8c514070c2 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jul 3 13:30:13 2008 +0200 [MISC] Update .gitignore Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: .gitignore |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 4a6be48..30194b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ make/defines.mk +.configure.sh *.d *.o -.configure.sh +*.a +*.so* +*.lcrso hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-42-g2b9196e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=2b9196e3fd4631ada6988ad2a084a9834e69674c The branch, master has been updated via 2b9196e3fd4631ada6988ad2a084a9834e69674c (commit) from 3999dc109ad8da35df36369c3c9056c0f6a7ab48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 2b9196e3fd4631ada6988ad2a084a9834e69674c Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jul 3 06:01:04 2008 +0200 [BUILD] Fix telnet_ssl build Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: fence/agents/lib/telnet_ssl.py |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fence/agents/lib/telnet_ssl.py b/fence/agents/lib/telnet_ssl.py index 8c0c008..5d0c981 100644 --- a/fence/agents/lib/telnet_ssl.py +++ b/fence/agents/lib/telnet_ssl.py @@ -3,12 +3,18 @@ # ## simple telnet client with SSL support ## -## ./telnet_ssl.py host port +## ./telnet_ssl host port # import sys, socket, string, fcntl, os , time from OpenSSL import SSL +#BEGIN_VERSION_GENERATION +RELEASE_VERSION= +REDHAT_COPYRIGHT= +BUILD_DATE= +#END_VERSION_GENERATION + def main(): hostname = None port = None hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-39-g9b57702
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9b5770286010274a3037bddadaf53f40943bffda The branch, STABLE2 has been updated via 9b5770286010274a3037bddadaf53f40943bffda (commit) from 272fe5f76ecc45a452ccf06631778520706786a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 9b5770286010274a3037bddadaf53f40943bffda Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jul 3 06:01:04 2008 +0200 [BUILD] Fix telnet_ssl build Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: fence/agents/lib/telnet_ssl.py |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fence/agents/lib/telnet_ssl.py b/fence/agents/lib/telnet_ssl.py index 8c0c008..5d0c981 100644 --- a/fence/agents/lib/telnet_ssl.py +++ b/fence/agents/lib/telnet_ssl.py @@ -3,12 +3,18 @@ # ## simple telnet client with SSL support ## -## ./telnet_ssl.py host port +## ./telnet_ssl host port # import sys, socket, string, fcntl, os , time from OpenSSL import SSL +#BEGIN_VERSION_GENERATION +RELEASE_VERSION= +REDHAT_COPYRIGHT= +BUILD_DATE= +#END_VERSION_GENERATION + def main(): hostname = None port = None hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-43-ga66be49
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a66be490568c86f1b4345407e20897d44a4f59c5
The branch, master has been updated
via a66be490568c86f1b4345407e20897d44a4f59c5 (commit)
from 2b9196e3fd4631ada6988ad2a084a9834e69674c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit a66be490568c86f1b4345407e20897d44a4f59c5
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu Jul 3 06:11:01 2008 +0200
[BUILD] Allow users to configure default built-in syslog level
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure |7 +++
make/defines.mk.input |2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 2a497e3..4d936af 100755
--- a/configure
+++ b/configure
@@ -72,6 +72,7 @@ my %options = (
docdir = \$docdir,
logdir = \$logdir,
syslogfacility = \$syslogfacility,
+ sysloglevel = \$sysloglevel,
mibdir = \$mibdir,
snmpbin = \$snmpbin,
confdir = \$confdir,
@@ -153,6 +154,7 @@ my $err = GetOptions (\%options,
'docdir=s',
'logdir=s',
'syslogfacility=s',
+ 'sysloglevel=s',
'mibdir=s',
'snmpbin=s',
'confdir=s',
@@ -198,6 +200,7 @@ if ($help || !$err) {
print --docdir=\tthe base directory for misc cluster documentation files.
(Default: {prefix}/share/doc/cluster)\n;
print --logdir=\tthe base directory for cluster logging files. (Default:
/var/log/cluster/)\n;
print --syslogfacility=\tset the default syslog facility. (Default:
LOG_LOCAL4)\n;
+ print --sysloglevel=\tset the default syslog level. (Default:
LOG_LEVEL_INFO)\n;
print --mibdir=\tthe base directory for snmp mibs. (Default:
{prefix}/share/snmp/mibs)\n;
print --snmpbin=\tthe base directory for snmp binaries (Ex:
/usr/bin/snmpwalk). (Default: {prefix}/bin)\n;
print --confdir=\tthe cluster config directory. (Default: /etc/cluster)\n;
@@ -533,6 +536,9 @@ if (!$logdir) {
if (!$syslogfacility) {
$syslogfacility=LOG_LOCAL4;
}
+if (!$sysloglevel) {
+ $sysloglevel=LOG_LEVEL_INFO;
+}
if (!$mibdir) {
$mibdir=${prefix}/share/snmp/mibs;
}
@@ -692,6 +698,7 @@ while (IFILE) {
$_ =~ s/[EMAIL PROTECTED]@/$docdir/;
$_ =~ s/[EMAIL PROTECTED]@/$logdir/;
$_ =~ s/[EMAIL PROTECTED]@/$syslogfacility/;
+ $_ =~ s/[EMAIL PROTECTED]@/$sysloglevel/;
$_ =~ s/[EMAIL PROTECTED]@/$mibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$snmpbin/;
$_ =~ s/[EMAIL PROTECTED]@/$confdir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 7b49131..4cb348e 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -21,7 +21,7 @@ RANLIB = ranlib
CFLAGS += @CFLAGS@ [EMAIL PROTECTED]@/make
CFLAGS += -DDEFAULT_CONFIG_DIR=\@[EMAIL PROTECTED]
-DDEFAULT_CONFIG_FILE=\@[EMAIL PROTECTED]
-CFLAGS += -DLOGDIR=\@[EMAIL PROTECTED] [EMAIL PROTECTED]@
+CFLAGS += -DLOGDIR=\@[EMAIL PROTECTED] [EMAIL PROTECTED]@ [EMAIL PROTECTED]@
LDFLAGS += @LDFLAGS@
SRCDIR = @SRCDIR@
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project annotated tag, cluster-2.99.05, created. cluster-2.99.05
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9f2a04243925208efdccb6e4c391753527aff1cb The annotated tag, cluster-2.99.05 has been created at 9f2a04243925208efdccb6e4c391753527aff1cb (tag) tagging 12bd7c01cac39996f7b4a481bb476b141bf46149 (commit) replaces cluster-2.99.04 tagged by Fabio M. Di Nitto on Tue Jun 24 09:04:34 2008 +0200 - Log - cluster-2.99.05 release Benjamin Marzinski (2): gnbd-kernel: Fix receiver race [gnbd-kernel] bz 449812: disallow sending requests after a send has failed. Bob Peterson (14): Allow keywords in block number input Ability to specify starting block or structure with -s Fix compiler warning. Added an optional block-size to mkfs.gfs2 Fix build warnings in gfs2-utils. Fix another compiler warning for 32-bit arch. Fix build warnings from libgfs Fix gfs_debug build warning Ignoring gets return value in gfs_mkfs Fix gfs_tool build warnings Fix gfs_fsck build warnings Fix 32-bit warning in super.c. 452004: gfs: BUG: unable to handle kernel paging request. savemeta was not saving gfs1 journals properly. Christine Caulfield (2): [CMAN] Fix some compiler warnings on 64 bit systems [CMAN] use list_iterate_safe when removing nodes David Teigland (2): gfs_controld: new version dlm_controld/gfs_controld: minor fixes Fabio M. Di Nitto (35): [BUILD] Fix file permissions all around [MISC] Whitespace cleanup [MISC] Relicence rgmanager/src/resources/oracledb.sh under GPLv2+ [GFS] Remove obsoleted gfs_edit in favour of gfs2_edit [MISC] Remove osl-2.1 exception from README.licence [MISC] Add original author for cman/qdisk/disk.c [MISC] Remove old copyright [MISC] Add another exception to COPYRIGHT [GFS2] Add missing include and fix build warning [QDISK] Add better support for Xen virtual block devices [CCS] Fix build warnings on sparc [CCS] Add missing CCSEXIT call [CCS] Fix priority setting [CCS] Fix a few logsys configuration bits [CCS] Remove duplicate code and make it common [CCS] Remove LOG_MODE_DISPLAY_DEBUG from logsys settings [CCS] Init logsys as early as possible [CCS] Shrink more common code for internal xml queries [CCS] Add cosmetic CCSENTER/EXIT for simple xml queries [CCS] Improve logsys init order [CCS] Fix improper log level on debugging information [CCS] Convert ccs logsys config to the ais format [QDISK] Fix build with new openais logsys [QDISK] Fix debug type [QDISK] Make get_config_data static [QDISK] get_config_data cleanup [QDISK] Remove duplicate debugging configuration [QDISK] Clean handling of debug envvar [QDISK] Init logsys later in the process [QDISK] Major clean up [BUILD] Fix new gfs_controld Makefile [CCS] Always check for debug setting as first thing [CCS] Fix debug override from command line vs config [QDISK] Port qdisk to the new logsys config interface [MISC] Logging: optimizing query sequence James Parsons (1): Fix for 251358 Lon Hohberger (4): Fix #362351 - make fence_xvmd work in no-cluster mode Ancillary NOCLUSTER mode fixes for fence_xvmd Ancillary NOCLUSTER mode fixes for fence_xvmd [rgmanager] Make rgmanager check pbond links correctly --- hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-13-g3b32463
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3b32463d209192a074ffdc9988c25b25136f3c91
The branch, master has been updated
via 3b32463d209192a074ffdc9988c25b25136f3c91 (commit)
via 4f823b80d31b23dacba7c6f510d1a843da37ac52 (commit)
via 5f834f0a0a8e311fd7ec9766769c3200defd7963 (commit)
via 5e21129f9c53eda20aa5c24d844800720bf70d48 (commit)
from 95a5c6b13294742956b13070ebc4f4513278255f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 3b32463d209192a074ffdc9988c25b25136f3c91
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jun 25 06:53:51 2008 +0200
[FENCE] fenced: update man page
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 4f823b80d31b23dacba7c6f510d1a843da37ac52
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jun 25 06:44:49 2008 +0200
[CMAN] Remove unrequired includes
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 5f834f0a0a8e311fd7ec9766769c3200defd7963
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jun 25 06:41:54 2008 +0200
[FENCE] fence_node: use logsys for logging to syslog
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 5e21129f9c53eda20aa5c24d844800720bf70d48
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed Jun 25 06:34:08 2008 +0200
[CCS] Use common syslog facility
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccsais/config.c |2 +-
cman/daemon/ais.c |1 -
cman/daemon/barrier.c |1 -
cman/daemon/daemon.c |1 -
cman/daemon/logging.c |1 -
fence/fence_node/Makefile |3 ++-
fence/fence_node/fence_node.c | 15 ++-
fence/man/fenced.8|2 +-
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ccs/ccsais/config.c b/ccs/ccsais/config.c
index df3f66e..e5ec83a 100644
--- a/ccs/ccsais/config.c
+++ b/ccs/ccsais/config.c
@@ -186,7 +186,7 @@ static int ccs_readconfig(struct objdb_iface_ver0 *objdb,
char **error_string)
int ret;
/* We need to set this up to internal defaults too early */
- openlog(openais, LOG_CONS|LOG_PID, LOG_LOCAL4);
+ openlog(openais, LOG_CONS|LOG_PID, SYSLOGFACILITY);
/* Read low-level totem/aisexec etc config from CCS */
if ( !(ret = init_config(objdb, error_reason)) )
diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c
index d4c637a..6c05397 100644
--- a/cman/daemon/ais.c
+++ b/cman/daemon/ais.c
@@ -7,7 +7,6 @@
#include stdarg.h
#include unistd.h
#include string.h
-#include syslog.h
#include signal.h
#include sys/socket.h
#include sys/utsname.h
diff --git a/cman/daemon/barrier.c b/cman/daemon/barrier.c
index 56eb791..3242e03 100644
--- a/cman/daemon/barrier.c
+++ b/cman/daemon/barrier.c
@@ -3,7 +3,6 @@
#include stdio.h
#include fcntl.h
#include unistd.h
-#include syslog.h
#include string.h
#include sys/time.h
#include unistd.h
diff --git a/cman/daemon/daemon.c b/cman/daemon/daemon.c
index 18c820d..3c18fc7 100644
--- a/cman/daemon/daemon.c
+++ b/cman/daemon/daemon.c
@@ -4,7 +4,6 @@
#include stdio.h
#include fcntl.h
#include unistd.h
-#include syslog.h
#include string.h
#include sys/time.h
#include unistd.h
diff --git a/cman/daemon/logging.c b/cman/daemon/logging.c
index 917e9b4..eb488d7 100644
--- a/cman/daemon/logging.c
+++ b/cman/daemon/logging.c
@@ -1,4 +1,3 @@
-#include syslog.h
#include stdarg.h
#include stdio.h
#include string.h
diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile
index ee750db..e4cfec4 100644
--- a/fence/fence_node/Makefile
+++ b/fence/fence_node/Makefile
@@ -14,11 +14,12 @@ OBJS= fence_node.o
CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${ccsincdir} -I${fenceincdir}
+CFLAGS += -I${ccsincdir} -I${fenceincdir} -I${openaisincdir}
CFLAGS += -I$(S)/../libfenced
CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${fencelibdir} -lccs -lfence
+LDFLAGS += -L${openaislibdir} -llogsys
LDFLAGS += -L../libfenced -lfenced
${TARGET}: ${OBJS}
diff --git a/fence/fence_node/fence_node.c b/fence/fence_node/fence_node.c
index 9823650..0f6f42d 100644
--- a/fence/fence_node/fence_node.c
+++ b/fence/fence_node/fence_node.c
@@ -3,7 +3,7 @@
#include unistd.h
#include stdint.h
#include string.h
-#include syslog.h
+#include openais/service/logsys.h
#include libfence.h
#include libfenced.h
@@ -22,6 +22,13 @@ while (0)
static char *prog_name;
+LOGSYS_DECLARE_SYSTEM (NULL,
+ LOG_MODE_OUTPUT_STDERR |
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-14-ge3ca05f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e3ca05f77bc7e801087d11cae429a35a79e26838 The branch, master has been updated via e3ca05f77bc7e801087d11cae429a35a79e26838 (commit) from 3b32463d209192a074ffdc9988c25b25136f3c91 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit e3ca05f77bc7e801087d11cae429a35a79e26838 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Wed Jun 25 07:09:25 2008 +0200 [GFS2] hexedit does not need syslog Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: gfs2/edit/hexedit.c |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index fd59527..fa65000 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -27,8 +27,6 @@ #include libgfs2.h #include gfs2hex.h -#include syslog.h - #define RGLIST_DUMMY_BLOCK -2 int display(int identify_only); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-15-ge91380a
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e91380a6f2743ad3ddd6f1fec1cde5a1688f1b0c The branch, master has been updated via e91380a6f2743ad3ddd6f1fec1cde5a1688f1b0c (commit) from e3ca05f77bc7e801087d11cae429a35a79e26838 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit e91380a6f2743ad3ddd6f1fec1cde5a1688f1b0c Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Wed Jun 25 07:18:31 2008 +0200 [FENCE] fence_tool: document ls Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: fence/fence_tool/fence_tool.c |1 + fence/man/fence_tool.8|2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fence/fence_tool/fence_tool.c b/fence/fence_tool/fence_tool.c index f79ff84..ded7eda 100644 --- a/fence/fence_tool/fence_tool.c +++ b/fence/fence_tool/fence_tool.c @@ -347,6 +347,7 @@ static void print_usage(void) printf(Actions:\n); printf( join Join the default fence domain\n); printf( leaveLeave default fence domain\n); + printf( ls List nodes status\n); printf( dump Dump debug buffer from fenced\n); printf(\n); printf(Options:\n); diff --git a/fence/man/fence_tool.8 b/fence/man/fence_tool.8 index 73867cb..a83da94 100644 --- a/fence/man/fence_tool.8 +++ b/fence/man/fence_tool.8 @@ -6,7 +6,7 @@ fence_tool - A program to join and leave the fence domain .SH SYNOPSIS .B fence_tool -\fBjoin | leave | dump\fP +\fBjoin | leave | ls | dump\fP [\fIOPTION\fR]... .SH DESCRIPTION hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-57-g0b8bd69
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0b8bd69b8f6a393958229551396057ac44ca5391
The branch, master has been updated
via 0b8bd69b8f6a393958229551396057ac44ca5391 (commit)
via 4d6472e59640d2594c5d9101b1ca7cc6ee1c952e (commit)
via 8b317c5b251513a0825d8c0ccd85aa7b246a5b19 (commit)
from 06be5b42ff670cbb9177a72c9ac43ac10caa8d7d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0b8bd69b8f6a393958229551396057ac44ca5391
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 23 13:59:56 2008 +0200
[QDISK] Port qdisk to the new logsys config interface
NOTE: this commit also retain backward compatibility with
the old logging config options but warns the users
that they are depracated.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 4d6472e59640d2594c5d9101b1ca7cc6ee1c952e
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 23 13:34:18 2008 +0200
[CCS] Fix debug override from command line vs config
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 8b317c5b251513a0825d8c0ccd85aa7b246a5b19
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 23 11:38:32 2008 +0200
[CCS] Always check for debug setting as first thing
This allow us to enable and read debugging output as soon
as possible.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/misc.c | 92
cman/qdisk/main.c | 199 -
2 files changed, 213 insertions(+), 78 deletions(-)
diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index 5ba999f..acab5c8 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -166,6 +166,52 @@ int set_ccs_logging(xmlDocPtr ldoc){
logmode = logsys_config_mode_get();
+ res = do_simple_xml_query(ctx, /cluster/logging/@debug);
+ if(res) {
+if(!strcmp(res, on)) {
+ global_debug = 1;
+} else
+if(!strcmp(res, off)) {
+ global_debug = 0;
+} else
+ log_printf(LOG_ERR, global debug: unknown value\n);
+free(res);
+res=NULL;
+ }
+
+ res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@debug);
+ if(res) {
+if(!debug) {
+ if(!strcmp(res, on)) {
+ debug = 1;
+ } else
+ if(!strcmp(res, off)) { /* debug from cmdline/envvars override config
*/
+ debug = 0;
+ } else
+ log_printf(LOG_ERR, subsys debug: unknown value\n);
+}
+free(res);
+res=NULL;
+ } else
+debug = global_debug; /* global debug overrides subsystem only if latter
is not specified */
+
+ if(debug)
+logsys_config_priority_set (LOG_LEVEL_DEBUG);
+
+ res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@syslog_level);
+ if(res) {
+loglevel = logsys_priority_id_get (res);
+if (loglevel 0)
+ loglevel = LOG_LEVEL_INFO;
+
+if (!debug)
+ logsys_config_priority_set (loglevel);
+
+log_printf(LOG_DEBUG, syslog_level: %s (%d).\n, res, loglevel);
+free(res);
+res=NULL;
+ }
+
res = do_simple_xml_query(ctx, /cluster/logging/@to_stderr);
if(res) {
if(!strcmp(res, yes)) {
@@ -228,52 +274,6 @@ int set_ccs_logging(xmlDocPtr ldoc){
res=NULL;
}
- res = do_simple_xml_query(ctx, /cluster/logging/@debug);
- if(res) {
-if(!strcmp(res, on)) {
- global_debug = 1;
-} else
-if(!strcmp(res, off)) {
- global_debug = 0;
-} else
- log_printf(LOG_ERR, debug: unknown value\n);
-free(res);
-res=NULL;
- }
-
- /* subsytem config */
-
- res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@debug);
- if(res) {
-if(!strcmp(res, on)) {
- debug = 1;
-} else
-if(!strcmp(res, off) !debug) { /* debug from cmdline/envvars override
config */
- debug = 0;
-} else
- log_printf(LOG_ERR, debug: unknown value\n);
-free(res);
-res=NULL;
- } else
-debug = global_debug; /* global debug overrides subsystem only if latter
is not specified */
-
- if(debug)
-logsys_config_priority_set (LOG_LEVEL_DEBUG);
-
- res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@syslog_level);
- if(res) {
-loglevel = logsys_priority_id_get (res);
-if (loglevel 0)
- loglevel = LOG_LEVEL_INFO;
-
-if (!debug)
- logsys_config_priority_set (loglevel);
-
-log_printf(LOG_DEBUG, syslog_level: %s (%d).\n, res, loglevel);
-free(res);
-res=NULL;
- }
-
if(ctx){
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-58-ga2f1025
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a2f1025d6e1595475afcdcd68d6f8205ecf99412
The branch, master has been updated
via a2f1025d6e1595475afcdcd68d6f8205ecf99412 (commit)
from 0b8bd69b8f6a393958229551396057ac44ca5391 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit a2f1025d6e1595475afcdcd68d6f8205ecf99412
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 23 15:09:33 2008 +0200
[MISC] Logging: optimizing query sequence
Query for debug info only if nothing is specified on the command line.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/misc.c | 65 --
cman/qdisk/main.c | 81 +++--
2 files changed, 72 insertions(+), 74 deletions(-)
diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index acab5c8..76f63de 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -166,22 +166,22 @@ int set_ccs_logging(xmlDocPtr ldoc){
logmode = logsys_config_mode_get();
- res = do_simple_xml_query(ctx, /cluster/logging/@debug);
- if(res) {
-if(!strcmp(res, on)) {
- global_debug = 1;
-} else
-if(!strcmp(res, off)) {
- global_debug = 0;
-} else
- log_printf(LOG_ERR, global debug: unknown value\n);
-free(res);
-res=NULL;
- }
+ if(!debug) {
+res = do_simple_xml_query(ctx, /cluster/logging/@debug);
+if(res) {
+ if(!strcmp(res, on)) {
+ global_debug = 1;
+ } else
+ if(!strcmp(res, off)) {
+ global_debug = 0;
+ } else
+ log_printf(LOG_ERR, global debug: unknown value\n);
+ free(res);
+ res=NULL;
+}
- res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@debug);
- if(res) {
-if(!debug) {
+res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@debug);
+if(res) {
if(!strcmp(res, on)) {
debug = 1;
} else
@@ -189,28 +189,25 @@ int set_ccs_logging(xmlDocPtr ldoc){
debug = 0;
} else
log_printf(LOG_ERR, subsys debug: unknown value\n);
-}
-free(res);
-res=NULL;
- } else
-debug = global_debug; /* global debug overrides subsystem only if latter
is not specified */
-
- if(debug)
-logsys_config_priority_set (LOG_LEVEL_DEBUG);
+ free(res);
+ res=NULL;
+} else
+ debug = global_debug; /* global debug overrides subsystem only if latter
is not specified */
- res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@syslog_level);
- if(res) {
-loglevel = logsys_priority_id_get (res);
-if (loglevel 0)
- loglevel = LOG_LEVEL_INFO;
+res = do_simple_xml_query(ctx, /cluster/logging/[EMAIL
PROTECTED]CCS\]/@syslog_level);
+if(res) {
+ loglevel = logsys_priority_id_get (res);
+ if (loglevel 0)
+ loglevel = LOG_LEVEL_INFO;
-if (!debug)
- logsys_config_priority_set (loglevel);
+ if(!debug)
+ logsys_config_priority_set (loglevel);
-log_printf(LOG_DEBUG, syslog_level: %s (%d).\n, res, loglevel);
-free(res);
-res=NULL;
- }
+ free(res);
+ res=NULL;
+}
+ } else
+logsys_config_priority_set (LOG_LEVEL_DEBUG);
res = do_simple_xml_query(ctx, /cluster/logging/@to_stderr);
if(res) {
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 466609a..4202508 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1077,59 +1077,60 @@ get_logsys_config_data(int *debug)
logmode = logsys_config_mode_get();
- if (ccs_get(ccsfd, /cluster/logging/@debug, val) == 0) {
- if(!strcmp(val, on)) {
- global_debug = 1;
- } else
- if(!strcmp(val, off)) {
- global_debug = 0;
- } else
- log_printf(LOG_ERR, global debug: unknown value\n);
- free(val);
- val = NULL;
- }
+ if (!debug) {
+ if (ccs_get(ccsfd, /cluster/logging/@debug, val) == 0) {
+ if(!strcmp(val, on)) {
+ global_debug = 1;
+ } else
+ if(!strcmp(val, off)) {
+ global_debug = 0;
+ } else
+ log_printf(LOG_ERR, global debug: unknown
value\n);
+ free(val);
+ val = NULL;
+ }
- if
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-54-g06be5b4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=06be5b42ff670cbb9177a72c9ac43ac10caa8d7d
The branch, master has been updated
via 06be5b42ff670cbb9177a72c9ac43ac10caa8d7d (commit)
from 2a8c5d4d91e5ff0467cbe20fce4b230c19a75376 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 06be5b42ff670cbb9177a72c9ac43ac10caa8d7d
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 23 07:51:17 2008 +0200
[BUILD] Fix new gfs_controld Makefile
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
group/gfs_controld/Makefile |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile
index 368435c..266ba75 100644
--- a/group/gfs_controld/Makefile
+++ b/group/gfs_controld/Makefile
@@ -20,15 +20,15 @@ OBJS= main.o \
util.o \
plock.o
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmcontrolincdir}
-CFLAGS += -I${openaisincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${dlmcontrolincdir} -I${openaisincdir}
CFLAGS += -I${KERNEL_SRC}/include/
CFLAGS += -I$(S)/../libgfscontrol -I$(S)/../../fence/libfenced/
CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
CFLAGS += -I${incdir}
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lcman -lccs -ldlmcontrol
-LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman
+LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol -L${openaislibdir} -lcpg -lSaCkpt
LDFLAGS += -L../../fence/libfenced/ -lfenced
LDFLAGS += -L../lib -lgroup
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-40-g41356bd
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=41356bd6b4322fd3029e32fea317063bb9a4e543
The branch, master has been updated
via 41356bd6b4322fd3029e32fea317063bb9a4e543 (commit)
from 2a62bccc8a9ec72bcb6cb6c75583eb55d2af9433 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 41356bd6b4322fd3029e32fea317063bb9a4e543
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 08:43:31 2008 +0200
[CCS] Improve logsys init order
If we can init and config from a real config file, do that
and start logging immediatly.
If we cannot, fall back to default and start logging.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/ccsd.c | 10 +-
ccs/daemon/misc.c | 10 ++
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ccs/daemon/ccsd.c b/ccs/daemon/ccsd.c
index c4d36b8..12ad2e7 100644
--- a/ccs/daemon/ccsd.c
+++ b/ccs/daemon/ccsd.c
@@ -58,6 +58,7 @@ int main(int argc, char *argv[]){
int addr_size=0;
fd_set rset, tmp_set;
char *msg;
+ unsigned int logmode;
msg = parse_cli_args(argc, argv);
@@ -72,7 +73,14 @@ int main(int argc, char *argv[]){
exit(EXIT_FAILURE);
}
- logsys_config_mode_set (LOG_MODE_OUTPUT_STDERR |
LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE |
LOG_MODE_FLUSH_AFTER_CONFIG);
+ logmode = logsys_config_mode_get();
+
+ if(logmode LOG_MODE_BUFFER_BEFORE_CONFIG) {
+log_printf(LOG_INFO, Using default CCS logsys config options\n);
+logmode = ~LOG_MODE_BUFFER_BEFORE_CONFIG;
+logmode |= LOG_MODE_FLUSH_AFTER_CONFIG;
+logsys_config_mode_set (logmode);
+ }
daemonize();
diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index 13f5780..b372e81 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -154,6 +154,7 @@ int set_ccs_logging(xmlDocPtr ldoc){
int facility = SYSLOGFACILITY, loglevel = LOG_LEVEL_INFO;
char *res = NULL;
xmlXPathContextPtr ctx = NULL;
+ unsigned int logmode;
CCSENTER(set_ccs_logging);
@@ -193,6 +194,15 @@ int set_ccs_logging(xmlDocPtr ldoc){
xmlXPathFreeContext(ctx);
}
+ logmode = logsys_config_mode_get();
+
+ if(logmode LOG_MODE_BUFFER_BEFORE_CONFIG) {
+log_printf(LOG_INFO, CCS logsys config enabled from set_ccs_logging\n);
+logmode = ~LOG_MODE_BUFFER_BEFORE_CONFIG;
+logmode |= LOG_MODE_FLUSH_AFTER_CONFIG;
+logsys_config_mode_set (logmode);
+ }
+
CCSEXIT(set_ccs_logging);
return 0;
}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-41-g5b0cc0d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=5b0cc0dd3285d92c137c9166e333497cda2505e3
The branch, master has been updated
via 5b0cc0dd3285d92c137c9166e333497cda2505e3 (commit)
from 41356bd6b4322fd3029e32fea317063bb9a4e543 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 5b0cc0dd3285d92c137c9166e333497cda2505e3
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 08:46:12 2008 +0200
[CCS] Fix improper log level on debugging information
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/ccsd.c |2 +-
ccs/daemon/misc.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ccs/daemon/ccsd.c b/ccs/daemon/ccsd.c
index 12ad2e7..65d8e1e 100644
--- a/ccs/daemon/ccsd.c
+++ b/ccs/daemon/ccsd.c
@@ -76,7 +76,7 @@ int main(int argc, char *argv[]){
logmode = logsys_config_mode_get();
if(logmode LOG_MODE_BUFFER_BEFORE_CONFIG) {
-log_printf(LOG_INFO, Using default CCS logsys config options\n);
+log_printf(LOG_DEBUG, Using default CCS logsys config options\n);
logmode = ~LOG_MODE_BUFFER_BEFORE_CONFIG;
logmode |= LOG_MODE_FLUSH_AFTER_CONFIG;
logsys_config_mode_set (logmode);
diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index b372e81..3527632 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -197,7 +197,7 @@ int set_ccs_logging(xmlDocPtr ldoc){
logmode = logsys_config_mode_get();
if(logmode LOG_MODE_BUFFER_BEFORE_CONFIG) {
-log_printf(LOG_INFO, CCS logsys config enabled from set_ccs_logging\n);
+log_printf(LOG_DEBUG, CCS logsys config enabled from set_ccs_logging\n);
logmode = ~LOG_MODE_BUFFER_BEFORE_CONFIG;
logmode |= LOG_MODE_FLUSH_AFTER_CONFIG;
logsys_config_mode_set (logmode);
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-43-g5c5db57
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c
The branch, master has been updated
via 5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c (commit)
from 0d722b3eb28b383f489525d118da70cb0a87ec7a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 5c5db57a44ee6a737ac6fbc9564e08c833bf8e8c
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 10:31:55 2008 +0200
[QDISK] Fix build with new openais logsys
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/qdisk/main.c|4 ++--
cman/qdisk/mkqdisk.c |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 47f0323..31e7819 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -53,7 +53,7 @@ void update_local_status(qd_ctx *ctx, node_info_t *ni, int
max, int score,
LOGSYS_DECLARE_SYSTEM (NULL,
-LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED |
LOG_MODE_OUTPUT_FILE | LOG_MODE_DISPLAY_DEBUG | LOG_MODE_BUFFER_BEFORE_CONFIG,
+LOG_MODE_OUTPUT_STDERR | LOG_MODE_OUTPUT_SYSLOG_THREADED |
LOG_MODE_OUTPUT_FILE | LOG_MODE_BUFFER_BEFORE_CONFIG,
LOGDIR /qdisk.log,
SYSLOGFACILITY);
@@ -1392,7 +1392,7 @@ main(int argc, char **argv)
pid_t pid;
quorum_header_t qh;
- logsys_config_mode_set (LOG_MODE_OUTPUT_STDERR |
LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE | LOG_MODE_DISPLAY_DEBUG
| LOG_MODE_FLUSH_AFTER_CONFIG);
+ logsys_config_mode_set (LOG_MODE_OUTPUT_STDERR |
LOG_MODE_OUTPUT_SYSLOG_THREADED | LOG_MODE_OUTPUT_FILE |
LOG_MODE_FLUSH_AFTER_CONFIG);
if (check_process_running(argv[0], pid) pid !=getpid()) {
log_printf(LOG_INFO, QDisk services already running\n);
diff --git a/cman/qdisk/mkqdisk.c b/cman/qdisk/mkqdisk.c
index 5cfe5cb..c7a7ba6 100644
--- a/cman/qdisk/mkqdisk.c
+++ b/cman/qdisk/mkqdisk.c
@@ -12,7 +12,7 @@
#include unistd.h
#include openais/service/logsys.h
-LOGSYS_DECLARE_SYSTEM (NULL, LOG_MODE_OUTPUT_STDERR | LOG_MODE_DISPLAY_DEBUG,
NULL, SYSLOGFACILITY);
+LOGSYS_DECLARE_SYSTEM (NULL, LOG_MODE_OUTPUT_STDERR, NULL, SYSLOGFACILITY);
LOGSYS_DECLARE_SUBSYS (QDISK, LOG_LEVEL_INFO);
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-51-g9e51310
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9e513104970a78be352cfeea7d557378618b283b
The branch, master has been updated
via 9e513104970a78be352cfeea7d557378618b283b (commit)
via b7dd415ecba984f8ad20205c5291bef203381906 (commit)
via 48c81719df1cf67e1905b8c74deea944633c40a5 (commit)
via 44b80c950cd4d942b69f38faeeca44feffce944f (commit)
via 08e1518655285271a922e1ef5b4d6c0665f97551 (commit)
via 0cd62a286d8057196b05783d2fb84da2816c187b (commit)
via e152f256d1caddeab7dd0a82ab22d577d51545f0 (commit)
from d1c086c706bce8fee73491bfda52cffae4e1fc51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 9e513104970a78be352cfeea7d557378618b283b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 16:19:54 2008 +0200
[QDISK] Major clean up
Kill lots of dead and unused code around.
Switch whatever possible into static functions.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit b7dd415ecba984f8ad20205c5291bef203381906
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:45:44 2008 +0200
[QDISK] Init logsys later in the process
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 48c81719df1cf67e1905b8c74deea944633c40a5
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:41:34 2008 +0200
[QDISK] Clean handling of debug envvar
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 44b80c950cd4d942b69f38faeeca44feffce944f
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:39:29 2008 +0200
[QDISK] Remove duplicate debugging configuration
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 08e1518655285271a922e1ef5b4d6c0665f97551
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:36:10 2008 +0200
[QDISK] get_config_data cleanup
get_config_data does not need cluster name.
change invokation from ccs_force_connect to ccs_connect.
ccs_force_connect returns only when connection is succesful
and can sit there forever.
With the new libccs, if we are connected to cman, we can be
100% sure that we will be able to do a ccs_connect.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 0cd62a286d8057196b05783d2fb84da2816c187b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:34:03 2008 +0200
[QDISK] Make get_config_data static
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit e152f256d1caddeab7dd0a82ab22d577d51545f0
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:33:08 2008 +0200
[QDISK] Fix debug type
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/qdisk/Makefile |1 -
cman/qdisk/crc32.c |8
cman/qdisk/daemon_init.c |3 +-
cman/qdisk/disk.h|1 -
cman/qdisk/disk_util.c | 69 +---
cman/qdisk/gettid.c | 24 ---
cman/qdisk/gettid.h |7 ---
cman/qdisk/main.c| 97 +++---
cman/qdisk/proc.c|8 ++--
cman/qdisk/score.c | 56 +-
cman/qdisk/score.h |5 --
11 files changed, 42 insertions(+), 237 deletions(-)
delete mode 100644 cman/qdisk/gettid.c
delete mode 100644 cman/qdisk/gettid.h
diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile
index 3384dbc..87888d3 100644
--- a/cman/qdisk/Makefile
+++ b/cman/qdisk/Makefile
@@ -24,7 +24,6 @@ EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
OBJS1= main.o \
score.o \
bitmap.o \
- gettid.o \
daemon_init.o
OBJS2= mkqdisk.o
diff --git a/cman/qdisk/crc32.c b/cman/qdisk/crc32.c
index 796fac9..597d0b7 100644
--- a/cman/qdisk/crc32.c
+++ b/cman/qdisk/crc32.c
@@ -95,11 +95,3 @@ uint32_t clu_crc32(const char *data, size_t count)
return 0;
return ~crc;
}
-
-#if 0
-int
-main(int argc, const char **argv)
-{
- printf(%08x\n,crc32(argv[1],strlen(argv[1])));
-}
-#endif
diff --git a/cman/qdisk/daemon_init.c b/cman/qdisk/daemon_init.c
index 13803aa..2534f1c 100644
--- a/cman/qdisk/daemon_init.c
+++ b/cman/qdisk/daemon_init.c
@@ -29,7 +29,6 @@
* This should ultimately go in a header file.
*/
void daemon_init(char *prog);
-int check_pid_valid(pid_t pid, char *prog);
int check_process_running(char *prog, pid_t * pid);
/*
@@ -40,7 +39,7 @@ static int setup_sigmask(void);
LOGSYS_DECLARE_SUBSYS
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-22-g1a500cf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6
The branch, STABLE2 has been updated
via 1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6 (commit)
via ba6254c4e68f088c9324f1d27ccf2a0c7215e1f7 (commit)
via c90cbd64efac793a5a364b561d78ff75e0018e97 (commit)
from 40bb88dbe0b246107e7106a04bf2c8793d3c445d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:39:29 2008 +0200
[QDISK] Remove duplicate debugging configuration
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit ba6254c4e68f088c9324f1d27ccf2a0c7215e1f7
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:36:10 2008 +0200
[QDISK] get_config_data cleanup
get_config_data does not need cluster name.
change invokation from ccs_force_connect to ccs_connect.
ccs_force_connect returns only when connection is succesful
and can sit there forever.
With the new libccs, if we are connected to cman, we can be
100% sure that we will be able to do a ccs_connect.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit c90cbd64efac793a5a364b561d78ff75e0018e97
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 15:33:08 2008 +0200
[QDISK] Fix debug type
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/qdisk/main.c | 15 +++
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 704995e..ed4aba5 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1083,8 +1083,8 @@ quorum_logout(qd_ctx *ctx)
/**
Grab all our configuration data from CCSD
*/
-int
-get_config_data(char *cluster_name, qd_ctx *ctx, struct h_data *h, int maxh,
+static int
+get_config_data(qd_ctx *ctx, struct h_data *h, int maxh,
int *cfh, int debug)
{
int ccsfd = -1, loglevel = 4;
@@ -1093,7 +1093,7 @@ get_config_data(char *cluster_name, qd_ctx *ctx, struct
h_data *h, int maxh,
clulog(LOG_DEBUG, Loading configuration information\n);
- ccsfd = ccs_force_connect(cluster_name, 1);
+ ccsfd = ccs_connect();
if (ccsfd 0) {
clulog(LOG_CRIT, Connection to CCSD failed; cannot start\n);
return -1;
@@ -1373,7 +1373,7 @@ main(int argc, char **argv)
cman_handle_t ch = NULL;
node_info_t ni[MAX_NODES_DISK];
struct h_data h[10];
- char debug = 0, foreground = 0;
+ int debug = 0, foreground = 0;
char device[128];
pid_t pid;
quorum_header_t qh;
@@ -1451,15 +1451,14 @@ main(int argc, char **argv)
if (debug) {
clu_set_loglevel(LOG_DEBUG);
-ctx.qc_flags |= RF_DEBUG;
}
-
- if (get_config_data(NULL, ctx, h, 10, cfh, debug) 0) {
+
+ if (get_config_data(ctx, h, 10, cfh, debug) 0) {
clulog_and_print(LOG_CRIT, Configuration failed\n);
check_stop_cman(ctx);
goto out;
}
-
+
if (ctx.qc_label) {
ret = find_partitions(ctx.qc_label, device, sizeof(device), 0);
if (ret 0) {
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-24-g114dd2e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=114dd2efb2e8219324a06948588f4e70f47b91d7
The branch, STABLE2 has been updated
via 114dd2efb2e8219324a06948588f4e70f47b91d7 (commit)
via 2ec282bd0ae2c9c86655e48744c93226101b1e23 (commit)
from 1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 114dd2efb2e8219324a06948588f4e70f47b91d7
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 20 16:44:47 2008 +0200
[MISC] Fix previous cherry pick build failure in stable branch
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 2ec282bd0ae2c9c86655e48744c93226101b1e23
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 7 09:54:12 2008 +0200
[MISC] Fix build errors with Fedora default build options
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/qdisk/daemon_init.c | 13 +++--
cman/qdisk/scandisk.c | 20 +---
fence/agents/xvm/fence_xvm.c |4 +++-
fence/agents/xvm/fence_xvmd.c |6 +-
fence/agents/xvm/xml.c|2 +-
rgmanager/src/clulib/cman.c |6 --
rgmanager/src/clulib/daemon_init.c| 14 +++---
rgmanager/src/clulib/msg_cluster.c| 26 ++
rgmanager/src/clulib/msgtest.c|3 ++-
rgmanager/src/daemons/clurmtabd_lib.c |2 +-
rgmanager/src/daemons/main.c |3 ++-
11 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/cman/qdisk/daemon_init.c b/cman/qdisk/daemon_init.c
index dac66b7..460bef3 100644
--- a/cman/qdisk/daemon_init.c
+++ b/cman/qdisk/daemon_init.c
@@ -129,8 +129,13 @@ check_process_running(char *prog, pid_t * pid)
if (fp == NULL) { /* error */
return 0;
}
- fscanf(fp, %d\n, oldpid);
+
+ ret = fscanf(fp, %d\n, oldpid);
fclose(fp);
+
+ if ((ret == EOF) || (ret != 1))
+ return 0;
+
if (check_pid_valid(oldpid, cmd)) {
*pid = oldpid;
return 1;
@@ -213,7 +218,11 @@ daemon_init(char *prog)
exit(1);
}
- daemon(0, 0);
+ if(daemon(0, 0)) {
+ fprintf(stderr, daemon_init: Unable to daemonize.\n);
+ exit(1);
+ }
+
update_pidfile(prog);
}
diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c
index b174822..820f63e 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -466,8 +466,13 @@ static int sysfs_is_dev(char *path, int *maj, int *min)
if (!lstat(newpath, sb)) {
f = fopen(newpath, r);
if (f) {
- fscanf(f, %d:%d, maj, min);
+ int err;
+
+ err = fscanf(f, %d:%d, maj, min);
fclose(f);
+ if ((err == EOF) || (err != 2))
+ return -1;
+
return 1;
} else
return -1;
@@ -494,8 +499,12 @@ static int sysfs_is_removable(char *path)
if (!lstat(newpath, sb)) {
f = fopen(newpath, r);
if (f) {
- fscanf(f, %d\n, i);
+ int err;
+
+ err = fscanf(f, %d\n, i);
fclose(f);
+ if ((err == EOF) || (err != 1))
+ i = -1;
}
}
return i;
@@ -586,9 +595,14 @@ static int sysfs_is_disk(char *path)
found:
f = fopen(newpath, r);
if (f) {
- fscanf(f, %d\n, i);
+ int err;
+
+ err = fscanf(f, %d\n, i);
fclose(f);
+ if ((err == EOF) || (err != 1))
+ return 0;
+
switch (i) {
case 0x0: /* scsi type_disk */
case 0xe: /* found on ide disks from old kernels.. */
diff --git a/fence/agents/xvm/fence_xvm.c b/fence/agents/xvm/fence_xvm.c
index bf33557..e5847db 100644
--- a/fence/agents/xvm/fence_xvm.c
+++ b/fence/agents/xvm/fence_xvm.c
@@ -104,7 +104,9 @@ tcp_exchange(int fd, fence_auth_type_t auth, void *key,
return -1;
/* Read return code */
- read(fd, ret, 1);
+ if (read(fd, ret, 1) 0)
+ return -1;
+
close(fd);
if (ret == 0)
printf(Remote: Operation
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-19-g40bb88d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=40bb88dbe0b246107e7106a04bf2c8793d3c445d
The branch, STABLE2 has been updated
via 40bb88dbe0b246107e7106a04bf2c8793d3c445d (commit)
via c645bda5140d88a490f9b62cd0ad65c832f152dc (commit)
from ac95cea5aa26a149e2d34d156186aa29329e7952 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 40bb88dbe0b246107e7106a04bf2c8793d3c445d
Author: Benjamin Marzinski [EMAIL PROTECTED]
Date: Thu Jun 19 15:44:27 2008 -0500
[gnbd-kernel] bz 449812: disallow sending requests after a send has failed.
This fix adds a corrupt flag to the gnbd device structure. This flag is
cleared when a new socket connection is opened to the server. It is set
whenever a send fails. After this all future sends will fail, and the
receiver
process will stop accepting replies as soon as it notices the flag.
commit c645bda5140d88a490f9b62cd0ad65c832f152dc
Author: Benjamin Marzinski [EMAIL PROTECTED]
Date: Thu Jun 19 14:01:20 2008 -0500
gnbd-kernel: Fix receiver race
It is possible to have the gnbd receiver process finish and end a request
before
the sending process has finished using the request structure. This can
cause a
kernel panic.
This fix adds a waitqueue (tx_wait) and a pointer to the request currently
being send (current_request) to the gnbd device structure. current_request
is
set before any request is sent to the server. When the send is complete, it
is
cleared and the wait_queue is woken. A new function, wait_for_send() is
called
whenever it is possible for a call to gnbd_end_request() to interleave with
a
send. It waits on the waitqueue if the request about to be ended is
currently
being sent.
Conflicts:
gnbd-kernel/src/gnbd.c
---
Summary of changes:
gnbd-kernel/src/gnbd.c | 60 ---
gnbd-kernel/src/gnbd.h |3 ++
2 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/gnbd-kernel/src/gnbd.c b/gnbd-kernel/src/gnbd.c
index d6a8035..ade7347 100644
--- a/gnbd-kernel/src/gnbd.c
+++ b/gnbd-kernel/src/gnbd.c
@@ -254,6 +254,26 @@ static const char *gnbdcmd_to_ascii(int cmd)
}
#endif /* NDEBUG */
+
+static int wait_for_send(struct request *req, struct gnbd_device *dev)
+{
+ DECLARE_WAITQUEUE(wait, current);
+
+ add_wait_queue(dev-tx_wait, wait);
+ while(dev-current_request == req) {
+ set_current_state(TASK_INTERRUPTIBLE);
+ if (signal_pending(current)) {
+ printk(KERN_WARNING gnbd (pid %d: %s) wait interrupted
by signal\n,
+ current-pid, current-comm);
+ return -EINTR;
+ }
+ schedule();
+ }
+ set_current_state(TASK_RUNNING);
+ remove_wait_queue(dev-tx_wait, wait);
+ return 0;
+}
+
static void gnbd_end_request(struct request *req)
{
int error = req-errors ? -EIO : 0;
@@ -369,6 +389,12 @@ int __gnbd_send_req(struct gnbd_device *dev, struct socket
*sock,
down(dev-tx_lock);
+ if (dev-corrupt) {
+ printk(KERN_ERR %s: Attempted to send on a faulty socket\n,
+ dev-disk-disk_name);
+ result = -EBADFD;
+ goto error_out;
+ }
if (!sock) {
printk(KERN_ERR %s: Attempted send on closed socket\n,
dev-disk-disk_name);
@@ -381,13 +407,14 @@ int __gnbd_send_req(struct gnbd_device *dev, struct
socket *sock,
gnbdcmd_to_ascii(gnbd_cmd(req)),
(unsigned long long)req-sector 9,
req-nr_sectors 9);
+ dev-current_request = req;
result = sock_xmit(sock, 1, request, sizeof(request),
(gnbd_cmd(req) == GNBD_CMD_WRITE)? MSG_MORE: 0,
can_signal);
if (result 0) {
printk(KERN_ERR %s: Send control failed (result %d)\n,
dev-disk-disk_name, result);
- goto error_out;
+ goto send_error_out;
}
if (gnbd_cmd(req) == GNBD_CMD_WRITE) {
@@ -410,13 +437,19 @@ int __gnbd_send_req(struct gnbd_device *dev, struct
socket *sock,
printk(KERN_ERR %s: Send data failed (result
%d)\n,
dev-disk-disk_name,
result);
-
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-11-g82c0828
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=82c082823e91ad190592cffb7a3dad3f187b3713
The branch, STABLE2 has been updated
via 82c082823e91ad190592cffb7a3dad3f187b3713 (commit)
from b88fc67061456f976f1f19c079cc2d59ba158f1b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 82c082823e91ad190592cffb7a3dad3f187b3713
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 13 06:05:49 2008 +0200
[CCS] Fix build warnings on sparc
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/cnx_mgr.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ccs/daemon/cnx_mgr.c b/ccs/daemon/cnx_mgr.c
index 72f89ab..5fcaaa0 100644
--- a/ccs/daemon/cnx_mgr.c
+++ b/ccs/daemon/cnx_mgr.c
@@ -304,7 +304,11 @@ static int broadcast_for_doc(char *cluster_name, int
blocking){
tv.tv_sec = 0;
tv.tv_usec = 25 + (random()%50);
+#if defined(__sparc__)
+log_dbg(Select waiting %d usec\n, tv.tv_usec);
+#else
log_dbg(Select waiting %ld usec\n, tv.tv_usec);
+#endif
while((error = select(sfd+1, rset, NULL,NULL, tv))){
log_dbg(Select returns %d\n, error);
if(error 0){
@@ -425,7 +429,11 @@ static int broadcast_for_doc(char *cluster_name, int
blocking){
reset_timer:
tv.tv_sec = 0;
tv.tv_usec = 25 + (random()%50);
+#if defined(__sparc__)
+ log_dbg(Select waiting %d usec\n, tv.tv_usec);
+#else
log_dbg(Select waiting %ld usec\n, tv.tv_usec);
+#endif
}
} while(blocking !master_doc);
out:
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-14-g21908be
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=21908be38d42d2186378100ec6d22922662da469 The branch, master has been updated via 21908be38d42d2186378100ec6d22922662da469 (commit) from c67ec3e04818e7d0cac6f5e9dd6340e02578bab4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 21908be38d42d2186378100ec6d22922662da469 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jun 12 09:08:35 2008 +0200 [GFS2] Add missing include and fix build warning Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: gfs2/mkfs/main_mkfs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index 0e3a19a..ed2044a 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -11,6 +11,7 @@ #include errno.h #include stdarg.h #include mntent.h +#include ctype.h #include linux/types.h #include libgfs2.h hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-15-g8c4044a
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8c4044a4131dbf70a0f276fdb7b5261f1e37d980 The branch, master has been updated via 8c4044a4131dbf70a0f276fdb7b5261f1e37d980 (commit) from 21908be38d42d2186378100ec6d22922662da469 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 8c4044a4131dbf70a0f276fdb7b5261f1e37d980 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jun 12 09:36:16 2008 +0200 [QDISK] Add better support for Xen virtual block devices This change allows to detect Xen virtual disks directly into sysfsattrs.disk without the need of an external filter. Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: cman/qdisk/scandisk.c | 12 +++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c index 84ab18e..820f63e 100644 --- a/cman/qdisk/scandisk.c +++ b/cman/qdisk/scandisk.c @@ -580,7 +580,17 @@ static int sysfs_is_disk(char *path) snprintf(newpath, sizeof(newpath), %s/../device/media, path); if (lstat(newpath, sb)) - return -1; + goto found; + + snprintf(newpath, sizeof(newpath), %s/device/devtype, path); + if (lstat(newpath, sb)) + return 1; + + snprintf(newpath, sizeof(newpath), %s/../device/devtype, path); + if (lstat(newpath, sb)) + return 1; + + return -1; found: f = fopen(newpath, r); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-3-ga48fcfe
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a48fcfecbb971f65c3f3e6296f9e40419dd3e035 The branch, STABLE2 has been updated via a48fcfecbb971f65c3f3e6296f9e40419dd3e035 (commit) from efc738457115b7a29adcbc4667234b02eb45ba29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit a48fcfecbb971f65c3f3e6296f9e40419dd3e035 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Thu Jun 12 09:36:16 2008 +0200 [QDISK] Add better support for Xen virtual block devices This change allows to detect Xen virtual disks directly into sysfsattrs.disk without the need of an external filter. Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: cman/qdisk/scandisk.c | 12 +++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c index 8eb6eef..b174822 100644 --- a/cman/qdisk/scandisk.c +++ b/cman/qdisk/scandisk.c @@ -571,7 +571,17 @@ static int sysfs_is_disk(char *path) snprintf(newpath, sizeof(newpath), %s/../device/media, path); if (lstat(newpath, sb)) - return -1; + goto found; + + snprintf(newpath, sizeof(newpath), %s/device/devtype, path); + if (lstat(newpath, sb)) + return 1; + + snprintf(newpath, sizeof(newpath), %s/../device/devtype, path); + if (lstat(newpath, sb)) + return 1; + + return -1; found: f = fopen(newpath, r); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-23-g552a28f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=552a28f82bf2aef8ea05af0a3c9c1702ba23326c
The branch, master has been updated
via 552a28f82bf2aef8ea05af0a3c9c1702ba23326c (commit)
from d74f235cfa69851083cf01e080387f5a0f50abdb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 552a28f82bf2aef8ea05af0a3c9c1702ba23326c
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 13 06:05:49 2008 +0200
[CCS] Fix build warnings on sparc
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/daemon/cnx_mgr.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ccs/daemon/cnx_mgr.c b/ccs/daemon/cnx_mgr.c
index 70fdeba..0c04082 100644
--- a/ccs/daemon/cnx_mgr.c
+++ b/ccs/daemon/cnx_mgr.c
@@ -306,7 +306,11 @@ static int broadcast_for_doc(char *cluster_name, int
blocking){
tv.tv_sec = 0;
tv.tv_usec = 25 + (random()%50);
+#if defined(__sparc__)
+log_printf(LOG_DEBUG, Select waiting %d usec\n, tv.tv_usec);
+#else
log_printf(LOG_DEBUG, Select waiting %ld usec\n, tv.tv_usec);
+#endif
while((error = select(sfd+1, rset, NULL,NULL, tv))){
log_printf(LOG_DEBUG, Select returns %d\n, error);
if(error 0){
@@ -427,7 +431,11 @@ static int broadcast_for_doc(char *cluster_name, int
blocking){
reset_timer:
tv.tv_sec = 0;
tv.tv_usec = 25 + (random()%50);
+#if defined(__sparc__)
+ log_printf(LOG_DEBUG, Select waiting %d usec\n, tv.tv_usec);
+#else
log_printf(LOG_DEBUG, Select waiting %ld usec\n, tv.tv_usec);
+#endif
}
} while(blocking !master_doc);
out:
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-11-g9258d22
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9258d221c87f833d21ace567993a9e9ffe543969 The branch, master has been updated via 9258d221c87f833d21ace567993a9e9ffe543969 (commit) from fdf727fc0e3f9f7f78140214237717763ae94dd4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 9258d221c87f833d21ace567993a9e9ffe543969 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Tue Jun 10 07:59:32 2008 +0200 [MISC] Add another exception to COPYRIGHT Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: COPYRIGHT |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 0178b5e..18e37a3 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -100,6 +100,10 @@ rgmanager/src/clulib/daemon_init.c: Copyright (C) 2002-2008 Red Hat, Inc. All rights reserved. Author: Jeff Moyer moyer at missioncriticallinux.com +rgmanager/src/clulib/msgsimple.c: + Copyright (C) 2000 Mission Critical Linux + Copyright (C) 2002-2008 Red Hat, Inc. All rights reserved. + rgmanager/src/clulib/tmgr.c: Copyright (C) 2006-2007 Crosswalk. Copyright (C) 2007-2008 Red Hat, Inc. All rights reserved. hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project annotated tag, cluster-2.03.04, created. cluster-2.03.04
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=2c53ceb3e820bb12ff730f4aa372d4c427781030 The annotated tag, cluster-2.03.04 has been created at 2c53ceb3e820bb12ff730f4aa372d4c427781030 (tag) tagging 4ce57de84bf434983af8c6c352cecc5d78806808 (commit) replaces cluster-2.03.03 tagged by Fabio M. Di Nitto on Tue Jun 10 10:32:57 2008 +0200 - Log - cluster-2.03.04 release Bob Peterson (6): Fix gfs2_edit bugs with non-4K block sizes Make gfs2_edit more friendly to automated testing. Updates to gfs2_edit man page for new option. Allow keywords in block number input Ability to specify starting block or structure with -s Fix compiler warning. Fabio M. Di Nitto (14): [CMAN] Fix cman_tool node name override [GFS2] Use proper include dir for libvolume_id [FENCE] Fix copyright header for fence_ifmib manpage [FENCE] Fix ifmib README to report the right fence agent [BUILD] Plugin the new shiny fence_ifmib agent [CCS] Use absolute path for queries [GNBD/FENCE] Move fence_gnbd agent where it belongs [BUILD] Fix file permissions all around [BUILD] Clean up standard libraries Makefiles [MISC] Whitespace cleanup [GFS] Remove obsoleted gfs_edit in favour of gfs2_edit [MISC] Remove obsolete and empty files [MISC] Add top level licence files [MISC] Cleanup licence, copyright and header duplication Lon Hohberger (1): [rgmanager] Use /cluster/rm instead of //rm Marek 'marx' Grac (3): [FENCE] Fix #446995: Unknown option [FENCE] Fix: 447378: fence_apc unable to connect via ssh to APC 7900 Fixes #445662: names of resources with spaces are mishandled Mark Hlawatschek (1): mount.gfs2: skip mtab updates Ross Vandegrift (1): [FENCE] Add fence_ifmib new agent Ryan McCabe (1): fence: fixes and cleanups to fencing.py library --- hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-19-g528524d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=528524df19cc8bab136bc009010b7c68189a7368
The branch, master has been updated
via 528524df19cc8bab136bc009010b7c68189a7368 (commit)
from 3357e69e113feda28abad93f693d43c970f96027 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 528524df19cc8bab136bc009010b7c68189a7368
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 9 08:40:33 2008 +0200
[MISC] Update top level copyright file
Add 2 missing exceptions and fix a typo
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
COPYRIGHT | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/COPYRIGHT b/COPYRIGHT
index d2c6528..853f8be 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -26,6 +26,10 @@ cman/qdisk/scandisk.{c,h}:
dlm/doc/example.c:
Author: Daniel Phillips phillips at redhat.com
+fence/agents/apc_snmp/powernet369.mib:
+ Copyright (c) 2005 American Power Conversion, Inc.
+ PowerNet is a Trademark of American Power Conversion Corp.
+
fence/agents/ifmib/fence_ifmib.py:
Copyright (C) 2008 Ross Vandegrift.
Written by Ross Vandegrift ross at kallisti.us
@@ -45,9 +49,14 @@ fence/man/fence_ifmib.8:
Copyright (C) 2008 Ross Vandegrift.
Written by Ross Vandegrift ross at kallisti.us
+gfs/man/gfs_mount.8:
+ Portions copyright (C) 2001-2003 The OpenGFS Project
+ Portions copyright (C) 2004 ben.m.cahill at intel.com
+ Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
+
gfs2/man/gfs2_mount.8:
Portions copyright (C) 2001-2003 The OpenGFS2 Project
- Portions copyright (C) 2004 ben.m.cahill at intel.com
+ Portions copyright (C) 2004 ben.m.cahill at intel.com
Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
gfs-kernel/src/gfs/fixed_div64.h:
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.03-17-gd8569c4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d8569c4b2f8fef25ea5b344ece79f4cc12e04fb4
The branch, STABLE2 has been updated
via d8569c4b2f8fef25ea5b344ece79f4cc12e04fb4 (commit)
via 541d5fd690e5cce0eef140fd770ff893599f488a (commit)
via 09dc160a34fe3a37e7209a41a80a60d759d75354 (commit)
via 99e8ffb63960751e7170463defe80abdb730b47f (commit)
via 5a0286041f0c0939fca217b0872ed523ed63859b (commit)
via 8a11e709cee3a80f3da3755a92f7e80d6da45c1f (commit)
via 1f3fc33a88118c6327e898825817a558dacc07be (commit)
via 31d30b16d55c8919d8d0e90a3432095eba1ff2d4 (commit)
via 3612f4c9db1073539bf2c1bc86c641be7f7aa3c2 (commit)
from dd97ff24427d02a2aea0057345cf8067334dcb3b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit d8569c4b2f8fef25ea5b344ece79f4cc12e04fb4
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 9 07:03:58 2008 +0200
[GNBD/FENCE] Move fence_gnbd agent where it belongs
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 541d5fd690e5cce0eef140fd770ff893599f488a
Author: Ryan McCabe [EMAIL PROTECTED]
Date: Wed May 28 16:28:34 2008 -0400
fence: fixes and cleanups to fencing.py library
- Do not report failure if a node is successfully powered off,
but fails to power on.
- Change 'pass' to 'continue' so that comments and blank lines
from stdin are ignored.
- Use the full path to ssh and telnet when executing the binaries.
commit 09dc160a34fe3a37e7209a41a80a60d759d75354
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 22 16:43:27 2008 +0200
[CCS] Use absolute path for queries
* It is more efficient
* It is a well-defined location
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 99e8ffb63960751e7170463defe80abdb730b47f
Author: Lon Hohberger [EMAIL PROTECTED]
Date: Thu May 22 10:33:12 2008 -0400
[rgmanager] Use /cluster/rm instead of //rm
* It is more efficient
* It is a well-defined location
commit 5a0286041f0c0939fca217b0872ed523ed63859b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 22 09:55:31 2008 +0200
[BUILD] Plugin the new shiny fence_ifmib agent
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 8a11e709cee3a80f3da3755a92f7e80d6da45c1f
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 22 09:30:58 2008 +0200
[FENCE] Fix ifmib README to report the right fence agent
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 1f3fc33a88118c6327e898825817a558dacc07be
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 22 09:28:44 2008 +0200
[FENCE] Fix copyright header for fence_ifmib manpage
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 31d30b16d55c8919d8d0e90a3432095eba1ff2d4
Author: Ross Vandegrift [EMAIL PROTECTED]
Date: Thu May 22 09:25:32 2008 +0200
[FENCE] Add fence_ifmib new agent
Many thanks to Ross Vandegrift for this submission.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 3612f4c9db1073539bf2c1bc86c641be7f7aa3c2
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 10:38:10 2008 +0200
[GFS2] Use proper include dir for libvolume_id
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/ccs_tool/update.c |6 +-
ccs/daemon/misc.c |7 +-
.../fence_gnbd = fence/agents/gnbd}/Makefile |3 +-
.../tools/fence_gnbd = fence/agents/gnbd}/main.c |0
fence/agents/{apc = ifmib}/Makefile |2 +-
fence/agents/ifmib/README | 45
fence/agents/ifmib/fence_ifmib.py | 221
fence/agents/lib/fencing.py.py | 37 ++--
fence/man/Makefile |2 +
{gnbd = fence}/man/fence_gnbd.8 |0
fence/man/fence_ifmib.8| 69 ++
gfs2/mkfs/Makefile |1 +
gnbd/man/Makefile |3 +-
gnbd/tools/Makefile|2 +-
rgmanager/include/reslist.h|2 +-
15 files changed, 369 insertions(+), 31 deletions(-)
rename {gnbd/tools/fence_gnbd = fence/agents/gnbd}/Makefile (94%)
rename {gnbd/tools/fence_gnbd = fence/agents/gnbd}/main.c (100%)
copy fence/agents/{apc = ifmib}/Makefile (97%)
create mode
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.03-20-gd7bec65
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d7bec659849830e6bf80c822984888f4fa5e8a63
The branch, STABLE2 has been updated
via d7bec659849830e6bf80c822984888f4fa5e8a63 (commit)
from fb6848630440a0cb6931ec476c2d87329ba4dce5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit d7bec659849830e6bf80c822984888f4fa5e8a63
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 9 13:58:21 2008 +0200
[MISC] Whitespace cleanup
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
make/fencebuild.mk |6 +++---
make/install.mk| 14 +++---
make/man.mk| 10 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 27880be..2dcfeb9 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -1,7 +1,7 @@
ifndef FENCEAGENTSLIB
-ifdef TARGET
-SBINDIRT=$(TARGET)
-endif
+ ifdef TARGET
+ SBINDIRT=$(TARGET)
+ endif
endif
all: $(TARGET)
diff --git a/make/install.mk b/make/install.mk
index fb937ed..3331a1f 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -9,7 +9,7 @@ endif
ifdef INCDIRT
install -d ${incdir}
for i in ${INCDIRT}; do \
- install -m644 $(S)/$$i ${incdir}; \
+ install -m644 $(S)/$$i ${incdir}; \
done
endif
ifdef SBINDIRT
@@ -26,17 +26,17 @@ endif
ifdef INITDT
install -d ${initddir}
for i in ${INITDT}; do \
- if [ -f $(S)/$$i ]; then \
- install -m755 $(S)/$$i ${initddir}; \
- else \
- install -m755 $$i ${initddir}; \
- fi; \
+ if [ -f $(S)/$$i ]; then \
+ install -m755 $(S)/$$i ${initddir}; \
+ else \
+ install -m755 $$i ${initddir}; \
+ fi; \
done
endif
ifdef UDEVT
install -d ${DESTDIR}/etc/udev/rules.d
for i in ${UDEVT}; do \
- install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \
+ install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \
done
endif
ifdef KMODT
diff --git a/make/man.mk b/make/man.mk
index 5cfbadd..b43efc1 100644
--- a/make/man.mk
+++ b/make/man.mk
@@ -2,15 +2,15 @@ all:
install:
for i in ${TARGET}; do \
- p=`echo $$i | sed -e 's#.*\.##g'`; \
- install -d ${mandir}/man$$p; \
- install -m644 $(S)/$$i ${mandir}/man$$p; \
+ p=`echo $$i | sed -e 's#.*\.##g'`; \
+ install -d ${mandir}/man$$p; \
+ install -m644 $(S)/$$i ${mandir}/man$$p; \
done
uninstall:
for i in ${TARGET}; do \
- p=`echo $$i | sed -e 's#.*\.##g'`; \
- ${UNINSTALL} $$i ${mandir}/man$$p; \
+ p=`echo $$i | sed -e 's#.*\.##g'`; \
+ ${UNINSTALL} $$i ${mandir}/man$$p; \
done
clean:
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-7-g01a041f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=01a041fa83a8596788deb5ef1f4e142c191d74db
The branch, master has been updated
via 01a041fa83a8596788deb5ef1f4e142c191d74db (commit)
from 05b3793aa23b44f2c4c6e139f8fa3658eb6db311 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 01a041fa83a8596788deb5ef1f4e142c191d74db
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jun 10 06:07:46 2008 +0200
[GFS] Remove obsoleted gfs_edit in favour of gfs2_edit
Signed-off-by: Bob Peterson [EMAIL PROTECTED]
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
gfs/Makefile |6 +-
gfs/gfs_edit/Makefile | 29 --
gfs/gfs_edit/gfshex.c | 344
gfs/gfs_edit/gfshex.h | 10 -
gfs/gfs_edit/hexedit.c | 820
gfs/gfs_edit/hexedit.h | 180 ---
gfs/man/gfs_edit.8 | 129 +
gfs2/man/gfs2_edit.8 |2 +-
8 files changed, 7 insertions(+), 1513 deletions(-)
delete mode 100644 gfs/gfs_edit/Makefile
delete mode 100644 gfs/gfs_edit/gfshex.c
delete mode 100644 gfs/gfs_edit/gfshex.h
delete mode 100644 gfs/gfs_edit/hexedit.c
delete mode 100644 gfs/gfs_edit/hexedit.h
diff --git a/gfs/Makefile b/gfs/Makefile
index 0eaa171..510e181 100644
--- a/gfs/Makefile
+++ b/gfs/Makefile
@@ -1,6 +1,6 @@
include ../make/defines.mk
-SUBDIRS=libgfs gfs_debug gfs_edit gfs_fsck gfs_grow gfs_jadd gfs_mkfs
gfs_quota gfs_tool man init.d
+SUBDIRS=libgfs gfs_debug gfs_fsck gfs_grow gfs_jadd gfs_mkfs gfs_quota
gfs_tool man init.d
all: ${SUBDIRS}
@@ -13,7 +13,11 @@ all: ${SUBDIRS}
mkdir -p ${DESTDIR}/sbin; \
cd ${DESTDIR}/sbin; \
ln -sf mount.gfs2 mount.gfs; \
+ mkdir -p ${sbindir}; \
+ cd ${sbindir}; \
+ ln -sf gfs2_edit gfs_edit; \
fi; \
if [ $@ = uninstall ]; then \
cd ${DESTDIR}/sbin; rm -f mount.gfs; \
+ cd ${sbindir}; rm -f gfs_edit; \
fi
diff --git a/gfs/gfs_edit/Makefile b/gfs/gfs_edit/Makefile
deleted file mode 100644
index 64308c7..000
--- a/gfs/gfs_edit/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-TARGET= gfs_edit
-
-SBINDIRT=$(TARGET)
-
-all: ${TARGET}
-
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-include $(OBJDIR)/make/clean.mk
-include $(OBJDIR)/make/install.mk
-include $(OBJDIR)/make/uninstall.mk
-
-OBJS= gfshex.o \
- hexedit.o
-
-CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${gfskincdir} -I${ncursesincdir}
-CFLAGS += -I$(S)/../include
-CFLAGS += -I${incdir}
-
-LDFLAGS += -L${ncurseslibdir} -lncurses
-
-
-${TARGET}: ${OBJS}
- $(CC) -o $@ $^ $(LDFLAGS)
-
-clean: generalclean
-
--include $(OBJS:.o=.d)
diff --git a/gfs/gfs_edit/gfshex.c b/gfs/gfs_edit/gfshex.c
deleted file mode 100644
index 5af084c..000
--- a/gfs/gfs_edit/gfshex.c
+++ /dev/null
@@ -1,344 +0,0 @@
-#include stdio.h
-#include stdlib.h
-#include string.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
-#include unistd.h
-#include errno.h
-#include curses.h
-
-#include global.h
-#include hexedit.h
-#include linux_endian.h
-
-#define WANT_GFS_CONVERSION_FUNCTIONS
-#include gfs_ondisk.h
-#include gfshex.h
-
-extern int line;
-extern struct gfs_sb sb;
-extern char *buf;
-extern struct gfs_dinode di;
-extern uint64 bufsize;
-
-/**
-***
-**
-** do_dinode_extended()
-**
-** Description:
-**
-** Input(s):
-**
-** Output(s):
-**
-** Returns:
-**
-***
-**/
-
-void do_dinode_extended(struct gfs_dinode *di, char *buf)
-{
- unsigned int x, y, count;
- struct gfs_dirent de;
- uint64 p, last;
-
- indirect_blocks = 0;
- memset(indirect_block, 0, sizeof(indirect_block));
- if (di-di_height 0) {
- /* Indirect pointers */
- for (x = sizeof(struct gfs_dinode), y = 0;
-x bufsize;
-x += sizeof(uint64), y++) {
- p = gfs64_to_cpu(*(uint64 *)(buf + x));
- if (p)
- indirect_block[indirect_blocks++] = p;
- }
- }
- else if (di-di_type == GFS_FILE_DIR
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-8-gff2009d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=ff2009d322fb64c002a3b29a4de3ab397ca1d5ee The branch, master has been updated via ff2009d322fb64c002a3b29a4de3ab397ca1d5ee (commit) from 01a041fa83a8596788deb5ef1f4e142c191d74db (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit ff2009d322fb64c002a3b29a4de3ab397ca1d5ee Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Tue Jun 10 06:21:07 2008 +0200 [MISC] Remove osl-2.1 exception from README.licence Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: README.licence |7 --- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/README.licence b/README.licence index 3c1c114..075aa77 100644 --- a/README.licence +++ b/README.licence @@ -31,10 +31,3 @@ and COPYING.libraries. If missing, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - -Exception: - -rgmanager/src/resources/oracledb.sh: - Licence: Open Software License version 2.1 available here: - http://opensource.org/licenses/osl-2.1.php - hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-9-g0f9cece
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0f9cece0494dbdc86d7ccba77c58de860ae437ce
The branch, master has been updated
via 0f9cece0494dbdc86d7ccba77c58de860ae437ce (commit)
from ff2009d322fb64c002a3b29a4de3ab397ca1d5ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0f9cece0494dbdc86d7ccba77c58de860ae437ce
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jun 10 06:37:08 2008 +0200
[MISC] Add original author for cman/qdisk/disk.c
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
COPYRIGHT |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/COPYRIGHT b/COPYRIGHT
index f13dcbc..0178b5e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -18,6 +18,7 @@ cman/qdisk/daemon_init.c:
cman/qdisk/disk.c:
Copyright (C) 2000 Mission Critical Linux
Copyright (C) 2002-2008 Red Hat, Inc. All rights reserved.
+ Author: Tim Burke tburke at redhat.com
cman/qdisk/scandisk.{c,h}:
Original design by: Joel Becker Joel.Becker at oracle.com and
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-17-g1d3b140
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1d3b1407b0584ef097713b7619768a9389bc7873
The branch, master has been updated
via 1d3b1407b0584ef097713b7619768a9389bc7873 (commit)
from b5fb9a7b7245174d1d33b1c2f70e864331c4a97e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 1d3b1407b0584ef097713b7619768a9389bc7873
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Sun Jun 8 07:20:42 2008 +0200
[BUILD] Prepare infrastructure for perl/python bindings
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
Makefile|4 +++-
{config = bindings}/Makefile |2 +-
{dlm/tests = bindings/perl}/Makefile |2 +-
{dlm/tests = bindings/python}/Makefile |2 +-
configure |7 +++
make/defines.mk.input |1 +
6 files changed, 14 insertions(+), 4 deletions(-)
copy {config = bindings}/Makefile (76%)
copy {dlm/tests = bindings/perl}/Makefile (80%)
copy {dlm/tests = bindings/python}/Makefile (80%)
diff --git a/Makefile b/Makefile
index d3fb764..a13937f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
include make/defines.mk
REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \
- config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd
rgmanager
+ config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd
rgmanager bindings
SUBDIRS = $(filter-out \
$(if ${without_gnbd-kernel/src},gnbd-kernel/src) \
@@ -16,6 +16,7 @@ SUBDIRS = $(filter-out \
$(if ${without_gfs2},gfs2) \
$(if ${without_gnbd},gnbd) \
$(if ${without_rgmanager},rgmanager) \
+ $(if ${without_bindings},bindings) \
, $(REALSUBDIRS))
all: scripts ${SUBDIRS}
@@ -45,6 +46,7 @@ gfs:
gfs2: group
gnbd: cman
rgmanager: cman dlm
+bindings: cman
install: all
set -e for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
diff --git a/config/Makefile b/bindings/Makefile
similarity index 76%
copy from config/Makefile
copy to bindings/Makefile
index b244f90..21085c2 100644
--- a/config/Makefile
+++ b/bindings/Makefile
@@ -1,4 +1,4 @@
include ../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=libs tools
+SUBDIRS=perl python
diff --git a/dlm/tests/Makefile b/bindings/perl/Makefile
similarity index 80%
copy from dlm/tests/Makefile
copy to bindings/perl/Makefile
index 28685d2..810b2d4 100644
--- a/dlm/tests/Makefile
+++ b/bindings/perl/Makefile
@@ -1,4 +1,4 @@
include ../../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=usertest
+SUBDIRS=
diff --git a/dlm/tests/Makefile b/bindings/python/Makefile
similarity index 80%
copy from dlm/tests/Makefile
copy to bindings/python/Makefile
index 28685d2..810b2d4 100644
--- a/dlm/tests/Makefile
+++ b/bindings/python/Makefile
@@ -1,4 +1,4 @@
include ../../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=usertest
+SUBDIRS=
diff --git a/configure b/configure
index 274945a..0b8b1dd 100755
--- a/configure
+++ b/configure
@@ -89,6 +89,7 @@ my %options = (
without_gfs2 = \$without_gfs2,
without_gnbd = \$without_gnbd,
without_rgmanager = \$without_rgmanager,
+ without_bindings = \$without_bindings,
without_kernel_modules = \$without_kernel_modules,
disable_kernel_check = \$disable_kernel_check,
);
@@ -166,6 +167,7 @@ my $err = GetOptions (\%options,
'without_gfs2',
'without_gnbd',
'without_rgmanager',
+ 'without_bindings',
'without_kernel_modules',
'disable_kernel_check');
@@ -249,6 +251,7 @@ if ($help || !$err) {
print --without_gfs2\tDisable gfs2 building (Default: enabled)\n;
print --without_gnbd\tDisable gnbd building (Default: enabled)\n;
print --without_rgmanager\tDisable rgmanager building (Default:
enabled)\n;
+ print --without_bindings\tDisable perl/python bindings building (Default:
enabled)\n;
print --without_kernel_modules\tDisable kernel modules building (Default:
enabled)\n;
print --disable_kernel_check\tDisable kernel version check (Default:
enabled)\n;
exit $ret;
@@ -569,6 +572,9 @@ if (!$without_gnbd) {
if (!$without_rgmanager) {
$without_rgmanager=;
}
+if (!$without_bindings) {
+ $without_bindings=;
+}
if (!$without_kernel_modules) {
$without_gfskernel=$without_gfs;
$without_gnbdkernel=$without_gnbd;
@@ -684,6 +690,7 @@ while (IFILE) {
$_ =~
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-11-ga1a9382
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a1a9382b9fb73087ae57ff7d16ad053495141f6f
The branch, master has been updated
via a1a9382b9fb73087ae57ff7d16ad053495141f6f (commit)
from 1e1bf34e411185164b3d93d5ef94fa0d944b971c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit a1a9382b9fb73087ae57ff7d16ad053495141f6f
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri Jun 6 08:30:42 2008 +0200
[BUILD] Switch libdlmcontrol back to shared library
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure | 14 ++
dlm/libdlmcontrol/Makefile | 19 ++-
dlm/tool/Makefile |7 +++
group/dlm_controld/Makefile |4 ++--
make/defines.mk.input |2 ++
5 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 871639a..d00f197 100755
--- a/configure
+++ b/configure
@@ -52,6 +52,8 @@ my %options = (
cmanlibdir = \$cmanlibdir,
dlmincdir = \$dlmincdir,
dlmlibdir = \$dlmlibdir,
+ dlmcontrolincdir = \$dlmcontrolincdir,
+ dlmcontrollibdir = \$dlmcontrollibdir,
fenceincdir = \$fenceincdir,
fencelibdir = \$fencelibdir,
volidincdir = \$volidincdir,
@@ -127,6 +129,8 @@ my $err = GetOptions (\%options,
'cmanlibdir=s',
'dlmincdir=s',
'dlmlibdir=s',
+ 'dlmcontrolincdir=s',
+ 'dlmcontrollibdir=s',
'fenceincdir=s',
'fencelibdir=s',
'volidincdir=s',
@@ -222,6 +226,8 @@ if ($help || !$err) {
print --cmanlibdir=\tthe base directory for cman libraries. (Default:
./cman/lib)\n;
print --dlmincdir=\tthe base directory for dlm include files. (Default:
./dlm/libdlm)\n;
print --dlmlibdir=\tthe base directory for dlm libraries. (Default:
./dlm/libdlm)\n;
+ print --dlmcontrolincdir=\tthe base directory for dlmcontrol include files.
(Default: ./dlm/libdlmcontrol)\n;
+ print --dlmcontrollibdir=\tthe base directory for dlmcontrol libraries.
(Default: ./dlm/libdlmcontrol)\n;
print --fenceincdir=\tthe base directory for fence include files.
(Default: ./fence/libfence)\n;
print --fencelibdir=\tthe base directory for fence libraries. (Default:
./fence/libfence)\n;
print --volidincdir=\tthe base directory for volume_id include files.
(Default: {incdir})\n;
@@ -427,6 +433,12 @@ if (!$dlmincdir) {
if (!$dlmlibdir) {
$dlmlibdir=${objdir}/dlm/libdlm;
}
+if (!$dlmcontrolincdir) {
+ $dlmcontrolincdir=${cdir}/dlm/libdlmcontrol;
+}
+if (!$dlmcontrollibdir) {
+ $dlmcontrollibdir=${objdir}/dlm/libdlmcontrol;
+}
if (!$fenceincdir) {
$fenceincdir=${cdir}/fence/libfence;
}
@@ -637,6 +649,8 @@ while (IFILE) {
$_ =~ s/[EMAIL PROTECTED]@/$cmanlibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$dlmincdir/;
$_ =~ s/[EMAIL PROTECTED]@/$dlmlibdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$dlmcontrolincdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$dlmcontrollibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fenceincdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fencelibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$volidincdir/;
diff --git a/dlm/libdlmcontrol/Makefile b/dlm/libdlmcontrol/Makefile
index d7c96b7..30447f3 100644
--- a/dlm/libdlmcontrol/Makefile
+++ b/dlm/libdlmcontrol/Makefile
@@ -12,9 +12,21 @@
TARGET= libdlmcontrol
-all: $(TARGET).a
+LIBDIRT=$(TARGET).a \
+ $(TARGET).so.$(SOMAJOR).$(SOMINOR)
+
+LIBSYMT=$(TARGET).so \
+ $(TARGET).so.$(SOMAJOR)
+
+INCDIRT=$(TARGET).h
include ../../make/defines.mk
+
+SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
+STATICLIB=$(TARGET).a
+
+all: $(STATICLIB) $(SHAREDLIB)
+
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
@@ -31,6 +43,11 @@ $(TARGET).a: $(OBJS)
${AR} r $@ $^
${RANLIB} $@
+$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(OBJS)
+ $(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $ $(LDFLAGS)
+ ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so
+ ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so.$(SOMAJOR)
+
clean: generalclean
-include $(OBJS:.o=.d)
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 491565d..6612672 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -24,14 +24,13 @@ include $(OBJDIR)/make/uninstall.mk
OBJS= main.o
-CFLAGS += -I${dlmincdir}
-CFLAGS += -I$(S)/../libdlmcontrol
+CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
CFLAGS +=
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-13-g9d0f2f8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9d0f2f8f3d3039d0e553156a15c3c057e90acec1 The branch, master has been updated via 9d0f2f8f3d3039d0e553156a15c3c057e90acec1 (commit) from 59342a0899496061507e0ab4c30f02e1b5746e0f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 9d0f2f8f3d3039d0e553156a15c3c057e90acec1 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Fri Jun 6 11:39:20 2008 +0200 [MISC] Remove obsolete and empty files Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: rgmanager/INSTALL |7 --- rgmanager/NEWS|2 -- 2 files changed, 0 insertions(+), 9 deletions(-) delete mode 100644 rgmanager/INSTALL delete mode 100644 rgmanager/NEWS delete mode 100644 rgmanager/TODO diff --git a/rgmanager/INSTALL b/rgmanager/INSTALL deleted file mode 100644 index 747e893..000 --- a/rgmanager/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -Note: This only works on Linux; it's a silly thing to try to get it to run -elsewhere, but good luck. Accepting patches ;) - -./autogen.sh -./configure -make all install - diff --git a/rgmanager/NEWS b/rgmanager/NEWS deleted file mode 100644 index d5b1382..000 --- a/rgmanager/NEWS +++ /dev/null @@ -1,2 +0,0 @@ -2006-Jun-02 Unfinished port to cman / totem committed to CVS head -2004-Aug-12 NEWS file created! diff --git a/rgmanager/TODO b/rgmanager/TODO deleted file mode 100644 index e69de29..000 hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-6-g61ac977
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=61ac9778debcac15145f4b061af450b809089908 The branch, master has been updated via 61ac9778debcac15145f4b061af450b809089908 (commit) from d159687d6c8be0d91f391a9cfc921cd99fa826fc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 61ac9778debcac15145f4b061af450b809089908 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Wed Jun 4 20:55:55 2008 +0200 [CMAN] Bump library version In preparation for 3.0 and to allow landing of perl/python bindings we need to set this to 3 to differentiate from stable2. Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: cman/lib/libcman.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/lib/libcman.h b/cman/lib/libcman.h index 4afe126..08e5087 100644 --- a/cman/lib/libcman.h +++ b/cman/lib/libcman.h @@ -25,7 +25,7 @@ #include netinet/in.h -#define LIBCMAN_VERSION 2 +#define LIBCMAN_VERSION 3 /* * Some maxima hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-4-g34925e9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=34925e9ae54cddda311a682c9131d2d6b84dca7c
The branch, master has been updated
via 34925e9ae54cddda311a682c9131d2d6b84dca7c (commit)
from e879971090c6821bb966f17875874d11aa740a5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 34925e9ae54cddda311a682c9131d2d6b84dca7c
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue Jun 3 10:45:45 2008 +0200
[CONFIG] Add full xpath support to libccs
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
config/libs/libccsconfdb/Makefile |3 +-
config/libs/libccsconfdb/ccs.h|2 +
config/libs/libccsconfdb/libccs.c | 287 ++---
3 files changed, 271 insertions(+), 21 deletions(-)
diff --git a/config/libs/libccsconfdb/Makefile
b/config/libs/libccsconfdb/Makefile
index c9b6d94..92c3b78 100644
--- a/config/libs/libccsconfdb/Makefile
+++ b/config/libs/libccsconfdb/Makefile
@@ -37,10 +37,11 @@ OBJS= $(TARGET).o
CFLAGS += -fPIC
CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${openaisincdir}
+CFLAGS += -I${openaisincdir} `xml2-config --cflags`
CFLAGS += -I${incdir}
LDFLAGS += -L${openaislibdir} -lconfdb
+LDFLAGS += `xml2-config --libs`
$(TARGET).a: $(OBJS)
${AR} r $@ $^
diff --git a/config/libs/libccsconfdb/ccs.h b/config/libs/libccsconfdb/ccs.h
index 91e63cd..eca9c4d 100644
--- a/config/libs/libccsconfdb/ccs.h
+++ b/config/libs/libccsconfdb/ccs.h
@@ -24,4 +24,6 @@ int ccs_get_list(int desc, const char *query, char **rtn);
int ccs_set(int desc, const char *path, char *val);
int ccs_lookup_nodename(int desc, const char *nodename, char **rtn);
+extern int fullxpath;
+
#endif /* __CCS_DOT_H__ */
diff --git a/config/libs/libccsconfdb/libccs.c
b/config/libs/libccsconfdb/libccs.c
index ab82b9d..3d75710 100644
--- a/config/libs/libccsconfdb/libccs.c
+++ b/config/libs/libccsconfdb/libccs.c
@@ -24,10 +24,12 @@
#include limits.h
#include openais/saAis.h
#include openais/confdb.h
+#include libxml/parser.h
+#include libxml/xpath.h
#include ccs.h
-/* Callbacks are not supported */
+/* Callbacks are not supported - we will use them to update fullxml doc/ctx */
static confdb_callbacks_t callbacks = {
.confdb_change_notify_fn = NULL,
};
@@ -39,40 +41,171 @@ static char previous_query[PATH_MAX];
static unsigned int query_handle;
static unsigned int list_handle;
+int fullxpath = 0;
+static int fullxpathint;
+
+static char *buffer = NULL;
+static xmlDocPtr doc = NULL;
+static xmlXPathContextPtr ctx = NULL;
+static int xmllistindex = 0;
+
+static void xpathlite_init() {
+ memset(current_query, 0, PATH_MAX);
+ memset(previous_query, 0, PATH_MAX);
+ query_handle = OBJECT_PARENT_HANDLE;
+ list_handle = OBJECT_PARENT_HANDLE;
+}
+
+static void add_to_buffer(char *data, char **buffer, int *size)
+{
+ int len;
+
+ if((len = strlen(data))) {
+ *size = *size + len;
+ if (*buffer)
+ strncpy(*buffer + strlen(*buffer), data, len);
+ }
+ return;
+}
+
+static int dump_objdb_buff(confdb_handle_t dump_handle, unsigned int
parent_object_handle, char **buffer, int *size)
+{
+ unsigned int object_handle;
+ char temp[PATH_MAX];
+ char object_name[PATH_MAX];
+ int object_name_len;
+ char key_name[PATH_MAX];
+ int key_name_len;
+ char key_value[PATH_MAX];
+ int key_value_len;
+ int res;
+
+ res = confdb_key_iter_start(dump_handle, parent_object_handle);
+ if (res != SA_AIS_OK)
+ return -1;
+
+ if (!*buffer || ((*buffer) !strlen(*buffer))) {
+ snprintf(temp, PATH_MAX - 1, ?xml
version=\1.0\?\nobjdbmaindoc\n);
+ add_to_buffer(temp, buffer, size);
+ }
+
+ while ( (res = confdb_key_iter(dump_handle, parent_object_handle,
key_name, key_name_len,
+ key_value, key_value_len)) ==
SA_AIS_OK) {
+ key_name[key_name_len] = '\0';
+ key_value[key_value_len] = '\0';
+ snprintf(temp, PATH_MAX - 1, %s=\%s\, key_name, key_value);
+ add_to_buffer(temp, buffer, size);
+ }
+
+ if (parent_object_handle 0) {
+ snprintf(temp, PATH_MAX - 1, \n);
+ add_to_buffer(temp, buffer, size);
+ }
+
+ res = confdb_object_iter_start(dump_handle, parent_object_handle);
+ if (res != SA_AIS_OK)
+ return -1;
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.03-3-g1bbfe73
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1bbfe738c11b227e4361374f63d2fd66507f918b The branch, STABLE2 has been updated via 1bbfe738c11b227e4361374f63d2fd66507f918b (commit) from 4b5101843b2bb278a4d58e228f898402b620066a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 1bbfe738c11b227e4361374f63d2fd66507f918b Author: Mark Hlawatschek [EMAIL PROTECTED] Date: Mon Jun 2 10:56:25 2008 -0500 mount.gfs2: skip mtab updates Skip updates to /etc/mtab when it's a link to /proc/mounts (which is the case for shared root gfs, for example.) bz 318271 (RHEL5) Signed-off-by: David Teigland [EMAIL PROTECTED] --- Summary of changes: gfs2/mount/mtab.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/gfs2/mount/mtab.c b/gfs2/mount/mtab.c index 21b0c8c..dda5935 100644 --- a/gfs2/mount/mtab.c +++ b/gfs2/mount/mtab.c @@ -95,6 +95,9 @@ void add_mtab_entry(struct mount_options *mo) read_proc_mounts(mo); + if (ignore_mtab()) + return; + lock_mtab(); file = fopen(/etc/mtab, a); @@ -125,6 +128,9 @@ void del_mtab_entry(struct mount_options *mo) struct stat sbuf; int found = 0; + if (ignore_mtab()) + return; + lock_mtab(); old_umask = umask(077); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.03-1-gd4a28c3
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d4a28c3135cf4a06dad23c10f4228be0880bcb4a
The branch, STABLE2 has been updated
via d4a28c3135cf4a06dad23c10f4228be0880bcb4a (commit)
from 8a7314ea3f3d30cbf10b127fc5516a078d000adc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit d4a28c3135cf4a06dad23c10f4228be0880bcb4a
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon Jun 2 06:45:01 2008 +0200
[CMAN] Fix cman_tool node name override
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/daemon/cmanccs.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cman/daemon/cmanccs.c b/cman/daemon/cmanccs.c
index 2bfc299..78a237b 100644
--- a/cman/daemon/cmanccs.c
+++ b/cman/daemon/cmanccs.c
@@ -564,9 +564,9 @@ static int get_ccs_join_info(void)
/* our nodename */
if (nodename_env) {
int ret;
- ret = snprintf(path, sizeof(path), NODE_NAME_PATH_BYNAME,
nodename);
+ ret = snprintf(path, sizeof(path), NODE_NAME_PATH_BYNAME,
nodename_env);
if (ret 0 || (size_t) ret = sizeof(path)) {
- log_printf(LOG_ERR, Overridden node name %s is too
long, nodename);
+ log_printf(LOG_ERR, Overridden node name %s is too
long, nodename_env);
write_cman_pipe(Overridden node name is too long);
error = -E2BIG;
goto out;
@@ -576,11 +576,12 @@ static int get_ccs_join_info(void)
if (!error) {
free(str);
} else {
- log_printf(LOG_ERR, Overridden node name %s is not in
CCS, nodename);
+ log_printf(LOG_ERR, Overridden node name %s is not in
CCS, nodename_env);
write_cman_pipe(Overridden node name is not in CCS);
error = -ENOENT;
goto out;
}
+ strcpy(nodename, nodename_env);
} else {
struct utsname utsname;
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-35-g50f7819
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=50f7819a6013081bf5ffe01222004b3b693cef17
The branch, master has been updated
via 50f7819a6013081bf5ffe01222004b3b693cef17 (commit)
via 9bbdef6722d9e869012d8d52c2f819dd987650c2 (commit)
from 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 50f7819a6013081bf5ffe01222004b3b693cef17
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 29 09:39:28 2008 +0200
[BUILD] Fix mount.gfs2 build
Remove unrequired SHAREDOBJS since there is only one target.
Fix CFLAGS to use gfscontrolincdir.
Statically link mount.gfs2 with libgfscontrol. While this is absolutely
ugly, it is the best way to prevent a few tons of other problems.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 9bbdef6722d9e869012d8d52c2f819dd987650c2
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 29 09:39:06 2008 +0200
[BUILD] gfs2 requires group to build
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
Makefile|2 +-
gfs2/mount/Makefile | 18 +++---
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index c524a9b..4d2ad5a 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ fence/libfenced:
group: cman dlm fence/libfenced
fence: group
gfs:
-gfs2:
+gfs2: group
gnbd: cman
rgmanager: cman dlm
diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile
index 191431f..0c1b73b 100644
--- a/gfs2/mount/Makefile
+++ b/gfs2/mount/Makefile
@@ -18,22 +18,19 @@ include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
-OBJS1= mount.gfs2.o
-
-SHAREDOBJS= ondisk1.o \
- util.o \
- mtab.o
+OBJS1= mount.gfs2.o \
+ ondisk1.o \
+ util.o \
+ mtab.o
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS += -I${gfskincdir}
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
-CFLAGS += -I$(S)/../include -I../../group/libgfscontrol/
+CFLAGS += -I${gfscontrolincdir}
+CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}
-LDFLAGS += -L../../group/libgfscontrol/ -lgfscontrol
-
-
-${TARGET1}: ${SHAREDOBJS} ${OBJS1}
+${TARGET1}: ${OBJS1} ${gfscontrollibdir}/libgfscontrol.a
$(CC) -o $@ $^ $(LDFLAGS)
install: all
@@ -46,4 +43,3 @@ uninstall:
clean: generalclean
-include $(OBJS1:.o=.d)
--include $(SHAREDOBJS:.o=.d)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-30-g8a7314e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8a7314ea3f3d30cbf10b127fc5516a078d000adc
The branch, STABLE2 has been updated
via 8a7314ea3f3d30cbf10b127fc5516a078d000adc (commit)
via cbc0bf25dc72a03b206aa99ca76bad2061d63e52 (commit)
via 5e63f75175f340453ecd498b3a4a5c366e4e4ab2 (commit)
from 776cef92f7ca1542d63771923f4ccaeedabd613e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 8a7314ea3f3d30cbf10b127fc5516a078d000adc
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 09:12:31 2008 +0200
[BUILD] Fix install permissions
Virtually every distro was complaining about scripts
permissions. Clearly we were doing it wrong. Fix them all.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit cbc0bf25dc72a03b206aa99ca76bad2061d63e52
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 09:11:58 2008 +0200
[BUILD] Fix rg_test linking
rg_test does not need libccs
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 5e63f75175f340453ecd498b3a4a5c366e4e4ab2
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 20 11:00:02 2008 +0200
[BUILD] Fix sparc #ifdef according to the new gcc tables
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/qdisk/disk_util.c |2 +-
rgmanager/include/platform.h |2 +-
rgmanager/src/clulib/vft.c |2 +-
rgmanager/src/daemons/Makefile |2 +-
rgmanager/src/resources/Makefile | 17 ++---
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c
index f5539c0..afa3640 100644
--- a/cman/qdisk/disk_util.c
+++ b/cman/qdisk/disk_util.c
@@ -71,7 +71,7 @@ getuptime(struct timeval *tv)
if (!fp)
return -1;
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
rv = fscanf(fp,%ld.%d %ld.%d\n, tv-tv_sec, tv-tv_usec,
junk.tv_sec, junk.tv_usec);
#else
diff --git a/rgmanager/include/platform.h b/rgmanager/include/platform.h
index 7a49cc2..8f0ac48 100644
--- a/rgmanager/include/platform.h
+++ b/rgmanager/include/platform.h
@@ -67,7 +67,7 @@ Configure is gone...
#define swab64(x) x=be_swap64(x)
-#ifdef __sparc64__
+#if defined(__sparc__)
#define ALIGNED __attribute__((aligned))
#define PACKED __attribute__((aligned,packed))
#else
diff --git a/rgmanager/src/clulib/vft.c b/rgmanager/src/clulib/vft.c
index 154bc98..6978cca 100644
--- a/rgmanager/src/clulib/vft.c
+++ b/rgmanager/src/clulib/vft.c
@@ -734,7 +734,7 @@ getuptime(struct timeval *tv)
if (!fp)
return -1;
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc__)
rv = fscanf(fp,%ld.%d %ld.%d\n, tv-tv_sec, tv-tv_usec,
junk.tv_sec, junk.tv_usec);
#else
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 62904f9..08959f3 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -105,7 +105,7 @@ ${TARGET2}: ${OBJS2}
# packages should run 'make check' as part of the build process.
#
${TARGET3}: ${SHAREDOBJS} ${OBJS3}
- $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
+ $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) \
$(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
${TARGET4}: ${SHAREDOBJS} ${OBJS4}
diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile
index 5e5897b..5d0268d 100644
--- a/rgmanager/src/resources/Makefile
+++ b/rgmanager/src/resources/Makefile
@@ -26,9 +26,9 @@ RESOURCES=fs.sh service.sh ip.sh nfsclient.sh nfsexport.sh \
METADATA=apache.metadata openldap.metadata samba.metadata \
mysql.metadata postgres-8.metadata tomcat-5.metadata \
- named.metadata lvm.metadata
+ named.metadata lvm.metadata default_event_script.sl
-GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock default_event_script.sl
+GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock
UTIL_TARGETS= \
utils/ra-skelet.sh utils/messages.sh \
@@ -45,15 +45,18 @@ $(TARGET):
install: all
install -d ${sharedir}/utils
for i in $(RESOURCES); do \
-install $(S)/$$i ${sharedir}; \
+install -m755 $(S)/$$i ${sharedir}; \
done
- for i in $(GENERAL_TARGETS) $(METADATA); do \
-install -m 644 $(S)/$$i ${sharedir}; \
+ for i in $(METADATA); do \
+install -m644 $(S)/$$i ${sharedir}; \
+ done
+ for i in
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-33-g3a37c3f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3a37c3f5d88469d9f6de80d84a6f8664cc1a285c
The branch, master has been updated
via 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c (commit)
via d679b5fb411175c5c9346b1993de2956358254a8 (commit)
via e84a493caf0e64da936eeaa7fc3da0aa55024828 (commit)
from d33f4f1df3e8f84603418d0192c1af18794d3136 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 29 07:57:31 2008 +0200
[BUILD] Change build system to cope with new libgfscontrol
NOTE: you will need to rerun configure to set the new variables
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit d679b5fb411175c5c9346b1993de2956358254a8
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 29 07:57:03 2008 +0200
[GROUP] libgfscontrol: fix build with gcc-4.3
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit e84a493caf0e64da936eeaa7fc3da0aa55024828
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Thu May 29 07:56:04 2008 +0200
[GFS] remove symlink to umount.gfs2
umount.gfs2 is gone with commit d33f4f1df3e8f84603418d0192c1af18794d3136
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure | 14 ++
gfs/Makefile|5 ++---
group/Makefile |4 ++--
group/gfs_control/Makefile |7 ++-
group/gfs_controld/Makefile |5 +++--
group/libgfscontrol/main.c |1 +
make/defines.mk.input |2 ++
7 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index bc0203e..c2b648d 100755
--- a/configure
+++ b/configure
@@ -54,6 +54,8 @@ my %options = (
dlmlibdir = \$dlmlibdir,
dlmcontrolincdir = \$dlmcontrolincdir,
dlmcontrollibdir = \$dlmcontrollibdir,
+ gfscontrolincdir = \$gfscontrolincdir,
+ gfscontrollibdir = \$gfscontrollibdir,
fenceincdir = \$fenceincdir,
fencelibdir = \$fencelibdir,
fencedincdir = \$fenceincdir,
@@ -133,6 +135,8 @@ my $err = GetOptions (\%options,
'dlmlibdir=s',
'dlmcontrolincdir=s',
'dlmcontrollibdir=s',
+ 'gfscontrolincdir=s',
+ 'gfscontrollibdir=s',
'fenceincdir=s',
'fencelibdir=s',
'fencedincdir=s',
@@ -232,6 +236,8 @@ if ($help || !$err) {
print --dlmlibdir=\tthe base directory for dlm libraries. (Default:
./dlm/libdlm)\n;
print --dlmcontrolincdir=\tthe base directory for dlmcontrol include files.
(Default: ./dlm/libdlmcontrol)\n;
print --dlmcontrollibdir=\tthe base directory for dlmcontrol libraries.
(Default: ./dlm/libdlmcontrol)\n;
+ print --gfscontrolincdir=\tthe base directory for gfscontrol include files.
(Default: ./group/libgfscontrol)\n;
+ print --gfscontrollibdir=\tthe base directory for gfscontrol libraries.
(Default: ./group/libgfscontrol)\n;
print --fenceincdir=\tthe base directory for fence include files.
(Default: ./fence/libfence)\n;
print --fencelibdir=\tthe base directory for fence libraries. (Default:
./fence/libfence)\n;
print --fencedincdir=\tthe base directory for fenced include files.
(Default: ./fence/libfenced)\n;
@@ -445,6 +451,12 @@ if (!$dlmcontrolincdir) {
if (!$dlmcontrollibdir) {
$dlmcontrollibdir=${objdir}/dlm/libdlmcontrol;
}
+if (!$gfscontrolincdir) {
+ $gfscontrolincdir=${cdir}/group/libgfscontrol;
+}
+if (!$gfscontrollibdir) {
+ $gfscontrollibdir=${objdir}/group/libgfscontrol;
+}
if (!$fenceincdir) {
$fenceincdir=${cdir}/fence/libfence;
}
@@ -663,6 +675,8 @@ while (IFILE) {
$_ =~ s/[EMAIL PROTECTED]@/$dlmlibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$dlmcontrolincdir/;
$_ =~ s/[EMAIL PROTECTED]@/$dlmcontrollibdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$gfscontrolincdir/;
+ $_ =~ s/[EMAIL PROTECTED]@/$gfscontrollibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fenceincdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fencelibdir/;
$_ =~ s/[EMAIL PROTECTED]@/$fencedincdir/;
diff --git a/gfs/Makefile b/gfs/Makefile
index 54ad93a..be44504 100644
--- a/gfs/Makefile
+++ b/gfs/Makefile
@@ -2,7 +2,7 @@
###
##
## Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+## Copyright (C) 2004-2008
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-22-gf996ecc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=f996e2a91cd4b0e6b11167ffc3a28fe1499c
The branch, master has been updated
via f996e2a91cd4b0e6b11167ffc3a28fe1499c (commit)
from d694f90bbccd99d8403ee0b796834684bbd04508 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit f996e2a91cd4b0e6b11167ffc3a28fe1499c
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 23 09:43:55 2008 +0200
[CONFIG] Fix lots of bugs in libccsconfdb
Add tokenizer to split xpath queries into tokens.
Make some functions static since they are not exported.
Simplify path_dive and get_data to use tokens.
Cleanup comments.
Implement a lot more error checking and be extremely picky
on how queries are requested.
Fix some string handling to avoid data corruption in result generators.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
config/libs/libccsconfdb/libccs.c | 166 +
1 files changed, 111 insertions(+), 55 deletions(-)
diff --git a/config/libs/libccsconfdb/libccs.c
b/config/libs/libccsconfdb/libccs.c
index 5b758c5..ab82b9d 100644
--- a/config/libs/libccsconfdb/libccs.c
+++ b/config/libs/libccsconfdb/libccs.c
@@ -27,14 +27,13 @@
#include ccs.h
-/* Callbacks are not supported yet */
+/* Callbacks are not supported */
static confdb_callbacks_t callbacks = {
.confdb_change_notify_fn = NULL,
};
static confdb_handle_t handle = 0;
-static char current_pos[PATH_MAX];
static char current_query[PATH_MAX];
static char previous_query[PATH_MAX];
static unsigned int query_handle;
@@ -51,7 +50,6 @@ static unsigned int list_handle;
int ccs_connect(void){
int res;
- memset(current_pos, 0, PATH_MAX);
memset(current_query, 0, PATH_MAX);
memset(previous_query, 0, PATH_MAX);
query_handle = OBJECT_PARENT_HANDLE;
@@ -113,45 +111,60 @@ int ccs_disconnect(int desc){
return 0;
}
+static int tokenizer() {
+ int index = 0;
+ char *curpos = current_query;
+ char *next = NULL;
+ char *end;
+
+ end = current_query + strlen(current_query);
+
+ while (curpos = end) {
+ index++;
+
+ if (strncmp(curpos, /, 1))
+ return -1;
+
+ memset(curpos, 0, 1);
+ curpos = curpos + 1;
+
+ next = strstr(curpos, /);
+ if (next == curpos)
+ return -1;
+
+ if(!next)
+ return index;
+
+ if ((strstr(curpos, [) next) || !strstr(curpos, [))
+ curpos = next;
+ else
+ curpos = strstr(strstr(curpos, ]), /);
+
+ }
+ return -1;
+}
+
/*
* return 0 on success
* return -1 on errors
*/
-int path_dive()
+static int path_dive(int tokens)
{
- char *pos=NULL;
+ char *pos = NULL, *next = NULL;
+ int i;
unsigned int new_obj_handle;
- // for now we only handle absolute path queries
- if (strncmp(current_query, /, 1))
- goto fail;
-
pos = current_query + 1;
- while (pos)
+ for (i = 1; i = tokens; i++)
{
- char *next;
-
- /*
-* if we still have / in the query we are still diving in the
path
-*
-* XXX: what about /cluster/[EMAIL
PROTECTED]/crap/whatever]/@baz kind of queries?
-* we _need_ sanity checks here
-*/
-
- next = strstr(pos, /);
-
- if(!next) {
- pos = 0;
- continue;
- }
-
- memset(next, 0, 1);
-
if(confdb_object_find_start(handle, query_handle) != SA_AIS_OK)
goto fail;
- if (!strstr(pos, [)) { /* straight path diving */
+ next = pos + strlen(pos) + 1;
+
+ if (!strstr(pos, [)) {
+ /* straight path diving */
if (confdb_object_find(handle, query_handle, pos,
strlen(pos), new_obj_handle) != SA_AIS_OK)
goto fail;
else
@@ -165,45 +178,70 @@ int path_dive()
char *start = NULL, *middle = NULL, *end = NULL;
- // we need a bit of sanity check to make sure we did
parse everything correctly
-
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-11-g1cde174
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7
The branch, master has been updated
via 1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7 (commit)
via 82b2af8639846361a5376bbbd573065e01fbbf28 (commit)
via 380cf0cdd7dca30c64c9df78e97356f245bfca9b (commit)
from 79ac12992c9b317b1a3986d391575609a54f5446 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 09:10:43 2008 +0200
[BUILD] Fix dlm_controld linking
dlm_controld does not require linking with libdlmcontrol.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 82b2af8639846361a5376bbbd573065e01fbbf28
Merge: 380cf0cdd7dca30c64c9df78e97356f245bfca9b
79ac12992c9b317b1a3986d391575609a54f5446
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 09:10:16 2008 +0200
Merge branch 'master' of ssh://sources.redhat.com/git/cluster
commit 380cf0cdd7dca30c64c9df78e97356f245bfca9b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 08:45:22 2008 +0200
[BUILD] Fix build order
group needs cman and not just config to build
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
Makefile|2 +-
group/dlm_controld/Makefile |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index dcc9e98..c524a9b 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ cman: config
ccs: cman
dlm: config
fence/libfenced:
-group: config dlm fence/libfenced
+group: cman dlm fence/libfenced
fence: group
gfs:
gfs2:
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 3e2f3dc..7c4f263 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -41,7 +41,7 @@ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-LDFLAGS += -L${dlmlibdir} -L${dlmcontrollibdir} -ldlm -ldlmcontrol
+LDFLAGS += -L${dlmlibdir} -ldlm
LDFLAGS += -L${fencedlibdir} -lfenced
LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup -lpthread
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-12-g8183aed
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=8183aed43de727d0aead21c301c6390eb91685b3
The branch, master has been updated
via 8183aed43de727d0aead21c301c6390eb91685b3 (commit)
from 1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 8183aed43de727d0aead21c301c6390eb91685b3
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 09:11:58 2008 +0200
[BUILD] Fix rg_test linking
rg_test does not need libccs
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
rgmanager/src/daemons/Makefile |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index e9297b1..445b172 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -105,7 +105,7 @@ ${TARGET2}: ${OBJS2}
# packages should run 'make check' as part of the build process.
#
${TARGET3}: ${SHAREDOBJS} ${OBJS3}
- $(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
+ $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) \
$(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
${TARGET4}: ${SHAREDOBJS} ${OBJS4}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-13-gcf86617
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=cf866171e3e498417b534500b677df8d6d6ced06
The branch, master has been updated
via cf866171e3e498417b534500b677df8d6d6ced06 (commit)
from 8183aed43de727d0aead21c301c6390eb91685b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit cf866171e3e498417b534500b677df8d6d6ced06
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 09:12:31 2008 +0200
[BUILD] Fix install permissions
Virtually every distro was complaining about scripts
permissions. Clearly we were doing it wrong. Fix them all.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
rgmanager/src/resources/Makefile | 17 ++---
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/rgmanager/src/resources/Makefile b/rgmanager/src/resources/Makefile
index 5e5897b..5d0268d 100644
--- a/rgmanager/src/resources/Makefile
+++ b/rgmanager/src/resources/Makefile
@@ -26,9 +26,9 @@ RESOURCES=fs.sh service.sh ip.sh nfsclient.sh nfsexport.sh \
METADATA=apache.metadata openldap.metadata samba.metadata \
mysql.metadata postgres-8.metadata tomcat-5.metadata \
- named.metadata lvm.metadata
+ named.metadata lvm.metadata default_event_script.sl
-GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock default_event_script.sl
+GENERAL_TARGETS=ocf-shellfuncs svclib_nfslock
UTIL_TARGETS= \
utils/ra-skelet.sh utils/messages.sh \
@@ -45,15 +45,18 @@ $(TARGET):
install: all
install -d ${sharedir}/utils
for i in $(RESOURCES); do \
-install $(S)/$$i ${sharedir}; \
+install -m755 $(S)/$$i ${sharedir}; \
done
- for i in $(GENERAL_TARGETS) $(METADATA); do \
-install -m 644 $(S)/$$i ${sharedir}; \
+ for i in $(METADATA); do \
+install -m644 $(S)/$$i ${sharedir}; \
+ done
+ for i in $(GENERAL_TARGETS); do \
+install -m755 $(S)/$$i ${sharedir}; \
done
for i in $(UTIL_TARGETS); do \
-install $(S)/$$i ${sharedir}/utils; \
+install -m755 $(S)/$$i ${sharedir}/utils; \
done
- install -m644 $(TARGET) ${sharedir}/utils
+ install -m755 $(TARGET) ${sharedir}/utils
uninstall:
${UNINSTALL} ${RESOURCES} ${GENERAL_TARGETS} \
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-14-g92c6e0d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=92c6e0d6c0eb796a3134137845b12dc053fb2e4e
The branch, master has been updated
via 92c6e0d6c0eb796a3134137845b12dc053fb2e4e (commit)
from cf866171e3e498417b534500b677df8d6d6ced06 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 92c6e0d6c0eb796a3134137845b12dc053fb2e4e
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 21 10:38:10 2008 +0200
[GFS2] Use proper include dir for libvolume_id
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
gfs2/mkfs/Makefile |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gfs2/mkfs/Makefile b/gfs2/mkfs/Makefile
index 8b11478..d627c6d 100644
--- a/gfs2/mkfs/Makefile
+++ b/gfs2/mkfs/Makefile
@@ -26,6 +26,7 @@ OBJS= main.o \
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
CFLAGS += -I${KERNEL_SRC}/include/
+CFLAGS += -I${volidincdir}
CFLAGS += -I$(S)/../include -I$(S)/../libgfs2
CFLAGS += -I${incdir}
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-61-g386eb6f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=386eb6f9e8378896ffcb80c12604cc1904c68d12
The branch, RHEL47 has been updated
via 386eb6f9e8378896ffcb80c12604cc1904c68d12 (commit)
from 06ec63d1c054e324dc17324cf3917b51924df73f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 386eb6f9e8378896ffcb80c12604cc1904c68d12
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 20 12:41:22 2008 +0200
[BUILD] Fix fence agents generation
When switching from perl to python implementations we forgot to
modify the version/copyright generators in the Makefile snippets.
This fixes BZ: #447432, #447434, #447437
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/bladecenter/Makefile |4 ++--
fence/agents/drac/Makefile|4 ++--
fence/agents/ilo/Makefile |4 ++--
fence/agents/wti/Makefile |4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fence/agents/bladecenter/Makefile
b/fence/agents/bladecenter/Makefile
index d6a30c9..5a617df 100644
--- a/fence/agents/bladecenter/Makefile
+++ b/fence/agents/bladecenter/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
fence_bladecenter: fence_bladecenter.py
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/drac/Makefile b/fence/agents/drac/Makefile
index 67a1eb2..914d2c9 100644
--- a/fence/agents/drac/Makefile
+++ b/fence/agents/drac/Makefile
@@ -34,9 +34,9 @@ fence_drac: fence_drac.pl
fence_drac5: fence_drac5.py
: $(TARGET2)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE2)
$(TARGET2)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET2)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET2)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET2)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE2) $(TARGET2)
chmod +x $(TARGET2)
diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile
index 42f17c8..794eb13 100644
--- a/fence/agents/ilo/Makefile
+++ b/fence/agents/ilo/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
fence_ilo: $(SOURCE)
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile
index 53b833a..50d6672 100644
--- a/fence/agents/wti/Makefile
+++ b/fence/agents/wti/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
$(TARGET): $(SOURCE)
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.02-4-g287abb1
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=287abb1c13c1304bc949ab649ca864e52b1c3371 The branch, master has been updated via 287abb1c13c1304bc949ab649ca864e52b1c3371 (commit) from 1e6824a1478c95ae6c3a480e94fea889c1149c9a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 287abb1c13c1304bc949ab649ca864e52b1c3371 Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Tue May 20 12:49:12 2008 +0200 [MISC] Update copyright Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: scripts/fenceparse |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/fenceparse b/scripts/fenceparse index de2ec7a..0129629 100755 --- a/scripts/fenceparse +++ b/scripts/fenceparse @@ -3,7 +3,7 @@ ### ### ## -## Copyright (C) 2008 Fabio M. Di Nitto [EMAIL PROTECTED] +## Copyright (C) 2008 Red Hat, Inc. All rights reserved. ## ## This copyrighted material is made available to anyone wishing to use, ## modify, copy, or redistribute it subject to the terms and conditions hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-25-g07df538
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=07df53861cd45ac2f74fdec37a85a830280f37ab The branch, STABLE2 has been updated via 07df53861cd45ac2f74fdec37a85a830280f37ab (commit) from fa38ed06274d8f9a9f0eb6ae4e7e932e939f6f12 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 07df53861cd45ac2f74fdec37a85a830280f37ab Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Tue May 20 12:49:12 2008 +0200 [MISC] Update copyright Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: scripts/fenceparse |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/fenceparse b/scripts/fenceparse index de2ec7a..0129629 100755 --- a/scripts/fenceparse +++ b/scripts/fenceparse @@ -3,7 +3,7 @@ ### ### ## -## Copyright (C) 2008 Fabio M. Di Nitto [EMAIL PROTECTED] +## Copyright (C) 2008 Red Hat, Inc. All rights reserved. ## ## This copyrighted material is made available to anyone wishing to use, ## modify, copy, or redistribute it subject to the terms and conditions hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-63-gd219d96
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d219d96020c2ae2d7afedfeeccfd135a6be413b0
The branch, RHEL4 has been updated
via d219d96020c2ae2d7afedfeeccfd135a6be413b0 (commit)
from 3c969b90d416f64500ac74515940f1580afe7ba3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit d219d96020c2ae2d7afedfeeccfd135a6be413b0
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 20 12:41:22 2008 +0200
[BUILD] Fix fence agents generation
When switching from perl to python implementations we forgot to
modify the version/copyright generators in the Makefile snippets.
This fixes BZ: #447432, #447434, #447437
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/bladecenter/Makefile |4 ++--
fence/agents/drac/Makefile|4 ++--
fence/agents/ilo/Makefile |4 ++--
fence/agents/wti/Makefile |4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fence/agents/bladecenter/Makefile
b/fence/agents/bladecenter/Makefile
index d6a30c9..5a617df 100644
--- a/fence/agents/bladecenter/Makefile
+++ b/fence/agents/bladecenter/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
fence_bladecenter: fence_bladecenter.py
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/drac/Makefile b/fence/agents/drac/Makefile
index 67a1eb2..914d2c9 100644
--- a/fence/agents/drac/Makefile
+++ b/fence/agents/drac/Makefile
@@ -34,9 +34,9 @@ fence_drac: fence_drac.pl
fence_drac5: fence_drac5.py
: $(TARGET2)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE2)
$(TARGET2)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET2)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET2)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET2)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE2) $(TARGET2)
chmod +x $(TARGET2)
diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile
index 42f17c8..794eb13 100644
--- a/fence/agents/ilo/Makefile
+++ b/fence/agents/ilo/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
fence_ilo: $(SOURCE)
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile
index 53b833a..50d6672 100644
--- a/fence/agents/wti/Makefile
+++ b/fence/agents/wti/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
$(TARGET): $(SOURCE)
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-91-g508cfb5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=508cfb5fb512c62e618ce20d0b7bf434ac0764ba
The branch, RHEL5 has been updated
via 508cfb5fb512c62e618ce20d0b7bf434ac0764ba (commit)
from d9538c73f6450c84b65f6d04e0bc7bcdaa2b7c8b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 508cfb5fb512c62e618ce20d0b7bf434ac0764ba
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 20 12:41:22 2008 +0200
[BUILD] Fix fence agents generation
When switching from perl to python implementations we forgot to
modify the version/copyright generators in the Makefile snippets.
This fixes BZ: #447432, #447434, #447437
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/bladecenter/Makefile |4 ++--
fence/agents/drac/Makefile|4 ++--
fence/agents/ilo/Makefile |4 ++--
fence/agents/wti/Makefile |4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fence/agents/bladecenter/Makefile
b/fence/agents/bladecenter/Makefile
index c26f852..34dd24d 100644
--- a/fence/agents/bladecenter/Makefile
+++ b/fence/agents/bladecenter/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
fence_bladecenter: fence_bladecenter.py
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/drac/Makefile b/fence/agents/drac/Makefile
index 03b9745..ce84f20 100644
--- a/fence/agents/drac/Makefile
+++ b/fence/agents/drac/Makefile
@@ -34,9 +34,9 @@ fence_drac: fence_drac.pl
fence_drac5: fence_drac5.py
: $(TARGET2)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE2)
$(TARGET2)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET2)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET2)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET2)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE2) $(TARGET2)
chmod +x $(TARGET2)
diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile
index bd38b1b..089266e 100644
--- a/fence/agents/ilo/Makefile
+++ b/fence/agents/ilo/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
fence_ilo: $(SOURCE)
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile
index ecbc5a4..73f42a4 100644
--- a/fence/agents/wti/Makefile
+++ b/fence/agents/wti/Makefile
@@ -22,9 +22,9 @@ all: $(TARGET)
$(TARGET): $(SOURCE)
: $(TARGET)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE)
$(TARGET)
- echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
+ echo FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET)
${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET)
- echo \$$BUILD_DATE=\(built `date`)\; $(TARGET)
+ echo BUILD_DATE=\(built `date`)\; $(TARGET)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE) $(TARGET)
chmod +x $(TARGET)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project annotated tag, cluster-2.99.02, created. cluster-2.99.02
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b1832be71707b72b0fdaa218cbb3a199576d2b02 The annotated tag, cluster-2.99.02 has been created at b1832be71707b72b0fdaa218cbb3a199576d2b02 (tag) tagging 9183f8ecd7ae7f80f62027ee590d8bff8ecb2d1b (commit) replaces cluster-2.99.01 tagged by Fabio M. Di Nitto on Mon May 19 13:12:20 2008 +0200 - Log - cluster-2.99.02 release Bob Peterson (1): Replace put_inode with drop_inode Fabio M. Di Nitto (11): [FENCE] Rename bladecenter as it should be .pl - .py [DLM] Remove unused header file [BUILD] Add --without_kernel_modules configure option [BUILD] Free toplevel config/ dir [CONFIG] Create config/ subsystem [CONFIG] Add missing Makefiles [CCS] Make a bunch of functions static [BUILD] Stop using DEVEL.DATE library soname [GFS] Fix comment [INIT] Do not start services automatically [GFS] Sync with gfs2 init script Jonathan Brassow (1): rgmanager/lvm.sh: HA LVM wasn't working on IA64 Marek 'marx' Grac (3): [FENCE] Fix name of the option in fencing library [FENCE] Fix problem with different menu for admin/user for APC [FENCE] Fix typo in name of the exceptions in fencing agents --- hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-89-g1f8a70a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1f8a70aafaa307b565335652b530e72ace8176a9
The branch, RHEL5 has been updated
via 1f8a70aafaa307b565335652b530e72ace8176a9 (commit)
from 4eca59fdacf347d0315eff78487b642e17be2de7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 1f8a70aafaa307b565335652b530e72ace8176a9
Author: Marek 'marx' Grac [EMAIL PROTECTED]
Date: Mon May 19 17:28:39 2008 +0200
[FENCE] Fix #248609: SSH support in Bladecenter fencing (ssh)
Complete ssh support for Bladecenter. You can use password or private key
(identity_file on STDIN; -k in getopt) to login to system. This patch
contains
complete infrastructure (usable also by other agents).
---
Summary of changes:
fence/agents/bladecenter/fence_bladecenter.py |2 +-
fence/agents/lib/fencing.py.py| 40 -
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py
b/fence/agents/bladecenter/fence_bladecenter.py
index 6670bcb..ff7ad67 100755
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -64,7 +64,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ help, version, agent, quiet, verbose, debug,
action, ipaddr, login, passwd, passwd_script,
- cmd_prompt, secure, port ]
+ cmd_prompt, secure, port, identity_file ]
options = check_input(device_opt, process_input(device_opt))
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 0ddf173..7aa8a0c 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -72,12 +72,16 @@ all_opt = {
order : 1 },
passwd : {
getopt : p:,
- help : -p password Login password,
+ help : -p password Login password or passphrase,
order : 1 },
passwd_script : {
getopt : S:,
help : -S scriptScript to run to retrieve password,
order : 1 },
+ identity_file : {
+ getopt : k:,
+ help : -k filename Identity file (private key) for ssh ,
+ order : 1 },
module_name : {
getopt : m:,
help : -m moduleDRAC/MC module name,
@@ -254,11 +258,19 @@ def check_input(device_opt, opt):
if 0 == options.has_key(-a):
fail_usage(Failed: You have to enter fence address)
- if 0 == (options.has_key(-p) or options.has_key(-S)):
- fail_usage(Failed: You have to enter password or password
script)
+ if 0 == device_opt.count(identity_file):
+ if 0 == (options.has_key(-p) or options.has_key(-S)):
+ fail_usage(Failed: You have to enter password or
password script)
+ else:
+ if 0 == (options.has_key(-p) or options.has_key(-S) or
options.has_key(-k)):
+ fail_usage(Failed: You have to enter password,
password script or identity file)
+
+ if 0 == options.has_key(-x) and 1 == options.has_key(-k):
+ fail_usage(Failed: You have to use identity file together with
ssh connection (-x))
- if 1 == (options.has_key(-p) and options.has_key(-S)):
- fail_usage(Failed: You have to enter password or password
script)
+ if 1 == options.has_key(-k):
+ if 0 == os.path.isfile(options[-k]):
+ fail_usage(Failed: Identity file + options[-k] +
does not exist)
if (0 == options.has_key(-n)) and (device_opt.count(port)):
fail_usage(Failed: You have to enter plug number)
@@ -325,14 +337,26 @@ def fence_login(options):
re_login = re.compile((login: )|(Login Name: )|(username:
)|(User Name :), re.IGNORECASE)
re_pass = re.compile(password, re.IGNORECASE)
- if options.has_key(-x):
+ if options.has_key(-x) and 0 == options.has_key(-k):
conn = fspawn ('ssh ' + options[-l] + @ +
options[-a])
- result = conn.log_expect(options, [ ssword: , Are
you sure you want to continue connecting (yes/no)? ], LOGIN_TIMEOUT)
+ result = conn.log_expect(options, [ ssword:, Are you
sure you want to continue connecting (yes/no)? ], LOGIN_TIMEOUT)
if result == 1:
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-18-g0c7bd53
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0c7bd530bb56848a8818f9b6389bd7fed67b1d73
The branch, STABLE2 has been updated
via 0c7bd530bb56848a8818f9b6389bd7fed67b1d73 (commit)
via ec2b14741da88ffa1d3f627d805ed0f7810da80b (commit)
via 135b0da42006f442697645f5b58aabc32b3a13ef (commit)
from 9e21cfac6dcb1e6c71d55e92cfbecfbe3df6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0c7bd530bb56848a8818f9b6389bd7fed67b1d73
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 07:41:23 2008 +0200
[BUILD] Add --without_kernel_modules configure option
Allow users to disable build of kernel modules.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit ec2b14741da88ffa1d3f627d805ed0f7810da80b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 6 16:18:26 2008 +0200
[BUILD] Allow users to set path to init.d
Almost all distributions use /etc/init.d but some still use
the legacy path to /etc/rc.d/init.d.
Allow builders to set the path instead of using some manual
workarounds to do later fixup.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 135b0da42006f442697645f5b58aabc32b3a13ef
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 21:02:34 2008 +0200
[BUILD] Move fencelib in /usr/share
Python bytecompiled objectes are arch indipendent. Move
the whole thing where it belongs.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure | 27 +++
make/defines.mk.input |5 +++--
make/install.mk |6 +++---
make/uninstall.mk |2 +-
4 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index f64f266..a68d002 100755
--- a/configure
+++ b/configure
@@ -76,6 +76,7 @@ my %options = (
mandir = \$mandir,
prefix = \$prefix,
sbindir = \$sbindir,
+ initddir = \$initddir,
sharedir = \$sharedir,
mibdir = \$mibdir,
snmpbin = \$snmpbin,
@@ -96,6 +97,7 @@ my %options = (
without_gfs2 = \$without_gfs2,
without_gnbd = \$without_gnbd,
without_rgmanager = \$without_rgmanager,
+ without_kernel_modules = \$without_kernel_modules,
disable_kernel_check = \$disable_kernel_check,
);
@@ -145,6 +147,7 @@ my $err = GetOptions (\%options,
'mandir=s',
'prefix=s',
'sbindir=s',
+ 'initddir=s',
'sharedir=s',
'mibdir=s',
'snmpbin=s',
@@ -165,6 +168,7 @@ my $err = GetOptions (\%options,
'without_gfs2',
'without_gnbd',
'without_rgmanager',
+ 'without_kernel_modules',
'disable_kernel_check');
if(!$err) {
@@ -181,6 +185,7 @@ if ($help || !$err) {
print install flags:\n;
print --prefix=\tthe base directory to install into. (Default: /usr)\n;
print --sbindir=\tthe base directory for system binaries. (Default:
{prefix}/sbin)\n;
+ print --initddir=\tthe base directory for init.d scripts. (Default:
/etc/init.d)\n;
print --libdir=\tthe base directory for libraries. (Default:
{prefix}/lib)\n;
print --libexecdir=\tthe base directory for executable components.
(Default: {prefix}/libexec)\n;
print --sharedir=\tthe base directory for misc cluster files. (Default:
{prefix}/share/cluster)\n;
@@ -229,7 +234,7 @@ if ($help || !$err) {
print --xenlibdir=\tthe base directory for xen libraries. (Default:
{libdir})\n;
print --fence_agents=\tlist of fence agents to configure. (Default:
all)\n;
print \t\tUse --fence_agents=help for a list\n;
- print --fenceagentslibdir=\tspecify directory where to install common fence
python lib. (Default: /usr/lib/fence)\n;
+ print --fenceagentslibdir=\tspecify directory where to install common fence
python lib. (Default: /usr/share/fence)\n;
print --enable_xen\tEnable building of Xen-specific pieces\n;
print --without_ccs\tDisable ccs building (Default: enabled)\n;
print --without_cman\tDisable cman building (Default: enabled)\n;
@@ -240,7 +245,8 @@ if ($help || !$err) {
print --without_gfs2\tDisable gfs2 building (Default: enabled)\n;
print --without_gnbd\tDisable gnbd building (Default: enabled)\n;
print --without_rgmanager\tDisable rgmanager building (Default:
enabled)\n;
- print
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-16-g9183f8e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9183f8ecd7ae7f80f62027ee590d8bff8ecb2d1b The branch, master has been updated via 9183f8ecd7ae7f80f62027ee590d8bff8ecb2d1b (commit) from 3bfefa4b81736aa9cc3827168a39cd4ffe85329a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 9183f8ecd7ae7f80f62027ee590d8bff8ecb2d1b Author: Fabio M. Di Nitto [EMAIL PROTECTED] Date: Mon May 19 06:34:04 2008 +0200 [GFS] Sync with gfs2 init script Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED] --- Summary of changes: gfs/init.d/gfs | 15 ++- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gfs/init.d/gfs b/gfs/init.d/gfs index c4ee890..8116db1 100755 --- a/gfs/init.d/gfs +++ b/gfs/init.d/gfs @@ -1,13 +1,18 @@ #!/bin/bash # -# +# gfs mount/unmount helper # -# chkconfig: 345 26 74 +# chkconfig: - 26 74 # description: mount/unmount gfs filesystems configured in /etc/fstab -# -# + ### BEGIN INIT INFO -# Provides: +# Provides:gfs +# Required-Start: $network cman +# Required-Stop: $network cman +# Default-Start: +# Default-Stop: +# Short-Description: mount/unmount gfs filesystems configured in /etc/fstab +# Description: mount/unmount gfs filesystems configured in /etc/fstab ### END INIT INFO . /etc/init.d/functions hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-22-gdc6c5bc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=dc6c5bc67acb54b8db4826df04678b0359b02dc1
The branch, STABLE2 has been updated
via dc6c5bc67acb54b8db4826df04678b0359b02dc1 (commit)
via eca8f595e7836a0b0ce019d299dd7f9523f0bcbd (commit)
via 239008da8d61f99231df7107976b78d8bcd36263 (commit)
via f0235f3cdd72413f1dd40217af06be919f710744 (commit)
from 0c7bd530bb56848a8818f9b6389bd7fed67b1d73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit dc6c5bc67acb54b8db4826df04678b0359b02dc1
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon May 19 06:30:48 2008 +0200
[INIT] Do not start services automatically
Apply Fedora policy to not start services automatically
to our init scripts.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit eca8f595e7836a0b0ce019d299dd7f9523f0bcbd
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 14 00:31:48 2008 +0200
[CMAN] Fix path to cman_tool
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 239008da8d61f99231df7107976b78d8bcd36263
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 23:44:07 2008 +0200
[MISC] Cast some love to init scripts
- Fix LSB headers
- Use standard templates
- Align runlevels
- Add service dependencies
- Fix subsystem usage
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit f0235f3cdd72413f1dd40217af06be919f710744
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Mon May 19 06:34:04 2008 +0200
[GFS] Sync with gfs2 init script
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/init.d/cman.in| 27 ++-
cman/init.d/qdiskd | 19 +--
fence/agents/scsi/scsi_reserve | 28 +---
gfs/init.d/gfs | 15 ++-
gfs2/init.d/gfs2 | 15 ++-
rgmanager/init.d/rgmanager.in | 15 ---
6 files changed, 88 insertions(+), 31 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index a08d4dd..1134e80 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -1,12 +1,21 @@
#!/bin/bash
#
-# chkconfig: 345 21 79
+# cman - Cluster Manager init script
+#
+# chkconfig: - 21 79
# description: Starts and stops cman
#
#
### BEGIN INIT INFO
-# Provides:
+# Provides:cman
+# Required-Start: $network
+# Required-Stop: $network
+# Default-Start:
+# Default-Stop:
+# Short-Description: Starts and stops cman
+# Description: Starts and stops the Cluster Manager set of daemons
### END INIT INFO
+
. /etc/init.d/functions
[ -f /etc/sysconfig/cman ] . /etc/sysconfig/cman
@@ -92,15 +101,15 @@ start_ccsd()
start_cman()
{
# cman
-/usr/sbin/cman_tool status /dev/null
+/sbin/cman_tool status /dev/null
if [ $? -ne 0 ]
then
- errmsg=$( /usr/sbin/cman_tool -t $CMAN_CLUSTER_TIMEOUT -w join \
+ errmsg=$( /sbin/cman_tool -t $CMAN_CLUSTER_TIMEOUT -w join \
$cman_join_opts 21 ) || return 1
if [ $CMAN_QUORUM_TIMEOUT -gt 0 ]
then
- errmsg=$( /usr/sbin/cman_tool -t $CMAN_QUORUM_TIMEOUT \
+ errmsg=$( /sbin/cman_tool -t $CMAN_QUORUM_TIMEOUT \
-q wait 21 ) || return 1
fi
fi
@@ -398,10 +407,10 @@ stop_ccsd()
stop_cman()
{
-/usr/sbin/cman_tool status /dev/null
+/sbin/cman_tool status /dev/null
if [ $? -eq 0 ]
then
-errmsg=$( /usr/sbin/cman_tool -t $CMAN_SHUTDOWN_TIMEOUT \
+errmsg=$( /sbin/cman_tool -t $CMAN_SHUTDOWN_TIMEOUT \
-w leave $1 21 ) || return 1
fi
return 0 # all ok
@@ -559,7 +568,7 @@ case $1 in
fi
;;
-restart)
+restart|reload)
$0 stop restart
$0 start
rtrn=$?
@@ -576,7 +585,7 @@ case $1 in
;;
*)
- echo $Usage: $0 {start|stop|restart|status}
+ echo $Usage: $0 {start|stop|reload|restart|status}
;;
esac
diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
index 0a2c97a..62bd33f 100755
--- a/cman/init.d/qdiskd
+++ b/cman/init.d/qdiskd
@@ -1,11 +1,18 @@
#!/bin/bash
#
-# chkconfig: 345 22 78
-# description: Starts and stops the quroum disk daemon
+# qdiskd quorum disk daemon
#
-#
+# chkconfig: - 22 78
+# description: Starts and stops the quorum disk daemon
+
### BEGIN INIT INFO
-# Provides:
+# Provides:qdiskd
+# Required-Start: cman
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-10-g61872df
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=61872df7226c92719ad984cc45d0bb126daf9441
The branch, master has been updated
via 61872df7226c92719ad984cc45d0bb126daf9441 (commit)
via 0c11e91f1a43ff2010947dbdc369aac025c074dd (commit)
from ef50cab216748d5528594212d62a8f5893275fbd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 61872df7226c92719ad984cc45d0bb126daf9441
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 08:43:29 2008 +0200
[CONFIG] Add missing Makefiles
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 0c11e91f1a43ff2010947dbdc369aac025c074dd
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 08:39:46 2008 +0200
[CONFIG] Create config/ subsystem
Move libccsconfdb to config/libs/
Move ccs_test to config/tools/
top level Makefile:
- use config/ subsystem
- reorder build dependencies
- ccs is now on its own
configure:
- change default location for libccs
Update Makefiles to cope with new locations
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
Makefile| 23 +++
ccs/Makefile|2 +-
ccs/man/Makefile|1 -
{fence = config}/Makefile |2 +-
{fence = config/libs}/Makefile |4 ++--
{ccs = config/libs}/libccsconfdb/Makefile |2 +-
{ccs = config/libs}/libccsconfdb/ccs.h |0
{ccs = config/libs}/libccsconfdb/libccs.c |0
{fence = config/tools}/Makefile|4 ++--
{ccs = config/tools}/ccs_test/Makefile |4 ++--
{ccs = config/tools}/ccs_test/ccs_test.c |0
{fence/agents/rsa = config/tools/man}/Makefile |8
{ccs = config/tools}/man/ccs_test.8|0
configure |8
make/defines.mk.input |2 +-
15 files changed, 29 insertions(+), 31 deletions(-)
copy {fence = config}/Makefile (91%)
copy {fence = config/libs}/Makefile (88%)
rename {ccs = config/libs}/libccsconfdb/Makefile (97%)
rename {ccs = config/libs}/libccsconfdb/ccs.h (100%)
rename {ccs = config/libs}/libccsconfdb/libccs.c (100%)
copy {fence = config/tools}/Makefile (88%)
rename {ccs = config/tools}/ccs_test/Makefile (94%)
rename {ccs = config/tools}/ccs_test/ccs_test.c (100%)
copy {fence/agents/rsa = config/tools/man}/Makefile (84%)
rename {ccs = config/tools}/man/ccs_test.8 (100%)
diff --git a/Makefile b/Makefile
index a3104db..dcc9e98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
###
###
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+## Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
##
## This copyrighted material is made available to anyone wishing to use,
## modify, copy, or redistribute it subject to the terms and conditions
@@ -12,14 +12,13 @@
include make/defines.mk
REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \
- cman/lib ccs cman dlm fence/libfenced group fence gfs gfs2 gnbd
rgmanager
+ config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd
rgmanager
SUBDIRS = $(filter-out \
$(if ${without_gnbd-kernel/src},gnbd-kernel/src) \
$(if ${without_gfs-kernel/src/gfs},gfs-kernel/src/gfs) \
- $(if ${without_cman},cman/lib) \
- $(if ${without_ccs},ccs) \
$(if ${without_cman},cman) \
+ $(if ${without_ccs},ccs) \
$(if ${without_dlm},dlm) \
$(if ${without_fence},fence/libfenced) \
$(if ${without_group},group) \
@@ -46,17 +45,17 @@ gfs-kernel: gfs-kernel/src/gfs
# Dependencies
-cman/lib:
-ccs: cman/lib
-cman: ccs
-dlm:
+config:
+cman: config
+ccs: cman
+dlm: config
fence/libfenced:
-group: ccs dlm fence/libfenced
-fence: group dlm
+group: config dlm fence/libfenced
+fence: group
gfs:
gfs2:
-gnbd: cman/lib
-rgmanager: ccs dlm
+gnbd: cman
+rgmanager: cman dlm
install: all
set -e for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
diff --git a/ccs/Makefile b/ccs/Makefile
index ed456a1..baabc05 100644
--- a/ccs/Makefile
+++ b/ccs/Makefile
@@ -13,4 +13,4 @@
include ../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=libccscompat
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-11-gdc0eb68
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=dc0eb68982a09f73568fd63e729fe171ac3c6943
The branch, master has been updated
via dc0eb68982a09f73568fd63e729fe171ac3c6943 (commit)
from 61872df7226c92719ad984cc45d0bb126daf9441 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit dc0eb68982a09f73568fd63e729fe171ac3c6943
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 08:49:06 2008 +0200
[CCS] Make a bunch of functions static
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/libccscompat/libccscompat.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ccs/libccscompat/libccscompat.c b/ccs/libccscompat/libccscompat.c
index b9144a1..b21377b 100644
--- a/ccs/libccscompat/libccscompat.c
+++ b/ccs/libccscompat/libccscompat.c
@@ -117,7 +117,7 @@ static int setup_interface_ipv4(int *sp, int port){
}
-int
+static int
setup_interface_local(int *sp)
{
struct sockaddr_un sun;
@@ -280,7 +280,7 @@ static int do_request(char *buffer){
*
* Returns: = 0 on success, 0 on error
*/
-int _ccs_connect(const char *cluster_name, int flags){
+static int _ccs_connect(const char *cluster_name, int flags){
int error = 0;
char *buffer = NULL;
comm_header_t *ch = NULL;
@@ -411,7 +411,7 @@ int ccs_disconnect(int desc){
*
* Returns: 0 on success, 0 on failure
*/
-int _ccs_get(int desc, const char *query, char **rtn, int list){
+static int _ccs_get(int desc, const char *query, char **rtn, int list){
int error = 0;
char *buffer = NULL;
comm_header_t *ch = NULL;
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-13-g45932c8
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=45932c80f1a21c5c6b7486a9026a2e63e9b14d25
The branch, STABLE2 has been updated
via 45932c80f1a21c5c6b7486a9026a2e63e9b14d25 (commit)
from 776b7f3d3d78891d2c79818c0fa9dc54c8449a13 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 45932c80f1a21c5c6b7486a9026a2e63e9b14d25
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 08:49:06 2008 +0200
[CCS] Make a bunch of functions static
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
ccs/lib/libccs.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ccs/lib/libccs.c b/ccs/lib/libccs.c
index 2b9f179..f8e825a 100644
--- a/ccs/lib/libccs.c
+++ b/ccs/lib/libccs.c
@@ -131,7 +131,7 @@ static int setup_interface_ipv4(int *sp, int port){
}
-int
+static int
setup_interface_local(int *sp)
{
struct sockaddr_un sun;
@@ -310,7 +310,7 @@ static int do_request(char *buffer){
*
* Returns: = 0 on success, 0 on error
*/
-int _ccs_connect(const char *cluster_name, int flags){
+static int _ccs_connect(const char *cluster_name, int flags){
int error = 0;
char *buffer = NULL;
comm_header_t *ch = NULL;
@@ -447,7 +447,7 @@ int ccs_disconnect(int desc){
*
* Returns: 0 on success, 0 on failure
*/
-int _ccs_get(int desc, const char *query, char **rtn, int list){
+static int _ccs_get(int desc, const char *query, char **rtn, int list){
int error = 0;
char *buffer = NULL;
comm_header_t *ch = NULL;
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-12-g3a8f353
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3a8f3538e1da5794e08ceb825a4b2b77e7052f6d
The branch, master has been updated
via 3a8f3538e1da5794e08ceb825a4b2b77e7052f6d (commit)
from dc0eb68982a09f73568fd63e729fe171ac3c6943 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 3a8f3538e1da5794e08ceb825a4b2b77e7052f6d
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 11:17:51 2008 +0200
[BUILD] Stop using DEVEL.DATE library soname
Start using the official sonames also for development trees.
release version is there to catch the same information.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure |8
make/official_release_version |1 +
2 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 make/official_release_version
diff --git a/configure b/configure
index c798363..bc0203e 100755
--- a/configure
+++ b/configure
@@ -737,9 +737,8 @@ if ((not defined($somajor)) || (not defined($sominor)) ||
(not defined($release_
if ((not defined($somajor)) || (not defined($sominor))) {
if (not defined($current_soname)) {
- $somajor = DEVEL;
- $sominor = `date +%s`;
- chomp $sominor;
+ print ERROR: SONAME not defined in make/official_release_version\n;
+ exit 1;
} else {
$current_soname =~ s/.*(.*)\n/$1/;
my @release_soname = split /\./, $current_soname;
@@ -750,7 +749,8 @@ if ((not defined($somajor)) || (not defined($sominor)) ||
(not defined($release_
if (not defined($release_version)) {
if (not defined($current_version)) {
- $release_version = $somajor.$sominor;
+ $release_version = `date +%s`;
+ chomp $release_version;
} else {
$release_version = $current_version;
$release_version =~ s/.*(.*)\n/$1/;
diff --git a/make/official_release_version b/make/official_release_version
new file mode 100644
index 000..3bdc875
--- /dev/null
+++ b/make/official_release_version
@@ -0,0 +1 @@
+SONAME 2.9
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-58-gf9daca2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=f9daca2d6e65a8265c2358714e5038426adabe49
The branch, RHEL47 has been updated
via f9daca2d6e65a8265c2358714e5038426adabe49 (commit)
from 0028f87a40bae07016fff180cdd3836902741e2e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit f9daca2d6e65a8265c2358714e5038426adabe49
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 07:24:37 2008 +0200
[BUILD] Fix drac5 generation
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/drac/Makefile |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fence/agents/drac/Makefile b/fence/agents/drac/Makefile
index 294c86d..67a1eb2 100644
--- a/fence/agents/drac/Makefile
+++ b/fence/agents/drac/Makefile
@@ -35,7 +35,7 @@ fence_drac5: fence_drac5.py
: $(TARGET2)
awk {print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0} $(SOURCE2)
$(TARGET2)
echo \$$FENCE_RELEASE_NAME=\${RELEASE}\; $(TARGET2)
- ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl
REDHAT_COPYRIGHT $(TARGET2)
+ ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh
REDHAT_COPYRIGHT $(TARGET2)
echo \$$BUILD_DATE=\(built `date`)\; $(TARGET2)
awk -v p=0 (\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}
$(SOURCE2) $(TARGET2)
chmod +x $(TARGET2)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-7-g81c7417
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=81c7417b376de2f1d4a0bd6cb0f279f37c88af7b
The branch, master has been updated
via 81c7417b376de2f1d4a0bd6cb0f279f37c88af7b (commit)
from daff41e06bbb8a5332ede4e0addf4d8f94b7d33a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 81c7417b376de2f1d4a0bd6cb0f279f37c88af7b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Fri May 16 07:41:23 2008 +0200
[BUILD] Add --without_kernel_modules configure option
Allow users to disable build of kernel modules.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure | 16 ++--
make/defines.mk.input |4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 2c9ad4e..014044a 100755
--- a/configure
+++ b/configure
@@ -105,6 +105,7 @@ my %options = (
without_gfs2 = \$without_gfs2,
without_gnbd = \$without_gnbd,
without_rgmanager = \$without_rgmanager,
+ without_kernel_modules = \$without_kernel_modules,
disable_kernel_check = \$disable_kernel_check,
);
@@ -183,6 +184,7 @@ my $err = GetOptions (\%options,
'without_gfs2',
'without_gnbd',
'without_rgmanager',
+ 'without_kernel_modules',
'disable_kernel_check');
if(!$err) {
@@ -267,7 +269,8 @@ if ($help || !$err) {
print --without_gfs2\tDisable gfs2 building (Default: enabled)\n;
print --without_gnbd\tDisable gnbd building (Default: enabled)\n;
print --without_rgmanager\tDisable rgmanager building (Default:
enabled)\n;
- print --disable_kernel_check\tDisable kernel version check (Default:
enabled)\n;
+ print --without_kernel_modules\tDisable kernel modules building (Default:
enabled)\n;
+ print --disable_kernel_check\tDisable kernel version check (Default:
enabled)\n;
exit $ret;
}
@@ -588,10 +591,17 @@ if (!$without_gfs2) {
}
if (!$without_gnbd) {
$without_gnbd=;
-}
+}
if (!$without_rgmanager) {
$without_rgmanager=;
}
+if (!$without_kernel_modules) {
+ $without_gfskernel=$without_gfs;
+ $without_gnbdkernel=$without_gnbd;
+} else {
+ $without_gfskernel=1;
+ $without_gnbdkernel=1;
+}
if (!$disable_kernel_check) {
$disable_kernel_check=0;
}
@@ -697,8 +707,10 @@ while (IFILE) {
$_ =~ s/[EMAIL PROTECTED]@/$without_group/;
$_ =~ s/[EMAIL PROTECTED]@/$without_fence/;
$_ =~ s/[EMAIL PROTECTED]@/$without_gfs/;
+ $_ =~ s/[EMAIL PROTECTED]@/$without_gfskernel/;
$_ =~ s/[EMAIL PROTECTED]@/$without_gfs2/;
$_ =~ s/[EMAIL PROTECTED]@/$without_gnbd/;
+ $_ =~ s/[EMAIL PROTECTED]@/$without_gnbdkernel/;
$_ =~ s/[EMAIL PROTECTED]@/$without_rgmanager/;
print OFILE $_\n;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index bd6d37b..173e0bb 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -78,8 +78,8 @@ fence_agents ?= @FENCE_AGENTS@
fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
enable_xen ?= @ENABLE_XEN@
-without_gnbd-kernel/src ?= @DISABLE_GNBD@
-without_gfs-kernel/src/gfs ?= @DISABLE_GFS@
+without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
+without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
without_cman/lib ?= @DISABLE_CMAN@
without_ccs ?= @DISABLE_CCS@
without_cman ?= @DISABLE_CMAN@
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.00-45-g446f789
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=446f78915e0d8f1964cb2cfccbced47768d215b9
The branch, master has been updated
via 446f78915e0d8f1964cb2cfccbced47768d215b9 (commit)
from 35e9ac574a7501d3ed3fb02da36d230611aa5284 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 446f78915e0d8f1964cb2cfccbced47768d215b9
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 23:44:07 2008 +0200
[MISC] Cast some love to init scripts
- Fix LSB headers
- Use standard templates
- Align runlevels
- Add service dependencies
- Fix subsystem usage
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
cman/init.d/cman.in| 15 ---
cman/init.d/qdiskd | 19 +--
fence/agents/scsi/scsi_reserve | 26 --
gfs2/init.d/gfs2 | 13 +
rgmanager/init.d/rgmanager.in | 15 ---
5 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index a08d4dd..55358fd 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -1,12 +1,21 @@
#!/bin/bash
#
+# cman - Cluster Manager init script
+#
# chkconfig: 345 21 79
# description: Starts and stops cman
#
#
### BEGIN INIT INFO
-# Provides:
+# Provides:cman
+# Required-Start: $network
+# Required-Stop: $network
+# Default-Start: 3 4 5
+# Default-Stop:0 1 2 6
+# Short-Description: Starts and stops cman
+# Description: Starts and stops the Cluster Manager set of daemons
### END INIT INFO
+
. /etc/init.d/functions
[ -f /etc/sysconfig/cman ] . /etc/sysconfig/cman
@@ -559,7 +568,7 @@ case $1 in
fi
;;
-restart)
+restart|reload)
$0 stop restart
$0 start
rtrn=$?
@@ -576,7 +585,7 @@ case $1 in
;;
*)
- echo $Usage: $0 {start|stop|restart|status}
+ echo $Usage: $0 {start|stop|reload|restart|status}
;;
esac
diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
index 0a2c97a..c4aa4a9 100755
--- a/cman/init.d/qdiskd
+++ b/cman/init.d/qdiskd
@@ -1,11 +1,18 @@
#!/bin/bash
#
-# chkconfig: 345 22 78
-# description: Starts and stops the quroum disk daemon
+# qdiskd quorum disk daemon
#
-#
+# chkconfig: 345 22 78
+# description: Starts and stops the quorum disk daemon
+
### BEGIN INIT INFO
-# Provides:
+# Provides:qdiskd
+# Required-Start: cman
+# Required-Stop: cman
+# Default-Start: 3 4 5
+# Default-Stop:0 1 2 6
+# Short-Description: start/stop quorum disk daemon
+# Description: start/stop quorum disk daemon
### END INIT INFO
. /etc/init.d/functions
@@ -61,7 +68,7 @@ case $1 in
fi
;;
- restart)
+ restart|reload)
$0 stop || exit $?
$0 start
rtrn=$?
@@ -73,7 +80,7 @@ case $1 in
;;
*)
- echo $Usage: $0 {start|stop|restart|status}
+ echo $Usage: $0 {start|stop|reload|restart|status}
;;
esac
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 67c0d2d..8b85aa9 100755
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -1,10 +1,19 @@
#!/bin/bash
#
-# scsi_reserve:
+# scsi_reserve persistent reservation service for lvm
#
# chkconfig: 345 25 75
# description: start/stop persistent reservation service for lvm
-# config: /etc/sysconfig/scsi_reserve
+
+### BEGIN INIT INFO
+# Provides:scsi_reserve
+# Required-Start: cman
+# Required-Stop: cman
+# Default-Start: 3 4 5
+# Default-Stop:0 1 2 6
+# Short-Description: start/stop persistent reservation service for lvm
+# Description: start/stop persistent reservation service for lvm
+### END INIT INFO
. /etc/init.d/functions
@@ -154,6 +163,8 @@ case $1 in
failure
fi
+ touch /var/lock/subsys/scsi_reserve
+
echo
;; # end of start
@@ -215,6 +226,8 @@ case $1 in
failure
fi
+ rm -f /var/lock/subsys/scsi_reserve
+
echo
;; # end of stop
@@ -243,6 +256,15 @@ case $1 in
;; # end of status
+restart|reload)
+ $0 stop
+ $0 start
+ ;;
+
+*)
+ echo $Usage: $0 {start|stop|restart|reload|status}
+ exit 1
+
esac
exit $error
diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2
index cafe341..26c99d5 100755
---
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-4-gc2065b8
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=c2065b8a34d1a125f5758da4194ad376320a0130
The branch, master has been updated
via c2065b8a34d1a125f5758da4194ad376320a0130 (commit)
via ad7d8707c68991599ca80cc61f10adb3746ac645 (commit)
from 3938413c0a2ef819d15da44f7e2eaaa5129cf135 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit c2065b8a34d1a125f5758da4194ad376320a0130
Author: Marek 'marx' Grac [EMAIL PROTECTED]
Date: Tue May 13 18:21:44 2008 +0200
[FENCE] Fix typo in name of the exceptions in fencing agents
Exceptions should be pexpect.EOF, pexpect.TIMEOUT (not pexcept.*). This
problem only occured in set_status(). Function get_status() contains
correct exceptions.
commit ad7d8707c68991599ca80cc61f10adb3746ac645
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 14 14:08:54 2008 +0200
[FENCE] Rename bladecenter as it should be .pl - .py
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/apc/fence_apc.py |4 ++--
.../{fence_bladecenter.pl = fence_bladecenter.py} |4 ++--
fence/agents/drac/fence_drac5.py |4 ++--
fence/agents/ilo/fence_ilo.py |4 ++--
fence/agents/wti/fence_wti.py |4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
rename fence/agents/bladecenter/{fence_bladecenter.pl = fence_bladecenter.py}
(98%)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index c9a0571..cdfd74a 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -118,9 +118,9 @@ def set_power_status(conn, options):
conn.send(chr(03))
conn.log_expect(options, - Logout, SHELL_TIMEOUT)
conn.log_expect(options, options[-c], SHELL_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/bladecenter/fence_bladecenter.pl
b/fence/agents/bladecenter/fence_bladecenter.py
similarity index 98%
rename from fence/agents/bladecenter/fence_bladecenter.pl
rename to fence/agents/bladecenter/fence_bladecenter.py
index e049735..d149ede 100755
--- a/fence/agents/bladecenter/fence_bladecenter.pl
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -56,9 +56,9 @@ def set_power_status(conn, options):
conn.log_expect(options, node_cmd, SHELL_TIMEOUT)
conn.send(env -T system\r\n)
conn.log_expect(options, options[-c], SHELL_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
index f3e5a1d..e498d8c 100755
--- a/fence/agents/drac/fence_drac5.py
+++ b/fence/agents/drac/fence_drac5.py
@@ -44,9 +44,9 @@ def set_power_status(conn, options):
try:
conn.sendline(racadm serveraction + action)
conn.log_expect(options, options[-c], POWER_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index dfc9d74..a5471db 100755
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -43,9 +43,9 @@ def set_power_status(conn, options):
try:
conn.send(power + options[-o] + \r\n)
conn.log_expect(options, options[-c], POWER_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index e72d449..68dc58d 100755
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -60,9 +60,9 @@ def set_power_status(conn, options):
try:
conn.send(action + + options[-n] + ,y\r\n)
conn.log_expect(options, options[-c], POWER_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-11-g7083076
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=7083076250b6a0409650a43a8247fd1fb9464c96
The branch, STABLE2 has been updated
via 7083076250b6a0409650a43a8247fd1fb9464c96 (commit)
via db80f768386f41c98c6c9254fea4a97a113506fd (commit)
from a0ed2514cefac4256ba981ffb758210665885e6f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 7083076250b6a0409650a43a8247fd1fb9464c96
Author: Marek 'marx' Grac [EMAIL PROTECTED]
Date: Tue May 13 18:21:44 2008 +0200
[FENCE] Fix typo in name of the exceptions in fencing agents
Exceptions should be pexpect.EOF, pexpect.TIMEOUT (not pexcept.*). This
problem only occured in set_status(). Function get_status() contains
correct exceptions.
commit db80f768386f41c98c6c9254fea4a97a113506fd
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 14 14:08:54 2008 +0200
[FENCE] Rename bladecenter as it should be .pl - .py
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
fence/agents/apc/fence_apc.py |4 ++--
.../{fence_bladecenter.pl = fence_bladecenter.py} |4 ++--
fence/agents/drac/fence_drac5.py |4 ++--
fence/agents/ilo/fence_ilo.py |4 ++--
fence/agents/wti/fence_wti.py |4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
rename fence/agents/bladecenter/{fence_bladecenter.pl = fence_bladecenter.py}
(98%)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index c9a0571..cdfd74a 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -118,9 +118,9 @@ def set_power_status(conn, options):
conn.send(chr(03))
conn.log_expect(options, - Logout, SHELL_TIMEOUT)
conn.log_expect(options, options[-c], SHELL_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/bladecenter/fence_bladecenter.pl
b/fence/agents/bladecenter/fence_bladecenter.py
similarity index 98%
rename from fence/agents/bladecenter/fence_bladecenter.pl
rename to fence/agents/bladecenter/fence_bladecenter.py
index e049735..d149ede 100755
--- a/fence/agents/bladecenter/fence_bladecenter.pl
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -56,9 +56,9 @@ def set_power_status(conn, options):
conn.log_expect(options, node_cmd, SHELL_TIMEOUT)
conn.send(env -T system\r\n)
conn.log_expect(options, options[-c], SHELL_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
index f3e5a1d..e498d8c 100755
--- a/fence/agents/drac/fence_drac5.py
+++ b/fence/agents/drac/fence_drac5.py
@@ -44,9 +44,9 @@ def set_power_status(conn, options):
try:
conn.sendline(racadm serveraction + action)
conn.log_expect(options, options[-c], POWER_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index dfc9d74..a5471db 100755
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -43,9 +43,9 @@ def set_power_status(conn, options):
try:
conn.send(power + options[-o] + \r\n)
conn.log_expect(options, options[-c], POWER_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
fail(EC_CONNECTION_LOST)
- except pexcept.TIMEOUT:
+ except pexpect.TIMEOUT:
fail(EC_TIMED_OUT)
def main():
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index e72d449..68dc58d 100755
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -60,9 +60,9 @@ def set_power_status(conn, options):
try:
conn.send(action + + options[-n] + ,y\r\n)
conn.log_expect(options, options[-c], POWER_TIMEOUT)
- except pexcept.EOF:
+ except pexpect.EOF:
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-5-g56ff4a1
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=56ff4a186e723570327964d66b20dbfb5f609526
The branch, master has been updated
via 56ff4a186e723570327964d66b20dbfb5f609526 (commit)
from c2065b8a34d1a125f5758da4194ad376320a0130 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 56ff4a186e723570327964d66b20dbfb5f609526
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Wed May 14 20:42:27 2008 +0200
[DLM] Remove unused header file
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
dlm/include/list.h | 325
1 files changed, 0 insertions(+), 325 deletions(-)
delete mode 100644 dlm/include/list.h
diff --git a/dlm/include/list.h b/dlm/include/list.h
deleted file mode 100644
index 566b377..000
--- a/dlm/include/list.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* Copied from include/linux/list.h */
-
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- *
- * @ptr:the pointer to the member.
- * @type: the type of the container struct this is embedded in.
- * @member: the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({ \
- const typeof( ((type *)0)-member ) *__mptr = (ptr);\
- (type *)( (char *)__mptr - offsetof(type,member) );})
-
-
-/*
- * These are non-NULL pointers that will result in page faults
- * under normal circumstances, used to verify that nobody uses
- * non-initialized list entries.
- */
-#define LIST_POISON1 ((void *) 0x00100100)
-#define LIST_POISON2 ((void *) 0x00200200)
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions (__xxx) are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
- struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { (name), (name) }
-
-#define LIST_HEAD(name) \
- struct list_head name = LIST_HEAD_INIT(name)
-
-#define INIT_LIST_HEAD(ptr) do { \
- (ptr)-next = (ptr); (ptr)-prev = (ptr); \
-} while (0)
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *new,
- struct list_head *prev,
- struct list_head *next)
-{
- next-prev = new;
- new-next = next;
- new-prev = prev;
- prev-next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
- __list_add(new, head, head-next);
-}
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
-{
- __list_add(new, head-prev, head);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_del(struct list_head * prev, struct list_head * next)
-{
- next-prev = prev;
- prev-next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static inline void list_del(struct list_head *entry)
-{
- __list_del(entry-prev, entry-next);
- entry-next = LIST_POISON1;
- entry-prev = LIST_POISON2;
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static inline void list_del_init(struct list_head *entry)
-{
- __list_del(entry-prev, entry-next);
- INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_move - delete from one list and add as another's head
- * @list: the entry to move
- *
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.00-40-g6324917
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=63249176ce78b00bd3484d23b28c578270d7fb2b
The branch, master has been updated
via 63249176ce78b00bd3484d23b28c578270d7fb2b (commit)
via 8259c6fe39766e87e4112f8260cc68f3fe3ca93c (commit)
via 08b0d3298b67bd8be05c9c854708fe037d70be79 (commit)
from 808735b8d2361585fe1292d32ac32671539ee144 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 63249176ce78b00bd3484d23b28c578270d7fb2b
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 10:51:11 2008 +0200
[GFS] Make gfs build with 2.6.26 (DO NOT USE!)
put_inode has been removed from the main kernel. gfs1 needs
a full porting and review. This commit allows only to build
the module but it will NOT work.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 8259c6fe39766e87e4112f8260cc68f3fe3ca93c
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 10:27:40 2008 +0200
[GNBD] Update gnbd to work with 2.6.26
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
commit 08b0d3298b67bd8be05c9c854708fe037d70be79
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 10:27:12 2008 +0200
[BUILD] Require 2.6.26 kernel to build
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure|2 +-
gfs-kernel/src/gfs/ops_address.c |2 +-
gfs-kernel/src/gfs/ops_super.c |6 ++-
gfs-kernel/src/gfs/quota.c |4 +-
gnbd-kernel/src/gnbd.c | 91 +++---
gnbd-kernel/src/gnbd.h |4 +-
6 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/configure b/configure
index 60ebe9e..1e6c287 100755
--- a/configure
+++ b/configure
@@ -28,7 +28,7 @@ my $ret = 0;
# this should be only the major version without the extra version
# eg. only the first 3 digits
-my $required_kernelversion = '2.6.25';
+my $required_kernelversion = '2.6.26';
my %options = (
help = \$help,
diff --git a/gfs-kernel/src/gfs/ops_address.c b/gfs-kernel/src/gfs/ops_address.c
index 9360ebe..c17d6c4 100644
--- a/gfs-kernel/src/gfs/ops_address.c
+++ b/gfs-kernel/src/gfs/ops_address.c
@@ -417,7 +417,7 @@ gfs_commit_write(struct file *file, struct page *page,
if (inode-i_size file_size)
i_size_write(inode, file_size);
} else {
- error = generic_commit_write(file, page, from, to);
+ error = block_commit_write(page, from, to);
if (error)
goto fail;
}
diff --git a/gfs-kernel/src/gfs/ops_super.c b/gfs-kernel/src/gfs/ops_super.c
index 7f92691..1ee2d93 100644
--- a/gfs-kernel/src/gfs/ops_super.c
+++ b/gfs-kernel/src/gfs/ops_super.c
@@ -70,6 +70,9 @@ gfs_write_inode(struct inode *inode, int sync)
* data. So, sync it out.
*/
+// XXX FIX ME!
+
+#if 0
static void
gfs_put_inode(struct inode *inode)
{
@@ -84,6 +87,7 @@ gfs_put_inode(struct inode *inode)
!sdp-sd_args.ar_localcaching)
gfs_sync_page_i(inode, DIO_START | DIO_WAIT);
}
+#endif
/**
* gfs_put_super - Unmount the filesystem
@@ -455,7 +459,7 @@ gfs_show_options(struct seq_file *s, struct vfsmount *mnt)
struct super_operations gfs_super_ops = {
.write_inode = gfs_write_inode,
- .put_inode = gfs_put_inode,
+ // XXX FIX ME .put_inode = gfs_put_inode,
.put_super = gfs_put_super,
.write_super = gfs_write_super,
.write_super_lockfs = gfs_write_super_lockfs,
diff --git a/gfs-kernel/src/gfs/quota.c b/gfs-kernel/src/gfs/quota.c
index 211b416..9822ab6 100644
--- a/gfs-kernel/src/gfs/quota.c
+++ b/gfs-kernel/src/gfs/quota.c
@@ -960,8 +960,8 @@ print_quota_message(struct gfs_sbd *sdp, struct
gfs_quota_data *qd, char *type)
if (current-signal) {
tty = current-signal-tty;
- if (tty tty-driver-write)
- tty-driver-write(tty, line, len);
+ if (tty tty-ops-write)
+ tty-ops-write(tty, line, len);
}
kfree(line);
diff --git a/gnbd-kernel/src/gnbd.c b/gnbd-kernel/src/gnbd.c
index 21ecf9d..f65be50 100644
--- a/gnbd-kernel/src/gnbd.c
+++ b/gnbd-kernel/src/gnbd.c
@@ -69,26 +69,25 @@ static spinlock_t gnbd_lock = SPIN_LOCK_UNLOCKED;
#define to_gnbd_dev(d) container_of(d, struct gnbd_device, class_dev)
-static void gnbd_class_release(struct class_device *class_dev)
+static void gnbd_class_release(struct device
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.00-44-g35e9ac5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project Cluster Project.
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=35e9ac574a7501d3ed3fb02da36d230611aa5284
The branch, master has been updated
via 35e9ac574a7501d3ed3fb02da36d230611aa5284 (commit)
from 8226258ee9cbfcb6926c01bfa83c7b902e521b61 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 35e9ac574a7501d3ed3fb02da36d230611aa5284
Author: Fabio M. Di Nitto [EMAIL PROTECTED]
Date: Tue May 13 21:02:34 2008 +0200
[BUILD] Move fencelib in /usr/share
Python bytecompiled objectes are arch indipendent. Move
the whole thing where it belongs.
Signed-off-by: Fabio M. Di Nitto [EMAIL PROTECTED]
---
Summary of changes:
configure |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 1e6c287..2c9ad4e 100755
--- a/configure
+++ b/configure
@@ -255,7 +255,7 @@ if ($help || !$err) {
print --xenlibdir=\tthe base directory for xen libraries. (Default:
{libdir})\n;
print --fence_agents=\tlist of fence agents to configure. (Default:
all)\n;
print \t\tUse --fence_agents=help for a list\n;
- print --fenceagentslibdir=\tspecify directory where to install common fence
python lib. (Default: /usr/lib/fence)\n;
+ print --fenceagentslibdir=\tspecify directory where to install common fence
python lib. (Default: /usr/share/fence)\n;
print --enable_crack_of_the_day\tEnable build of highly experimental
features that rely on code that is not yet available for general use. (Default:
no)\n;
print --enable_xen\tEnable building of Xen-specific pieces\n;
print --without_ccs\tDisable ccs building (Default: enabled)\n;
@@ -551,7 +551,7 @@ if (!$fence_agents) {
$fence_agents=all;
}
if (!$fenceagentslibdir) {
- $fenceagentslibdir=/usr/lib/fence;
+ $fenceagentslibdir=/usr/share/fence;
}
if (!$enable_crack_of_the_day) {
$enable_crack_of_the_day=;
hooks/post-receive
--
Cluster Project
