From owner-svn-ports-head@FreeBSD.ORG Sat Jul 26 08:20:51 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD527D96; Sat, 26 Jul 2014 08:20:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A77E235B; Sat, 26 Jul 2014 08:20:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6Q8Kpcq079636; Sat, 26 Jul 2014 08:20:51 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6Q8KpJD079634; Sat, 26 Jul 2014 08:20:51 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201407260820.s6Q8KpJD079634@svn.freebsd.org> From: Mikolaj Golub Date: Sat, 26 Jul 2014 08:20:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362959 - in head/databases/leofs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jul 2014 08:20:51 -0000 Author: trociny Date: Sat Jul 26 08:20:50 2014 New Revision: 362959 URL: http://svnweb.freebsd.org/changeset/ports/362959 QAT: https://qat.redports.org/buildarchive/r362959/ Log: Fix "Could not get redundancy" errors after the storage node restart, by making the manager automatically send redundancy configuration to storage node after restart. Added: head/databases/leofs/files/patch-deps-leo_manager-src-leo_manager_cluster_monitor.erl (contents, props changed) Modified: head/databases/leofs/Makefile Modified: head/databases/leofs/Makefile ============================================================================== --- head/databases/leofs/Makefile Sat Jul 26 07:23:15 2014 (r362958) +++ head/databases/leofs/Makefile Sat Jul 26 08:20:50 2014 (r362959) @@ -3,6 +3,7 @@ PORTNAME= leofs PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= trociny@FreeBSD.org Added: head/databases/leofs/files/patch-deps-leo_manager-src-leo_manager_cluster_monitor.erl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/leofs/files/patch-deps-leo_manager-src-leo_manager_cluster_monitor.erl Sat Jul 26 08:20:50 2014 (r362959) @@ -0,0 +1,13 @@ +Send redundancy configuration to storage node redundant manager on +synchronization after the node restart. + +--- deps/leo_manager/src/leo_manager_cluster_monitor.erl.orig 2014-05-09 12:36:43.000000000 +0300 ++++ deps/leo_manager/src/leo_manager_cluster_monitor.erl 2014-07-22 20:31:37.000000000 +0300 +@@ -466,6 +466,7 @@ + %% synchronize member and ring + catch leo_manager_api:synchronize(?CHECKSUM_MEMBER, Node), + catch leo_manager_api:synchronize(?CHECKSUM_RING, Node), ++ catch leo_manager_api:recover(?RECOVER_BY_RING, Node, true), + ok; + + register_fun_2({ok, [#node_state{state = ?STATE_DETACHED}|_]}, #registration{node = Node,