summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2016-09-19 14:29:21 -0700
committerStefan Metzmacher <metze@samba.org>2016-10-13 16:52:13 +0200
commite0c9067b4a46147057ec3454bb4d0a9e27bc854e (patch)
tree2dab4659cfc657865d538e9f197d75fcb74495c1
parent0b0574e31aa2aed76b25b891dc87f50bf117660f (diff)
downloadsamba-e0c9067b4a46147057ec3454bb4d0a9e27bc854e.tar.gz
gencache: Bail out of stabilize if we can not get the allrecord lock
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12045 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Sep 20 04:09:33 CEST 2016 on sn-devel-144 (cherry picked from commit b208499960eefef02d305a3bd59b03a7c2aafcac)
-rw-r--r--source3/lib/gencache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 90eafaa7be2..7ac9eba92f6 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -658,7 +658,7 @@ bool gencache_stabilize(void)
return false;
}
- res = tdb_lockall(cache_notrans->tdb);
+ res = tdb_lockall_nonblock(cache_notrans->tdb);
if (res != 0) {
tdb_transaction_cancel(cache->tdb);
DEBUG(10, ("Could not get allrecord lock on "