Rev 694: add randrec to Makefile in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 694
revision-id:tridge at samba.org-20080103221906-nuq3067kb7wfw8xq
parent: tridge at samba.org-20080102114446-ci6yp94r12pwnfto
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.kantana
timestamp: Fri 2008-01-04 09:19:06 +1100
message:
  add randrec to Makefile
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  server/ctdb_recover.c          ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-10-15 04:44:06 +0000
+++ b/Makefile.in	2008-01-03 22:19:06 +0000
@@ -53,7 +53,7 @@
 	server/ctdb_serverids.o server/ctdb_persistent.o \
 	$(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@
 
-TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store bin/ctdb_persistent bin/rb_test \
+TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store bin/ctdb_randrec bin/ctdb_persistent bin/rb_test \
 	@INFINIBAND_BINS@
 
 BINS = bin/ctdb @CTDB_SCSI_IO@ bin/ctdb_ipmux bin/smnotify
@@ -126,6 +126,10 @@
 	@echo Linking $@
 	@$(CC) $(CFLAGS) -o $@ tests/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 
+bin/ctdb_randrec: $(CTDB_CLIENT_OBJ) tests/ctdb_randrec.o 
+	@echo Linking $@
+	@$(CC) $(CFLAGS) -o $@ tests/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+
 bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/ctdb_persistent.o 
 	@echo Linking $@
 	@$(CC) $(CFLAGS) -o $@ tests/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)

=== modified file 'server/ctdb_recover.c'
--- a/server/ctdb_recover.c	2008-01-02 11:44:46 +0000
+++ b/server/ctdb_recover.c	2008-01-03 22:19:06 +0000
@@ -332,6 +332,7 @@
 		   if the rsn values are equal */
 		if (header.rsn < hdr->rsn ||
 		    (header.dmaster != ctdb->pnn && header.rsn == hdr->rsn)) {
+#if 0
 			/* this is a push optimisation - we can skip writing the record if:
 
 			       1) this is not a persistent db
@@ -344,7 +345,9 @@
 			    header.dmaster != ctdb->pnn &&
 			    hdr->dmaster != ctdb->pnn) {
 				DEBUG(5,("Skipping push of record\n"));
-			} else {
+			} else 
+#endif
+{
 				ret = ctdb_ltdb_store(ctdb_db, key, hdr, data);
 				if (ret != 0) {
 					DEBUG(0, (__location__ " Unable to store record\n"));