rpms/tabled/devel tabled-0.5-build3s.patch, NONE, 1.1 tabled.spec, 1.30, 1.31 tabled.sysconf, 1.1, 1.2

[Pete Zaitcev]

Author: zaitcev

Update of /cvs/pkgs/rpms/tabled/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31823

Modified Files:
	tabled.spec tabled.sysconf 
Added Files:
	tabled-0.5-build3s.patch 
Log Message:
"Guaranteed" to build from the first try - testing with a Fedora patch.


tabled-0.5-build3s.patch:
 start-daemon      |    4 ++++
 wait-for-listen.c |    7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE tabled-0.5-build3s.patch ---
--- tabled-0.5git/test/start-daemon	2010-03-07 05:54:37.000000000 -0700
+++ tabled-tip/test/start-daemon	2010-05-25 15:02:26.001651210 -0600
@@ -18,6 +18,10 @@ fi
 
 # May be different on Solaris... like /usr/libexec or such.
 cld -d data/cld -P cld.pid -p auto --port-file=cld.port -E
+
+# With great sadness we have to use a delay, or else "100 s" happens.
+sleep 3
+
 chunkd -C $top_srcdir/test/chunkd-test.conf -E
 ../server/tabled -C $top_srcdir/test/tabled-test.conf -E
 
--- tabled-0.5git/test/wait-for-listen.c	2010-04-14 13:49:33.000000000 -0600
+++ tabled-tip/test/wait-for-listen.c	2010-06-17 21:19:18.245883298 -0600
@@ -133,12 +133,9 @@ int main(int argc, char **argv)
  		 * Vote in DB4 replication takes about 12-13s.
 		 * In addition we may have retries when tabled polls for
 		 * Chunk daemons to come up. On busy boxes we may miss 20s.
-		 * So, 25s should be plenty, and we used that for a while,
-		 * but sometimes a daemon can fail establishing a session
-		 * with CLD and a retry takes a minute.
 		 */
-		if (time(NULL) >= start_time + 100) {
-			fprintf(stderr, "server is not up after 100 s\n");
+		if (time(NULL) >= start_time + 25) {
+			fprintf(stderr, "server is not up after 25 s\n");
 			exit(1);
 		}
 


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- tabled.spec	19 Apr 2010 04:52:06 -0000	1.30
+++ tabled.spec	29 Jun 2010 01:24:40 -0000	1.31
@@ -1,6 +1,6 @@
 Name:		tabled
 Version:	0.5
-Release:	0.7.g091d6a5d%{?dist}
+Release:	0.7.m1%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
@@ -12,6 +12,7 @@ URL:		http://hail.wiki.kernel.org/
 Source0:	tabled-%{version}git.tar.gz
 Source2:	tabled.init
 Source3:	tabled.sysconf
+Patch00:	tabled-0.5-build3s.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # N.B. We need chunkd and cld to build, because our "make check" spawns
@@ -45,6 +46,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n tabled-0.5git
+%patch00 -p1
 
 %build
 %configure --disable-static
@@ -102,6 +104,10 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Jun 28 2010 Pete Zaitce <zaitcev at redhat.com>
+- Revert to a staggered start in start-daemon
+- Test build, bump to 0.5-0.7.m1 (from 0.5-0.7.g091d6a5d)
+
 * Mon Apr 19 2010 Jeff Garzik <jgarzik at redhat.com> - 0.5-0.7.g091d6a5d
 - add sources for git commit 091d6a5df9d9381958db35cc3a215dc3bc26c380
 


Index: tabled.sysconf
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.sysconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tabled.sysconf	21 Jul 2009 16:00:07 -0000	1.1
+++ tabled.sysconf	29 Jun 2010 01:24:40 -0000	1.2
@@ -2,5 +2,5 @@
 #
 
 #example: 
-#OPTS="--debug"
+#OPTS="--debug 1"