[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-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, 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/passthrou
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-8-gef50cab
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=ef50cab216748d5528594212d62a8f5893275fbd
The branch, master has been updated
via ef50cab216748d5528594212d62a8f5893275fbd (commit)
from 81c7417b376de2f1d4a0bd6cb0f279f37c88af7b (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 ef50cab216748d5528594212d62a8f5893275fbd
Author: Fabio M. Di Nitto <[EMAIL PROTECTED]>
Date: Fri May 16 07:51:14 2008 +0200
[BUILD] Free toplevel config/ dir
Signed-off-by: Fabio M. Di Nitto <[EMAIL PROTECTED]>
---
Summary of changes:
fence/agents/ipmilan/ipmilan.c |2 +-
{config => make}/copyright.cf |0
make/defines.mk.input |2 +-
make/fencebuild.mk |2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename {config => make}/copyright.cf (100%)
diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c
index b476701..b9a48ca 100644
--- a/fence/agents/ipmilan/ipmilan.c
+++ b/fence/agents/ipmilan/ipmilan.c
@@ -45,7 +45,7 @@
#define log(lvl, fmt, args...) fprintf(stderr, fmt, ##args)
#include
-#include
+#include "copyright.cf"
#include "expect.h"
diff --git a/config/copyright.cf b/make/copyright.cf
similarity index 100%
rename from config/copyright.cf
rename to make/copyright.cf
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 173e0bb..dec3ed5 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -31,7 +31,7 @@ CC = @CC@
AR = ar
RANLIB = ranlib
-CFLAGS += @CFLAGS@ [EMAIL PROTECTED]@/config
+CFLAGS += @CFLAGS@ [EMAIL PROTECTED]@/make
CFLAGS += -DDEFAULT_CONFIG_DIR=\"@[EMAIL PROTECTED]"
-DDEFAULT_CONFIG_FILE=\"@[EMAIL PROTECTED]"
CFLAGS += -DLOGDIR=\"@[EMAIL PROTECTED]" [EMAIL PROTECTED]@
LDFLAGS += @LDFLAGS@
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 27880be..873646e 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -12,7 +12,7 @@ include $(OBJDIR)/make/uninstall.mk
$(TARGET):
${FENCEPARSE} \
- ${SRCDIR}/config/copyright.cf REDHAT_COPYRIGHT \
+ ${SRCDIR}/make/copyright.cf REDHAT_COPYRIGHT \
${RELEASE_VERSION} \
$(S) $@ | \
sed \
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 () {
$_ =~ 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, 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, RHEL4, updated. gfs-kernel_2_6_9_76-60-g81fb3e1
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=81fb3e1a6e602aba2bd5b9c8e2607f1512bea5dd
The branch, RHEL4 has been updated
via 81fb3e1a6e602aba2bd5b9c8e2607f1512bea5dd (commit)
from 08e09d7b4dd2cf1d05b83ac4dd57f819d617db7f (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 81fb3e1a6e602aba2bd5b9c8e2607f1512bea5dd
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, RHEL5, updated. cmirror_1_1_15-86-g2efffab
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=2efffab5f6d58ac8a8ae90f07f8a68f5452e763e
The branch, RHEL5 has been updated
via 2efffab5f6d58ac8a8ae90f07f8a68f5452e763e (commit)
from 1e8f2448af70eb5907b27a9a5f033f0dacc4afc0 (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 2efffab5f6d58ac8a8ae90f07f8a68f5452e763e
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 5c4e5a1..03b9745 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, RHEL5, updated. cmirror_1_1_15-77-ga228955
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=a228955f193c0aeb2b845871d82c8275634c1b40 The branch, RHEL5 has been updated via a228955f193c0aeb2b845871d82c8275634c1b40 (commit) from 2c42fa7247c3dab78473c5019b03648b40a77dae (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 a228955f193c0aeb2b845871d82c8275634c1b40 Author: Jonathan Brassow <[EMAIL PROTECTED]> Date: Thu May 15 15:09:47 2008 -0500 rgmanager/lvm.sh: Fix bug 446260 (HA LVM doesn't work on IA64) switch: $(find /boot/*.img -newer /etc/lvm/lvm.conf) to: $(find /boot -name *.img -newer /etc/lvm/lvm.conf) Could be better still if there was a way of knowing which initrd we used when booting... --- Summary of changes: rgmanager/src/resources/lvm.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index 4c93249..ffb0b21 100755 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -91,7 +91,7 @@ function ha_lvm_proper_setup_check # the control of rgmanager ## # Fixme: we might be able to perform a better check... - if [ "$(find /boot/*.img -newer /etc/lvm/lvm.conf)" == "" ]; then + if [ "$(find /boot -name *.img -newer /etc/lvm/lvm.conf)" == "" ]; then ocf_log err "HA LVM: Improper setup detected" ocf_log err "- initrd image needs to be newer than lvm.conf" return $OCF_ERR_GENERIC hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-59-g08e09d7
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=08e09d7b4dd2cf1d05b83ac4dd57f819d617db7f The branch, RHEL4 has been updated via 08e09d7b4dd2cf1d05b83ac4dd57f819d617db7f (commit) from e5142bcc8e6135fac357c1398da110d21a27a21e (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 08e09d7b4dd2cf1d05b83ac4dd57f819d617db7f Author: Jonathan Brassow <[EMAIL PROTECTED]> Date: Thu May 15 15:13:40 2008 -0500 ger/lvm.sh: Fix bug 446744 (HA LVM doesn't work on IA64) switch: $(find /boot/*.img -newer /etc/lvm/lvm.conf) to: $(find /boot -name *.img -newer /etc/lvm/lvm.conf) Could be better still if there was a way of knowing which initrd we used when booting... --- Summary of changes: rgmanager/src/resources/lvm.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index fc44b09..70355c6 100755 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -91,7 +91,7 @@ function ha_lvm_proper_setup_check # the control of rgmanager ## # Fixme: we might be able to perform a better check... - if [ "$(find /boot/*.img -newer /etc/lvm/lvm.conf)" == "" ]; then + if [ "$(find /boot -name *.img -newer /etc/lvm/lvm.conf)" == "" ]; then ocf_log err "HA LVM: Improper setup detected" ocf_log err "- initrd image needs to be newer than lvm.conf" return $OCF_ERR_GENERIC hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.02-12-g776b7f3
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=776b7f3d3d78891d2c79818c0fa9dc54c8449a13 The branch, STABLE2 has been updated via 776b7f3d3d78891d2c79818c0fa9dc54c8449a13 (commit) from 7083076250b6a0409650a43a8247fd1fb9464c96 (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 776b7f3d3d78891d2c79818c0fa9dc54c8449a13 Author: Jonathan Brassow <[EMAIL PROTECTED]> Date: Thu May 15 15:24:14 2008 -0500 ger/lvm.sh: HA LVM wasn't working on IA64 switch: $(find /boot/*.img -newer /etc/lvm/lvm.conf) to: $(find /boot -name *.img -newer /etc/lvm/lvm.conf) Could be better still if there was a way of knowing which initrd we used when booting... --- Summary of changes: rgmanager/src/resources/lvm.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index 4c93249..ffb0b21 100755 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -91,7 +91,7 @@ function ha_lvm_proper_setup_check # the control of rgmanager ## # Fixme: we might be able to perform a better check... - if [ "$(find /boot/*.img -newer /etc/lvm/lvm.conf)" == "" ]; then + if [ "$(find /boot -name *.img -newer /etc/lvm/lvm.conf)" == "" ]; then ocf_log err "HA LVM: Improper setup detected" ocf_log err "- initrd image needs to be newer than lvm.conf" return $OCF_ERR_GENERIC hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-6-gdaff41e
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=daff41e06bbb8a5332ede4e0addf4d8f94b7d33a The branch, master has been updated via daff41e06bbb8a5332ede4e0addf4d8f94b7d33a (commit) from 56ff4a186e723570327964d66b20dbfb5f609526 (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 daff41e06bbb8a5332ede4e0addf4d8f94b7d33a Author: Jonathan Brassow <[EMAIL PROTECTED]> Date: Thu May 15 15:17:28 2008 -0500 rgmanager/lvm.sh: HA LVM wasn't working on IA64 switch: $(find /boot/*.img -newer /etc/lvm/lvm.conf) to: $(find /boot -name *.img -newer /etc/lvm/lvm.conf) Could be better still if there was a way of knowing which initrd we used when booting... --- Summary of changes: rgmanager/src/resources/lvm.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh index 4c93249..ffb0b21 100755 --- a/rgmanager/src/resources/lvm.sh +++ b/rgmanager/src/resources/lvm.sh @@ -91,7 +91,7 @@ function ha_lvm_proper_setup_check # the control of rgmanager ## # Fixme: we might be able to perform a better check... - if [ "$(find /boot/*.img -newer /etc/lvm/lvm.conf)" == "" ]; then + if [ "$(find /boot -name *.img -newer /etc/lvm/lvm.conf)" == "" ]; then ocf_log err "HA LVM: Improper setup detected" ocf_log err "- initrd image needs to be newer than lvm.conf" return $OCF_ERR_GENERIC hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-76-g2c42fa7
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=2c42fa7247c3dab78473c5019b03648b40a77dae
The branch, RHEL5 has been updated
via 2c42fa7247c3dab78473c5019b03648b40a77dae (commit)
from 4bb2322b04209f54dd5d3f35efb79cf8b97b7867 (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 2c42fa7247c3dab78473c5019b03648b40a77dae
Author: Jonathan Brassow <[EMAIL PROTECTED]>
Date: Thu May 15 13:33:50 2008 -0500
clogd: Almost introduced a memory leak
When asking the kernel to resend a request, we still need
to place the data container we would have used back on the
free list.
---
Summary of changes:
cmirror/src/local.c |7 +++
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/cmirror/src/local.c b/cmirror/src/local.c
index d7f9f8c..44e7243 100644
--- a/cmirror/src/local.c
+++ b/cmirror/src/local.c
@@ -126,13 +126,12 @@ static int kernel_recv(struct clog_tfr **tfr)
if (!(*tfr)->request_type) {
LOG_DBG("Bad transmission, requesting resend [%u]",
msg->seq);
+ r = -EAGAIN;
+
if (kernel_ack(msg->seq, EAGAIN)) {
LOG_ERROR("Failed to NACK kernel transmission
[%u]",
msg->seq);
r = -EBADE;
- } else {
- r = 0;
- *tfr = NULL;
}
}
break;
@@ -147,7 +146,7 @@ fail:
*tfr = NULL;
}
- return r;
+ return (r == -EAGAIN) ? 0 : r;
}
static int kernel_send_helper(void *data, int out_size)
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-75-g4bb2322
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=4bb2322b04209f54dd5d3f35efb79cf8b97b7867
The branch, RHEL5 has been updated
via 4bb2322b04209f54dd5d3f35efb79cf8b97b7867 (commit)
from 0f92723caa7573894d2ce1b8c3271bce564b5726 (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 4bb2322b04209f54dd5d3f35efb79cf8b97b7867
Author: Jonathan Brassow <[EMAIL PROTECTED]>
Date: Thu May 15 13:24:22 2008 -0500
clogd: No reason to alarm ppl with error messages during a retry
Previous output:
clogd[1485]: Bad transmission, requesting resend [275462]
clogd[1485]: Bad callback on local/4
I don't think these error messages are necessary when simply
requesting a resend on an unreliable interface.
---
Summary of changes:
cmirror/src/local.c | 15 ---
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cmirror/src/local.c b/cmirror/src/local.c
index 4d66e17..d7f9f8c 100644
--- a/cmirror/src/local.c
+++ b/cmirror/src/local.c
@@ -57,9 +57,8 @@ static int kernel_ack(uint32_t seq, int error)
* kernel_recv
* @tfr: the newly allocated request from kernel
*
- * Read requests from the kernel and allocate
- * space for the new request. If there is no
- * request from the kernel, *tfr is NULL.
+ * Read requests from the kernel and allocate space for the new request.
+ * If there is no request from the kernel, *tfr is NULL.
*
* Returns: 0 on success, -EXXX on error
*/
@@ -126,13 +125,15 @@ static int kernel_recv(struct clog_tfr **tfr)
memcpy(*tfr, msg->data, msg->len);
if (!(*tfr)->request_type) {
- LOG_ERROR("Bad transmission, requesting resend [%u]",
msg->seq);
+ LOG_DBG("Bad transmission, requesting resend [%u]",
msg->seq);
if (kernel_ack(msg->seq, EAGAIN)) {
LOG_ERROR("Failed to NACK kernel transmission
[%u]",
msg->seq);
r = -EBADE;
- } else
- r = -EAGAIN;
+ } else {
+ r = 0;
+ *tfr = NULL;
+ }
}
break;
default:
@@ -200,7 +201,7 @@ static int do_local_work(void *data)
return r;
if (!tfr)
- return -EBADE;
+ return 0;
LOG_DBG("[%s] Request from kernel received: [%s/%u]",
SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-74-g0f92723
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=0f92723caa7573894d2ce1b8c3271bce564b5726
The branch, RHEL5 has been updated
via 0f92723caa7573894d2ce1b8c3271bce564b5726 (commit)
from a21d1c03600e011cf1ee132100ac823bf3478877 (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 0f92723caa7573894d2ce1b8c3271bce564b5726
Author: Jonathan Brassow <[EMAIL PROTECTED]>
Date: Thu May 15 13:07:55 2008 -0500
clogd: Add missing check for SA_AIS_ERR_TRY_AGAIN when unlinking ckpt
Retry when SA_AIS_ERR_TRY_AGAIN is received from saCkptCheckpointUnlink
---
Summary of changes:
cmirror/src/cluster.c |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cmirror/src/cluster.c b/cmirror/src/cluster.c
index dcb2806..b928fe2 100644
--- a/cmirror/src/cluster.c
+++ b/cmirror/src/cluster.c
@@ -528,7 +528,13 @@ open_retry:
ckpt_print ("Before unlink", h);
- saCkptCheckpointUnlink(ckpt_handle, &name);
+unlink_retry:
+ rv = saCkptCheckpointUnlink(ckpt_handle, &name);
+ if (rv == SA_AIS_ERR_TRY_AGAIN) {
+ LOG_ERROR("import_checkpoint: ckpt unlink retry");
+ sleep(1);
+ goto unlink_retry;
+ }
if (no_read) {
LOG_DBG("Checkpoint for this log already received");
hooks/post-receive
--
Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-73-ga21d1c0
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=a21d1c03600e011cf1ee132100ac823bf3478877
The branch, RHEL5 has been updated
via a21d1c03600e011cf1ee132100ac823bf3478877 (commit)
from 607cd9680d773fff362144249328c3b6d75a4443 (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 a21d1c03600e011cf1ee132100ac823bf3478877
Author: Jonathan Brassow <[EMAIL PROTECTED]>
Date: Thu May 15 13:02:19 2008 -0500
clogd + dm-log-clustered: Improve communication error handling (K <-> U)
Connector (netlink) is an unreliable protocol. From time to time, I get
a connector header in userspace that has all the right fields (seq #, size
of data, etc), but the data is all zeros. When this happens, I use the seq
number in the header to request the kernel to resend the request. This
should avoid those nasty 'Invalid request' messages... which are then
followed by 'Request timed out' (because the invalid request was ignored).
---
Summary of changes:
cmirror-kernel/src/dm-clog-tfr.c | 124 +---
cmirror/src/local.c | 130 +-
2 files changed, 157 insertions(+), 97 deletions(-)
diff --git a/cmirror-kernel/src/dm-clog-tfr.c b/cmirror-kernel/src/dm-clog-tfr.c
index 61f6f21..7abd554 100644
--- a/cmirror-kernel/src/dm-clog-tfr.c
+++ b/cmirror-kernel/src/dm-clog-tfr.c
@@ -62,7 +62,7 @@ static int dm_clog_sendto_server(struct clog_tfr *tfr)
msg->id.idx = cn_clog_id.idx;
msg->id.val = cn_clog_id.val;
msg->ack = 0;
- msg->seq = 0;
+ msg->seq = tfr->seq;
msg->len = sizeof(struct clog_tfr) + tfr->data_size;
r = cn_netlink_send(msg, 0, gfp_any());
@@ -73,47 +73,67 @@ static int dm_clog_sendto_server(struct clog_tfr *tfr)
return r;
}
-static void cn_clog_callback(void *data)
+/*
+ * fill_pkg
+ * @msg
+ * @tfr
+ *
+ * Parameters can be either msg or tfr, but not both. This
+ * function fills in the reply for a waiting request. If just
+ * msg is given, then the reply is simply an ACK from userspace
+ * that the request was received.
+ *
+ * Returns: 0 on success, -ENOENT on failure
+ */
+static int fill_pkg(struct cn_msg *msg, struct clog_tfr *tfr)
{
- int found = 0;
- struct cn_msg *msg = (struct cn_msg *)data;
- struct clog_tfr *tfr = (struct clog_tfr *)(msg + 1);
+ uint32_t rtn_seq = (msg) ? msg->seq : (tfr) ? tfr->seq : 0;
struct receiving_pkg *pkg;
- spin_lock(&receiving_list_lock);
- if (msg->len < sizeof(*tfr)) {
- DMERR("Incomplete message received from cluster log server");
- spin_unlock(&receiving_list_lock);
- return;
- }
-
list_for_each_entry(pkg, &receiving_list, list) {
- /*
- DMINFO("Msg from userspace received [%s].",
RQ_TYPE(tfr->request_type));
- DMINFO(" Seq # received: %uSeq # wanted: %u",
- pkg->seq, tfr->seq);
- */
- if (tfr->seq == pkg->seq) {
- if (tfr->data_size > *(pkg->data_size)) {
- DMERR("Insufficient space to receive package
[%s]",
- RQ_TYPE(tfr->request_type));
- *(pkg->data_size) = 0;
- pkg->error = -ENOSPC;
- } else {
- pkg->error = tfr->error;
- memcpy(pkg->data, tfr->data, tfr->data_size);
- *(pkg->data_size) = tfr->data_size;
- }
- found = 1;
- complete(&pkg->complete);
- break;
+ if (rtn_seq != pkg->seq)
+ continue;
+
+ if (msg) {
+ pkg->error = -msg->ack;
+ *(pkg->data_size) = 0;
+ } else if (tfr->data_size > *(pkg->data_size)) {
+ DMERR("Insufficient space to receive package [%s]",
+ RQ_TYPE(tfr->request_type));
+ *(pkg->data_size) = 0;
+ pkg->error = -ENOSPC;
+ } else {
+ pkg->error = tfr->error;
+ memcpy(pkg->data, tfr->data, tfr->data_size);
+ *(pkg->data_size) = tfr->data_size;
}
+ complete(&pkg->complete);
+
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-72-g607cd96
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=607cd9680d773fff362144249328c3b6d75a4443
The branch, RHEL5 has been updated
via 607cd9680d773fff362144249328c3b6d75a4443 (commit)
from 685498d154acfff23e4af7bfe874a7b0ed2eb9c5 (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 607cd9680d773fff362144249328c3b6d75a4443
Author: Jonathan Brassow <[EMAIL PROTECTED]>
Date: Wed May 14 14:24:24 2008 -0500
clogd + dm-log-clustered: Change 64bit seq number to 32 bits
Having a 32-bit seq number matches better with the connector
seq number length. I don't have to worry about rollover anyway.
---
Summary of changes:
cmirror-kernel/src/dm-clog-tfr.c | 12 ++--
cmirror-kernel/src/dm-clog-tfr.h |2 +-
cmirror/src/cluster.c| 32
cmirror/src/functions.c |8
cmirror/src/local.c |4 ++--
cmirror/src/queues.c | 12 ++--
6 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/cmirror-kernel/src/dm-clog-tfr.c b/cmirror-kernel/src/dm-clog-tfr.c
index 6126691..61f6f21 100644
--- a/cmirror-kernel/src/dm-clog-tfr.c
+++ b/cmirror-kernel/src/dm-clog-tfr.c
@@ -16,7 +16,7 @@
#define SHORT_UUID(x) (strlen(x) > 8) ? ((x) + (strlen(x) - 8)) : (x)
-static uint64_t seq = 0;
+static uint32_t seq = 0;
/*
* Pre-allocated space for speed
@@ -33,7 +33,7 @@ struct receiving_pkg {
struct completion complete;
unsigned long long start_time;
- uint64_t seq;
+ uint32_t seq;
int error;
int *data_size;
@@ -90,7 +90,7 @@ static void cn_clog_callback(void *data)
list_for_each_entry(pkg, &receiving_list, list) {
/*
DMINFO("Msg from userspace received [%s].",
RQ_TYPE(tfr->request_type));
- DMINFO(" Seq # received: %lluSeq # wanted: %llu",
+ DMINFO(" Seq # received: %uSeq # wanted: %u",
pkg->seq, tfr->seq);
*/
if (tfr->seq == pkg->seq) {
@@ -112,7 +112,7 @@ static void cn_clog_callback(void *data)
spin_unlock(&receiving_list_lock);
if (!found)
- DMERR("Stray request returned: %s, %llu",
+ DMERR("Stray request returned: %s, %u",
RQ_TYPE(tfr->request_type), tfr->seq);
}
@@ -188,7 +188,7 @@ resend:
r = wait_for_completion_timeout(&(pkg.complete), 15 * HZ);
if (!r) {
- DMWARN("[%s] Request timed out: [%s/%llu] - retrying",
+ DMWARN("[%s] Request timed out: [%s/%u] - retrying",
SHORT_UUID(uuid), RQ_TYPE(request_type), pkg.seq);
spin_lock(&receiving_list_lock);
list_del_init(&(pkg.list));
@@ -200,7 +200,7 @@ resend:
pkg.start_time = (jiffies - pkg.start_time);
do_div(pkg.start_time, HZ);
if (pkg.start_time > 0)
- DMWARN("Excessive delay in request processing, %llu
sec: [%s/%llu]",
+ DMWARN("Excessive delay in request processing, %llu
sec: [%s/%u]",
pkg.start_time, RQ_TYPE(request_type),
pkg.seq);
}
diff --git a/cmirror-kernel/src/dm-clog-tfr.h b/cmirror-kernel/src/dm-clog-tfr.h
index e12d39a..bdf4b6d 100644
--- a/cmirror-kernel/src/dm-clog-tfr.h
+++ b/cmirror-kernel/src/dm-clog-tfr.h
@@ -56,7 +56,7 @@ struct clog_tfr {
int error; /* Used by server to inform of errors */
uint32_t originator;/* Cluster ID of this machine */
- uint64_t seq; /* Sequence number for request */
+ uint32_t seq; /* Sequence number for request */
uint32_t request_type; /* DM_CLOG_* */
uint32_t data_size; /* How much data (not including this struct) */
char data[0];
diff --git a/cmirror/src/cluster.c b/cmirror/src/cluster.c
index 19b3ef0..dcb2806 100644
--- a/cmirror/src/cluster.c
+++ b/cmirror/src/cluster.c
@@ -156,10 +156,10 @@ static int handle_cluster_request(struct clog_tfr *tfr,
int server, int printz)
* Errors from previous functions are in the tfr struct.
*/
if (printz)
- LOG_DBG("[%s] Sending response to %u on cluster:
[%s/%llu]",
+ LOG_DBG("[%s] Sending response to %u on cluster:
[%s/%u]",
SHORT_UUID(tfr->uuid), tfr->originato
