From 8a962571024224284a0a6c756f4f1024871853ff Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Fri, 21 Jul 2017 15:08:01 +0200 Subject: [PATCH] add fix for 49287: handle readonly replica --- ldap/servers/plugins/replication/repl5_ruv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c index f669e07..8f9574a 100644 --- a/ldap/servers/plugins/replication/repl5_ruv.c +++ b/ldap/servers/plugins/replication/repl5_ruv.c @@ -1713,10 +1713,10 @@ int ruv_cancel_csn_inprogress (void *repl, RUV *ruv, const CSN *csn, ReplicaId l * - a remote RID if the primary csn is for a replciated op. */ ReplicaId prim_rid = csn_get_replicaid (csn); - repl_ruv = ruvGetReplica (ruv, local_rid); + repl_ruv = ruvGetReplica (ruv, prim_rid); rc = csnplRemoveAll (repl_ruv->csnpl, prim_csn); - if (prim_rid != local_rid) { - repl_ruv = ruvGetReplica (ruv, prim_rid); + if (prim_rid != local_rid && local_rid != READ_ONLY_REPLICA_ID) { + repl_ruv = ruvGetReplica (ruv, local_rid); rc = csnplRemoveAll (repl_ruv->csnpl, prim_csn); } -- 2.5.5