summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/common/cmdline.c4
-rw-r--r--ctdb/common/ctdb_util.c19
-rw-r--r--ctdb/direct/4nodes.txt8
-rw-r--r--ctdb/direct/nodes.txt4
-rw-r--r--ctdb/ib/README.txt9
-rw-r--r--ctdb/include/ctdb_private.h3
-rw-r--r--ctdb/packaging/RHEL/ctdb.spec34
-rwxr-xr-xctdb/packaging/RHEL/makerpms.sh2
-rw-r--r--ctdb/tests/1node.txt2
-rw-r--r--ctdb/tests/4nodes.txt8
-rwxr-xr-xctdb/tests/bench-ssh.sh2
-rwxr-xr-xctdb/tests/bench.sh2
-rwxr-xr-xctdb/tests/fetch.sh2
-rwxr-xr-xctdb/tests/messaging.sh2
-rw-r--r--ctdb/tests/nodes.txt5
-rwxr-xr-xctdb/tests/recover.sh6
-rwxr-xr-xctdb/tests/test.sh2
17 files changed, 50 insertions, 64 deletions
diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index 19a31514ae..071b50b435 100644
--- a/ctdb/common/cmdline.c
+++ b/ctdb/common/cmdline.c
@@ -39,12 +39,12 @@ static struct {
const char *logfile;
const char *events;
} ctdb_cmdline = {
- .nlist = NULL,
+ .nlist = "/etc/ctdb/nodes",
.transport = "tcp",
.myaddress = NULL,
.socketname = CTDB_PATH,
.self_connect = 0,
- .db_dir = NULL,
+ .db_dir = VARDIR "/ctdb",
.torture = 0,
.logfile = NULL,
};
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 437d0341b5..d88b809f14 100644
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -65,15 +65,18 @@ int ctdb_parse_address(struct ctdb_context *ctdb,
TALLOC_CTX *mem_ctx, const char *str,
struct ctdb_address *address)
{
- char *p;
- p = strchr(str, ':');
- if (p == NULL) {
- ctdb_set_error(ctdb, "Badly formed node '%s'\n", str);
- return -1;
- }
+ struct servent *se;
+
+ setservent(0);
+ se = getservbyname("ctdb", "tcp");
+ endservent();
- address->address = talloc_strndup(mem_ctx, str, p-str);
- address->port = strtoul(p+1, NULL, 0);
+ address->address = talloc_strdup(mem_ctx, str);
+ if (se == NULL) {
+ address->port = CTDB_PORT;
+ } else {
+ address->port = ntohs(se->s_port);
+ }
return 0;
}
diff --git a/ctdb/direct/4nodes.txt b/ctdb/direct/4nodes.txt
index 880fe914ff..99b07328b3 100644
--- a/ctdb/direct/4nodes.txt
+++ b/ctdb/direct/4nodes.txt
@@ -1,4 +1,4 @@
-127.0.0.1:9001
-127.0.0.2:9001
-127.0.0.3:9001
-127.0.0.4:9001
+127.0.0.1
+127.0.0.2
+127.0.0.3
+127.0.0.4
diff --git a/ctdb/direct/nodes.txt b/ctdb/direct/nodes.txt
index e1198b59ac..8cc2716bce 100644
--- a/ctdb/direct/nodes.txt
+++ b/ctdb/direct/nodes.txt
@@ -1,2 +1,2 @@
-127.0.0.1:9001
-127.0.0.2:9001
+127.0.0.1
+127.0.0.2
diff --git a/ctdb/ib/README.txt b/ctdb/ib/README.txt
index 74fc129c35..40419829ca 100644
--- a/ctdb/ib/README.txt
+++ b/ctdb/ib/README.txt
@@ -11,10 +11,9 @@ After then:
Example for testing
===================
-bin/ctdb_test --transport ib --nlist ../2nodes_rm.txt --listen 10.0.0.1:9001
-bin/ctdb_test --transport ib --nlist ../2nodes_rm.txt --listen 10.0.0.2:9001
+bin/ctdb_test --transport ib --nlist ../2nodes_rm.txt --listen 10.0.0.1
+bin/ctdb_test --transport ib --nlist ../2nodes_rm.txt --listen 10.0.0.2
where 2nodes_rm.txt:
-10.0.0.1:9001
-10.0.0.2:9001
-
+10.0.0.1
+10.0.0.2
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 74c08e0b0e..37176748e9 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -28,6 +28,9 @@
/* location of daemon socket */
#define CTDB_PATH "/tmp/ctdb.socket"
+/* default ctdb port number */
+#define CTDB_PORT 9001
+
/* we must align packets to ensure ctdb works on all architectures (eg. sparc) */
#define CTDB_DS_ALIGNMENT 8
diff --git a/ctdb/packaging/RHEL/ctdb.spec b/ctdb/packaging/RHEL/ctdb.spec
index 67564fa930..9d7f4ddcdc 100644
--- a/ctdb/packaging/RHEL/ctdb.spec
+++ b/ctdb/packaging/RHEL/ctdb.spec
@@ -12,7 +12,7 @@ Group: System Environment/Daemons
URL: bzr://www.samba.org/~tridge/ctdb/
Source: ctdb-%{version}.tar.bz2
-Source999: setup.tar.bz2
+Source999: ctdb-setup.tar.bz2
Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
Prereq: fileutils sed /etc/init.d
@@ -36,15 +36,7 @@ ctdb is the clustered database used by samba
%build
-# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
-
-## check for ccache
-# ccache -h 2>&1 > /dev/null
-#if [ $? -eq 0 ]; then
-# CC="ccache gcc"
-#else
- CC="gcc"
-#fi
+CC="gcc"
## always run autogen.sh
./autogen.sh
@@ -52,11 +44,8 @@ ctdb is the clustered database used by samba
CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--prefix=%{_prefix} \
-make showflags
-
make
-
%install
# Clean up in case there is trash left from a previous build
rm -rf $RPM_BUILD_ROOT
@@ -65,12 +54,11 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-make DESTDIR=$RPM_BUILD_ROOT \
- install
+make DESTDIR=$RPM_BUILD_ROOT install
install -m644 setup/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
install -m755 setup/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
@@ -106,15 +94,7 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/ctdb
%attr(755,root,root) %config %{initdir}/ctdb
-%{_bindir}/ctdbd
-%{_bindir}/ctdb_test
-%{_bindir}/ctdbd_test
-%{_bindir}/ctdb_control
-%{_bindir}/ctdb_bench
-%{_bindir}/ctdb_fetch
-%{_bindir}/ctdb_fetch1
-%{_bindir}/ctdb_messaging
-%{_bindir}/lockwait
+%{_sysconfdir}/ctdb/events
+%{_sbindir}/ctdbd
+%{_bindir}/ctdb
%{_includedir}/ctdb.h
-
-
diff --git a/ctdb/packaging/RHEL/makerpms.sh b/ctdb/packaging/RHEL/makerpms.sh
index 3becfa65ec..d638b4ab57 100755
--- a/ctdb/packaging/RHEL/makerpms.sh
+++ b/ctdb/packaging/RHEL/makerpms.sh
@@ -71,7 +71,7 @@ popd
##
## copy additional source files
##
-tar --exclude=.svn -jcvf - setup > ${SRCDIR}/setup.tar.bz2
+tar --exclude=.svn -jcvf - setup > ${SRCDIR}/ctdb-setup.tar.bz2
cp -p ${SPECFILE} ${SPECDIR}
##
diff --git a/ctdb/tests/1node.txt b/ctdb/tests/1node.txt
index db4350c0c0..7b9ad531d2 100644
--- a/ctdb/tests/1node.txt
+++ b/ctdb/tests/1node.txt
@@ -1 +1 @@
-127.0.0.1:9001
+127.0.0.1
diff --git a/ctdb/tests/4nodes.txt b/ctdb/tests/4nodes.txt
index 880fe914ff..99b07328b3 100644
--- a/ctdb/tests/4nodes.txt
+++ b/ctdb/tests/4nodes.txt
@@ -1,4 +1,4 @@
-127.0.0.1:9001
-127.0.0.2:9001
-127.0.0.3:9001
-127.0.0.4:9001
+127.0.0.1
+127.0.0.2
+127.0.0.3
+127.0.0.4
diff --git a/ctdb/tests/bench-ssh.sh b/ctdb/tests/bench-ssh.sh
index 8716156e3a..92f81a7297 100755
--- a/ctdb/tests/bench-ssh.sh
+++ b/ctdb/tests/bench-ssh.sh
@@ -18,7 +18,7 @@ echo "Creating nodes-ssh.txt"
rm -f nodes-ssh.txt
count=0
for h in $nodes; do
- echo "$h:9001" >> nodes-ssh.txt
+ echo "$h" >> nodes-ssh.txt
count=`expr $count + 1`
done
diff --git a/ctdb/tests/bench.sh b/ctdb/tests/bench.sh
index f9430919ea..74d8785bcb 100755
--- a/ctdb/tests/bench.sh
+++ b/ctdb/tests/bench.sh
@@ -9,7 +9,7 @@ fi
rm -f nodes.txt
for i in `seq 1 $NUMNODES`; do
- echo 127.0.0.$i:9001 >> nodes.txt
+ echo 127.0.0.$i >> nodes.txt
done
killall -9 ctdb_bench
diff --git a/ctdb/tests/fetch.sh b/ctdb/tests/fetch.sh
index fb384e2935..a17dc76e05 100755
--- a/ctdb/tests/fetch.sh
+++ b/ctdb/tests/fetch.sh
@@ -7,7 +7,7 @@ fi
rm -f nodes.txt
for i in `seq 1 $NUMNODES`; do
- echo 127.0.0.$i:9001 >> nodes.txt
+ echo 127.0.0.$i >> nodes.txt
done
killall -9 ctdb_fetch
diff --git a/ctdb/tests/messaging.sh b/ctdb/tests/messaging.sh
index 07ca2ca5c9..ab8cfcfd49 100755
--- a/ctdb/tests/messaging.sh
+++ b/ctdb/tests/messaging.sh
@@ -11,7 +11,7 @@ fi
rm -f nodes.txt
for i in `seq 1 $NUMNODES`; do
- echo 127.0.0.$i:9001 >> nodes.txt
+ echo 127.0.0.$i >> nodes.txt
done
killall -9 ctdb_messaging
diff --git a/ctdb/tests/nodes.txt b/ctdb/tests/nodes.txt
index e1198b59ac..876f0c241a 100644
--- a/ctdb/tests/nodes.txt
+++ b/ctdb/tests/nodes.txt
@@ -1,2 +1,3 @@
-127.0.0.1:9001
-127.0.0.2:9001
+127.0.0.1
+127.0.0.2
+
diff --git a/ctdb/tests/recover.sh b/ctdb/tests/recover.sh
index e89ca6d156..99f81eb911 100755
--- a/ctdb/tests/recover.sh
+++ b/ctdb/tests/recover.sh
@@ -4,9 +4,9 @@ killall -q ctdbd
echo "Starting 4 ctdb daemons"
bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt
-bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.2:9001 --socket=/tmp/ctdb.socket.127.0.0.2
-bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.3:9001 --socket=/tmp/ctdb.socket.127.0.0.3
-bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.4:9001 --socket=/tmp/ctdb.socket.127.0.0.4
+bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.2 --socket=/tmp/ctdb.socket.127.0.0.2
+bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.3 --socket=/tmp/ctdb.socket.127.0.0.3
+bin/ctdbd --recovery-daemon --nlist direct/4nodes.txt --listen=127.0.0.4 --socket=/tmp/ctdb.socket.127.0.0.4
echo
echo "Attaching to some databases"
diff --git a/ctdb/tests/test.sh b/ctdb/tests/test.sh
index c243dbd032..0a6e3779b4 100755
--- a/ctdb/tests/test.sh
+++ b/ctdb/tests/test.sh
@@ -12,7 +12,7 @@ fi
rm -f nodes.txt
for i in `seq 1 $NUMNODES`; do
- echo 127.0.0.$i:9001 >> nodes.txt
+ echo 127.0.0.$i >> nodes.txt
done
killall -9 ctdb_test
generated by cgit (git 2.34.1) at 2025-03-09 21:44:15 +0000