Merge branch 'ft600'

locktree/manager.cc

@@ -267,19 +267,22 @@ void locktree_manager::release_lt(locktree *lt) {
     uint32_t refs = lt->release_reference();
     if (refs == 0) {
         mutex_lock();
+        // lt may not have already been destroyed, so look it up.
         locktree *find_lt = locktree_map_find(dict_id);
         if (find_lt != nullptr) {
             // A locktree is still in the map with that dict_id, so it must be
             // equal to lt. This is true because dictionary ids are never reused.
             // If the reference count is zero, it's our responsibility to remove
             // it and do the destroy. Otherwise, someone still wants it.
-            invariant(find_lt == lt);
+            // If the locktree is still valid then check if it should be deleted.
+            if (find_lt == lt) {
                 if (lt->get_reference_count() == 0) {
                     locktree_map_remove(lt);
                     do_destroy = true;
                 }
-        }
                 m_lt_counters.add(lt->get_lock_request_info()->counters);
+            }
+        }
         mutex_unlock();
     }
 

locktree/tests/manager_parallel_locktree_get_release.cc

+/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+// vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
+#ident "$Id$"
+/*
+COPYING CONDITIONS NOTICE:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation, and provided that the
+  following conditions are met:
+
+      * Redistributions of source code must retain this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below).
+
+      * Redistributions in binary form must reproduce this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below) in the documentation and/or other materials
+        provided with the distribution.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+
+COPYRIGHT NOTICE:
+
+  TokuFT, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2014 Tokutek, Inc.
+
+DISCLAIMER:
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+UNIVERSITY PATENT NOTICE:
+
+  The technology is licensed by the Massachusetts Institute of
+  Technology, Rutgers State University of New Jersey, and the Research
+  Foundation of State University of New York at Stony Brook under
+  United States of America Serial No. 11/760379 and to the patents
+  and/or patent applications resulting from it.
+
+PATENT MARKING NOTICE:
+
+  This software is covered by US Patent No. 8,185,551.
+  This software is covered by US Patent No. 8,489,638.
+
+PATENT RIGHTS GRANT:
+
+  "THIS IMPLEMENTATION" means the copyrightable works distributed by
+  Tokutek as part of the Fractal Tree project.
+
+  "PATENT CLAIMS" means the claims of patents that are owned or
+  licensable by Tokutek, both currently or in the future; and that in
+  the absence of this license would be infringed by THIS
+  IMPLEMENTATION or by using or running THIS IMPLEMENTATION.
+
+  "PATENT CHALLENGE" shall mean a challenge to the validity,
+  patentability, enforceability and/or non-infringement of any of the
+  PATENT CLAIMS or otherwise opposing any of the PATENT CLAIMS.
+
+  Tokutek hereby grants to you, for the term and geographical scope of
+  the PATENT CLAIMS, a non-exclusive, no-charge, royalty-free,
+  irrevocable (except as stated in this section) patent license to
+  make, have made, use, offer to sell, sell, import, transfer, and
+  otherwise run, modify, and propagate the contents of THIS
+  IMPLEMENTATION, where such license applies only to the PATENT
+  CLAIMS.  This grant does not include claims that would be infringed
+  only as a consequence of further modifications of THIS
+  IMPLEMENTATION.  If you or your agent or licensee institute or order
+  or agree to the institution of patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  THIS IMPLEMENTATION constitutes direct or contributory patent
+  infringement, or inducement of patent infringement, then any rights
+  granted to you under this License shall terminate as of the date
+  such litigation is filed.  If you or your agent or exclusive
+  licensee institute or order or agree to the institution of a PATENT
+  CHALLENGE, then Tokutek may terminate any rights granted to you
+  under this License.
+*/
+
+#ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+
+// This test crashes prior to the FT-600 fix.
+
+#include "manager_unit_test.h"
+
+namespace toku {
+
+static int my_cmp(DB *UU(db), const DBT *UU(a), const DBT *UU(b)) {
+    return 0;
+}
+
+static void my_test(locktree_manager *mgr) {
+    toku::comparator my_comparator;
+    my_comparator.create(my_cmp, nullptr);
+    DICTIONARY_ID a = { 42 };
+    for (int i=0; i<100000; i++) {
+        locktree *alt = mgr->get_lt(a, my_comparator, nullptr);
+        invariant_notnull(alt);
+        mgr->release_lt(alt);
+    }
+    my_comparator.destroy();
+}
+
+static void *my_tester(void *arg) {
+    locktree_manager *mgr = (locktree_manager *) arg;
+    my_test(mgr);
+    return arg;
+}
+
+void manager_unit_test::test_reference_release_lt(void) {
+    int r;
+    locktree_manager mgr;
+    mgr.create(nullptr, nullptr, nullptr, nullptr);
+    const int nthreads = 2;
+    pthread_t ids[nthreads];
+    for (int i = 0; i < nthreads; i++) {
+        r = toku_pthread_create(&ids[i], nullptr, my_tester, &mgr);
+        assert(r == 0);
+    }
+    for (int i = 0; i < nthreads; i++) {
+        void *ret;
+        r = toku_pthread_join(ids[i], &ret);
+        assert(r == 0);
+    }
+    my_test(&mgr);
+    mgr.destroy();
+}
+
+} /* namespace toku */
+
+int main(void) {
+    toku::manager_unit_test test;
+    test.test_reference_release_lt();
+    return 0; 
+}