Cluster test: add tmp dir to Git repo.

Previously the PID format was:
[PID] Timestamp

But it recently changed to:
PID:X Timestamp

The tcl testing framework was grabbing the PID from \[\d+\], but
that's not valid anymore.

Now we grab the pid from "PID: <PID>" in the part of Redis startup
output to the right of the ASCII logo.

00-RELEASENOTES

@@ -12,6 +12,12 @@ HIGH:     There is a critical bug that may affect a subset of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 
+--[ Redis 3.0.0 Beta 5 (version 2.9.54) ] Release date: 26 may 2014
+
+This is the 5th beta of Redis 3.0.0. It does not include any real
+worthwhile change (just three days passed since the previous beta), but
+fixes two stupid bugs preventing cluster tests to pass.
+
 --[ Redis 3.0.0 Beta 4 (version 2.9.53) ] Release date: 23 may 2014
 
 This is the fourth beta of Redis 3.0.0.

sentinel.conf

@@ -20,6 +20,12 @@ dir /tmp
 # be elected by the majority of the known Sentinels in order to
 # start a failover, so no failover can be performed in minority.
 #
+# Slaves are auto-discovered, so you don't need to specify slaves in
+# any way. Sentinel itself will rewrite this configuration file adding
+# the slaves using additional configuration options.
+# Also note that the configuration file is rewritten when a
+# slave is promoted to master.
+#
 # Note: master name should not include special characters or spaces.
 # The valid charset is A-z 0-9 and the three characters ".-_".
 sentinel monitor mymaster 127.0.0.1 6379 2

src/cluster.c

@@ -3076,6 +3076,7 @@ void clusterUpdateState(void) {
      * to don't count the DB loading time. */
     if (first_call_time == 0) first_call_time = mstime();
     if (nodeIsMaster(myself) &&
+        server.cluster->state == REDIS_CLUSTER_FAIL &&
         mstime() - first_call_time < REDIS_CLUSTER_WRITABLE_DELAY) return;
 
     /* Start assuming the state is OK. We'll turn it into FAIL if there

src/debug.c

@@ -947,7 +947,7 @@ void enableWatchdog(int period) {
         /* Watchdog was actually disabled, so we have to setup the signal
          * handler. */
         sigemptyset(&act.sa_mask);
-        act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_SIGINFO;
+        act.sa_flags = SA_ONSTACK | SA_SIGINFO;
         act.sa_sigaction = watchdogSignalHandler;
         sigaction(SIGALRM, &act, NULL);
     }

src/version.h

@@ -1 +1 @@
-#define REDIS_VERSION "2.9.53"
+#define REDIS_VERSION "2.9.54"

tests/cluster/tests/includes/init-tests.tcl

@@ -21,7 +21,7 @@ test "Cluster nodes are reachable" {
 
 test "Cluster nodes hard reset" {
     foreach_redis_id id {
-        R $id flushall
+        catch {R $id flushall} ; # May fail for readonly slaves.
         R $id cluster reset hard
         R $id config set cluster-node-timeout 3000
     }

tests/cluster/tmp/.gitignore

@@ -0,0 +1,2 @@
+redis_*
+sentinel_*

tests/support/server.tcl

@@ -236,7 +236,7 @@ proc start_server {options {code undefined}} {
     
     # find out the pid
     while {![info exists pid]} {
-        regexp {\[(\d+)\]} [exec cat $stdout] _ pid
+        regexp {PID:\s(\d+)} [exec cat $stdout] _ pid
         after 100
     }