release: prepare for 0.13.2

Merge scylla-seastar branch-0.13
* seastar d40453b...8a76d06 (3): > memory: be less strict about NUMA bindings > reactor: let the resource code specify the default memory reserve > resource: reserve even more memory when hwloc is compiled in
2015-12-16 11:46:14 +02:00 · 2015-12-09 18:26:22 +02:00 · 2015-12-09 18:23:47 +02:00 · 2015-12-09 14:19:43 +02:00 · 2015-12-09 14:09:10 +02:00 · 2015-12-08 11:28:15 +02:00
4 changed files with 7 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "seastar"]
 	path = seastar
-	url = ../seastar
+	url = ../scylla-seastar
 	ignore = dirty
 [submodule "swagger-ui"]
 	path = swagger-ui
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 #!/bin/sh

-VERSION=development
+VERSION=0.13.2

 if test -f version
 then
--- a/gms/gossiper.cc
+++ b/gms/gossiper.cc
@@ -666,6 +666,10 @@ void gossiper::convict(inet_address endpoint, double phi) {
    auto& state = it->second;
    // FIXME: Add getGossipStatus
    // logger.debug("Convicting {} with status {} - alive {}", endpoint, getGossipStatus(epState), state.is_alive());
+    if (!state.is_alive()) {
+        return;
+    }
+
    logger.trace("convict ep={}, phi={}, is_alive={}, is_dead_state={}", endpoint, phi, state.is_alive(), is_dead_state(state));
    if (is_shutdown(endpoint)) {
        mark_as_shutdown(endpoint);
--- a/2
+++ b/2
Author	SHA1	Message	Date
Pekka Enberg	43d3c5f354	release: prepare for 0.13.2	2015-12-16 11:46:14 +02:00
Avi Kivity	59cd785778	Merge scylla-seastar branch-0.13 * seastar d40453b...8a76d06 (3): > memory: be less strict about NUMA bindings > reactor: let the resource code specify the default memory reserve > resource: reserve even more memory when hwloc is compiled in	2015-12-09 18:26:22 +02:00
Avi Kivity	bb24d4324f	Redirect seastar submodule to scylla-seastar repository This allows having a private scylla fork for seastar, for the stable branches.	2015-12-09 18:23:47 +02:00
Pekka Enberg	eb7ae39f40	release: prepare for 0.13.1 Signed-off-by: Pekka Enberg <penberg@scylladb.com>	2015-12-09 14:19:43 +02:00
Asias He	4281b48472	gossip: Fix endless marking a node down In commit `56df32ba56` (gossip: Mark node as dead even if already left). A node liveness check is missed. Fix it up. Before: (mark a node down multiple times) [Tue Dec 8 12:16:33 2015] INFO [shard 0] gossip - InetAddress 127.0.0.3 is now DOWN [Tue Dec 8 12:16:33 2015] DEBUG [shard 0] storage_service - endpoint=127.0.0.3 on_dead [Tue Dec 8 12:16:34 2015] INFO [shard 0] gossip - InetAddress 127.0.0.3 is now DOWN [Tue Dec 8 12:16:34 2015] DEBUG [shard 0] storage_service - endpoint=127.0.0.3 on_dead [Tue Dec 8 12:16:35 2015] INFO [shard 0] gossip - InetAddress 127.0.0.3 is now DOWN [Tue Dec 8 12:16:35 2015] DEBUG [shard 0] storage_service - endpoint=127.0.0.3 on_dead [Tue Dec 8 12:16:36 2015] INFO [shard 0] gossip - InetAddress 127.0.0.3 is now DOWN [Tue Dec 8 12:16:36 2015] DEBUG [shard 0] storage_service - endpoint=127.0.0.3 on_dead After: (mark a node down only one time) [Tue Dec 8 12:28:36 2015] INFO [shard 0] gossip - InetAddress 127.0.0.3 is now DOWN [Tue Dec 8 12:28:36 2015] DEBUG [shard 0] storage_service - endpoint=127.0.0.3 on_dead (cherry picked from commit `5a65d8bcdd`)	2015-12-09 14:09:10 +02:00
Pekka Enberg	fef7375beb	release: prepare for 0.13 Signed-off-by: Pekka Enberg <penberg@scylladb.com>	2015-12-08 11:28:15 +02:00