client: ctdb_fetch_lock should check for readonly delegations

When readonly delegations were added, ctdb_fetch_lock code should have
been modified to include the check for readonly flags.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(Imported from commit 78015320b60b0fd0d8c3dc65fbbe3e38e4a02993)

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 885dbfdfb4656fd57f77695eb36ad6bc8e4bb9ab..756011525dbf7f63ea12c2877762010c9296e90c 100644 (file)
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -709,6 +709,21 @@ again:
                goto again;
        }
 
+       /* if this is a request for read/write and we have delegations
+          we have to revoke all delegations first
+       */
+       if ((h->header.dmaster == ctdb_db->ctdb->pnn) &&
+           (h->header.flags & CTDB_REC_RO_HAVE_DELEGATIONS)) {
+               ctdb_ltdb_unlock(ctdb_db, key);
+               ret = ctdb_client_force_migration(ctdb_db, key);
+               if (ret != 0) {
+                       DEBUG(DEBUG_DEBUG,("ctdb_fetch_readonly_lock: force_migration failed\n"));
+                       talloc_free(h);
+                       return NULL;
+               }
+               goto again;
+       }
+
        DEBUG(DEBUG_DEBUG,("ctdb_fetch_lock: we are dmaster - done\n"));
        return h;
 }