From 16853e5b8a0e577ab41cca2266659a905202d973 Mon Sep 17 00:00:00 2001
From: florijan <florijan@memgraph.io>
Date: Tue, 6 Feb 2018 15:53:12 +0100
Subject: [PATCH] Make transaction thread-safe

Reviewers: dgleich

Reviewed By: dgleich

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1223
---
 src/transactions/lock_store.hpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/transactions/lock_store.hpp b/src/transactions/lock_store.hpp
index add67b442..9400fb430 100644
--- a/src/transactions/lock_store.hpp
+++ b/src/transactions/lock_store.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
 #include <memory>
+#include <mutex>
 #include <vector>
+
 #include "glog/logging.h"
 #include "storage/locking/lock_status.hpp"
 #include "storage/locking/record_lock.hpp"
+#include "threading/sync/spinlock.hpp"
 #include "transactions/type.hpp"
 
 namespace tx {
@@ -55,13 +58,26 @@ class LockStore {
 
  public:
   void Take(RecordLock *lock, const tx::Transaction &tx, tx::Engine &engine) {
-    locks_.emplace_back(LockHolder(lock, tx, engine));
+    // Creating a lock holder locks the version list to the given transaction.
+    // Note that it's an op that can take a long time (if there are multiple
+    // transactions trying to lock.
+    LockHolder holder{lock, tx, engine};
+
+    // This guard prevents the same transaction from concurrent modificaton of
+    // locks_. This can only happen in distributed memgraph, when there are
+    // multiple edits coming to the same worker in the same transaction at the
+    // same time. IMPORTANT: This guard must come after LockHolder construction,
+    // as that potentially takes a long time and this guard only needs to
+    // protect locks_ update.
+    std::lock_guard<SpinLock> guard{locks_lock_};
+    locks_.emplace_back(std::move(holder));
     if (!locks_.back().active()) {
       locks_.pop_back();
     }
   }
 
  private:
+  SpinLock locks_lock_;
   std::vector<LockHolder> locks_;
 };
 }  // namespace tx