head	1.2;
access;
symbols
	pkgsrc-2014Q1:1.1.0.4
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2014.04.18.08.31.20;	author manu;	state dead;
branches;
next	1.1;
commitid	jyJA1jE2E7CSN8xx;

1.1
date	2013.10.01.00.30.26;	author manu;	state Exp;
branches;
next	;
commitid	PCr1d0VRfUdHxw7x;


desc
@@


1.2
log
@Upgrade to glusterfs 3.5.0

New features includes...
 - File snapshots
 - On-wire compression/decompression
 - Quota sclability
 - Disk encryption
 - Brick failure detection
@
text
@$NetBSD: patch-cg,v 1.1 2013/10/01 00:30:26 manu Exp $

--- xlators/cluster/afr/src/afr.c.orig	2013-09-30 16:51:57.000000000 +0200
+++ xlators/cluster/afr/src/afr.c	2013-09-30 17:23:03.000000000 +0200
@@@@ -673,9 +675,19 @@@@
           .description = "Enabling this option logs entry lock/unlocks"
         },
         { .key = {"eager-lock"},
           .type = GF_OPTION_TYPE_BOOL,
+#ifdef __NetBSD__
+	/*
+	 * eager-locks are broken on NetBSD, and cause spurious
+	 * split brain with all NULL pending matrix, as described
+	 * in https://bugzilla.redhat.com/show_bug.cgi?id=1005526
+	 * We therefore disable them for now
+	 */
+          .default_value = "off",
+#else
           .default_value = "on",
+#endif
           .description = "Lock phase of a transaction has two sub-phases. "
                          "First is an attempt to acquire locks in parallel by "
                          "broadcasting non-blocking lock requests. If lock "
                          "aquistion fails on any server, then the held locks "
@


1.1
log
@Update glusterfs to 3.4.1
Disable eager locks, which seem broken on NetBSD for glusterfs-3.4.x
@
text
@d1 1
a1 1
$NetBSD$
@