use /etc/services for ctdb

(This used to be ctdb commit 64bf6964ff33320c5351337c7f8ed4da5bd71275)

diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index 19a31514aef128931f74bb8128fc26932d6c49be..071b50b4355e2ecfc871de37c0a413d0cc80374a 100644 (file)
--- 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 437d0341b532f66784847246b364ed721ec97cde..d88b809f1428c32ac6d1075cba2c4d5344974110 100644 (file)
--- 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 880fe914ffc1147cdd781d9b5030f7a82c7d7d24..99b07328b383bd468885a27f4b84aa7ed35e331d 100644 (file)
--- 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 e1198b59ac40dd54aaad72dd7db7e3bfb163a9bd..8cc2716bce5cc1d00e1eeee6f31c7ddb2b562451 100644 (file)
--- 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 74fc129c352d6d08f94cec4b0082e2969537dad3..40419829ca2390131d028bb832bd0e87e179a91d 100644 (file)
--- 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 74c08e0b0e8c4fb99382f58c9eec3ce241a43ac5..37176748e98c7b544f28e0048444607b1797894c 100644 (file)
--- 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 67564fa930484ce2358bb4046e6e6bdab8910c38..9d7f4ddcdca10aa4aaffdffb51145c33e8032625 100644 (file)
--- 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 3becfa65ec712c6d0a138876787774d6c489dba9..d638b4ab5709c1c3e00bb3346e1e5d9c57a03df3 100755 (executable)
--- 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 db4350c0c071d6d1fb5e356563a518a1f59488de..7b9ad531d2637bc2c9c55da3f2ee0c9f811292a0 100644 (file)
--- 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 880fe914ffc1147cdd781d9b5030f7a82c7d7d24..99b07328b383bd468885a27f4b84aa7ed35e331d 100644 (file)
--- 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 8716156e3aa23cd1f1c9fe7d861f7a294c9f07d8..92f81a7297d5f92da56bb17a33c8473d3895d452 100755 (executable)
--- 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 f9430919ea6a3aa20cc847e2cd9607c79c455c51..74d8785bcb97ba22e3c5a9c4dec97a8eb2f8d084 100755 (executable)
--- 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 fb384e2935c25c62f5ad474320c99720fd0b144b..a17dc76e05d7a449d39825e3a15b2a952c4f2054 100755 (executable)
--- 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 07ca2ca5c9130bdcf9969cbcc7360c397c4c78a9..ab8cfcfd492e97630f998e7220f28bc4d3c621d0 100755 (executable)
--- 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 e1198b59ac40dd54aaad72dd7db7e3bfb163a9bd..876f0c241a9f2cf805492160dadeae1dfecc47cb 100644 (file)
--- 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 e89ca6d156bdd1781cb1951b480b22ade86f763c..99f81eb9117e3b42cdad307d89546edc7a7d34bc 100755 (executable)
--- 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 c243dbd0327a1447cf122e7b94b56a0860cbcc6b..0a6e3779b4e6ee0cf7b144c3387984fdb492f5aa 100755 (executable)
--- 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