[SCM] CTDB repository - branch master updated - ctdb-1.0.114-84-g3f0346d

[Ronnie Sahlberg]

The branch, master has been updated
       via  3f0346dc758d3b05ccb86785e7c8a2d5679ff68c (commit)
       via  81e1483dd0ce2cd091721e456c0c194cc58442f3 (commit)
       via  e1a16c23d7dbf011ad220572f1bf081331efa8f8 (commit)
       via  07823e1fe75c588b75f4e42c80b0a7bc974238f7 (commit)
      from  fa045733cb81412f0d02ab52d74eabc7efca8b3d (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3f0346dc758d3b05ccb86785e7c8a2d5679ff68c
Merge: fa045733cb81412f0d02ab52d74eabc7efca8b3d 81e1483dd0ce2cd091721e456c0c194cc58442f3
Author: Ronnie sahlberg <ronniesahlberg at gmail.com>
Date:   Tue May 11 19:44:11 2010 +1000

    Merge commit 'obnox/master-rebase'

-----------------------------------------------------------------------

Summary of changes:
 config/functions       |    2 +-
 tests/src/ctdb_bench.c |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/functions b/config/functions
index 2c78b39..73ae0c0 100755
--- a/config/functions
+++ b/config/functions
@@ -162,7 +162,7 @@ ctdb_check_directories_probe() {
 		continue
 		;;
 	    *)
-		[ -d "$d" ] || return 1
+		[ -d "${d}/." ] || return 1
 	esac
     done
 }
diff --git a/tests/src/ctdb_bench.c b/tests/src/ctdb_bench.c
index 52e5b50..7d4ebf2 100644
--- a/tests/src/ctdb_bench.c
+++ b/tests/src/ctdb_bench.c
@@ -103,7 +103,7 @@ static void ring_message_handler(struct ctdb_context *ctdb, uint64_t srvid,
 }
 
 
-void send_start_messages(struct ctdb_context *ctdb, int incr)
+static void send_start_messages(struct ctdb_context *ctdb, int incr)
 {
 	/* two messages are injected into the ring, moving
 	   in opposite directions */
@@ -214,6 +214,11 @@ int main(int argc, const char *argv[])
 		while (extra_argv[extra_argc]) extra_argc++;
 	}
 
+	if (num_nodes == 0) {
+		printf("You must specify the number of nodes\n");
+		exit(1);
+	}
+
 	ev = event_context_init(NULL);
 
 	/* initialise ctdb */


-- 
CTDB repository