#50 count lock tree timeouts

locktree/lock_request.cc

@@ -253,6 +253,7 @@ int lock_request::wait(void) {
         int r = toku_cond_timedwait(&m_wait_cond, &m_info->mutex, &ts);
         invariant(r == 0 || r == ETIMEDOUT);
         if (r == ETIMEDOUT && m_state == state::PENDING) {
+            m_info->counters.timeout_count += 1;
             // if we're still pending and we timed out, then remove our
             // request from the set of lock requests and fail.
             remove_from_lock_requests();
@@ -262,11 +263,11 @@ int lock_request::wait(void) {
     }
     uint64_t t_end = toku_current_time_microsec();
     uint64_t duration = t_end - t_start;
-    m_info->wait_count += 1;
-    m_info->wait_time += duration;
+    m_info->counters.wait_count += 1;
+    m_info->counters.wait_time += duration;
     if (duration >= 1000000) {
-        m_info->long_wait_count += 1;
-        m_info->long_wait_time += duration;
+        m_info->counters.long_wait_count += 1;
+        m_info->counters.long_wait_time += duration;
     }
     toku_mutex_unlock(&m_info->mutex);
 

locktree/locktree.cc

@@ -139,6 +139,7 @@ void locktree::create(manager::memory_tracker *mem_tracker, DICTIONARY_ID dict_i
     ZERO_STRUCT(m_lock_request_info.mutex);
     toku_mutex_init(&m_lock_request_info.mutex, nullptr);
     m_lock_request_info.should_retry_lock_requests = false;
+    ZERO_STRUCT(m_lock_request_info.counters);
 
     // Threads read the should retry bit without a lock
     // for performance. It's ok to read the wrong value.

locktree/locktree.h

@@ -119,6 +119,7 @@ enum {
     LTM_WAIT_TIME,
     LTM_LONG_WAIT_COUNT,
     LTM_LONG_WAIT_TIME,
+    LTM_TIMEOUT_COUNT,
     LTM_STATUS_NUM_ROWS // must be last
 };
 
@@ -185,14 +186,19 @@ public:
 
     int compare(const locktree *lt);
 
+    struct lt_counters {
+        uint64_t wait_count, wait_time;
+        uint64_t long_wait_count, long_wait_time;
+        uint64_t timeout_count;
+    };
+
     // The locktree stores some data for lock requests. It doesn't have to know
     // how they work or even what a lock request object looks like.
     struct lt_lock_request_info {
         omt<lock_request *> pending_lock_requests;
         toku_mutex_t mutex;
         bool should_retry_lock_requests;
-        uint64_t wait_count, wait_time;
-        uint64_t long_wait_count, long_wait_time;
+        lt_counters counters;
     };
 
     // Private info struct for storing pending lock request state.
@@ -301,6 +307,8 @@ public:
         tokutime_t m_escalation_time;
         uint64_t m_escalation_latest_result;
 
+        struct lt_counters m_lt_counters;
+
         // lock wait time for blocking row locks, in ms
         uint64_t m_lock_wait_time_ms;
 

locktree/manager.cc

@@ -116,6 +116,7 @@ void locktree::manager::create(lt_create_cb create_cb, lt_destroy_cb destroy_cb,
     toku_mutex_init(&m_mutex, nullptr);
 
     ZERO_STRUCT(status);
+    ZERO_STRUCT(m_lt_counters);
 }
 
 void locktree::manager::destroy(void) {
@@ -238,6 +239,14 @@ void locktree::manager::reference_lt(locktree *lt) {
     toku_sync_fetch_and_add(&lt->m_reference_count, 1);
 }
 
+static void add_lt_counters(locktree::lt_counters *x, locktree::lt_counters *y) {
+    x->wait_count += y->wait_count;
+    x->wait_time += y->wait_time;
+    x->long_wait_count += y->long_wait_count;
+    x->long_wait_time += y->long_wait_time;
+    x->timeout_count += y->timeout_count;
+}
+
 void locktree::manager::release_lt(locktree *lt) {
     bool do_destroy = false;
     DICTIONARY_ID dict_id = lt->m_dict_id;
@@ -285,6 +294,7 @@ void locktree::manager::release_lt(locktree *lt) {
                 do_destroy = true;
             }
         }
+        add_lt_counters(&m_lt_counters, &lt->m_lock_request_info.counters);
         mutex_unlock();
     }
 
@@ -381,6 +391,7 @@ void locktree::manager::status_init(void) {
     STATUS_INIT(LTM_WAIT_TIME,                LOCKTREE_WAIT_TIME, UINT64, "time waiting for locks", TOKU_ENGINE_STATUS);
     STATUS_INIT(LTM_LONG_WAIT_COUNT,          LOCKTREE_LONG_WAIT_COUNT, UINT64, "number of long wait locks ", TOKU_ENGINE_STATUS);
     STATUS_INIT(LTM_LONG_WAIT_TIME,           LOCKTREE_LONG_WAIT_TIME, UINT64, "long time waiting for locks", TOKU_ENGINE_STATUS);
+    STATUS_INIT(LTM_TIMEOUT_COUNT,            LOCKTREE_TIMEOUT_COUNT, UINT64, "number of lock timeouts", TOKU_ENGINE_STATUS);
 
     status.initialized = true;
 }
@@ -388,6 +399,7 @@ void locktree::manager::status_init(void) {
 #undef STATUS_INIT
 
 #define STATUS_VALUE(x) status.status[x].value.num
+
 void locktree::manager::get_status(LTM_STATUS statp) {
     if (!status.initialized) {
         status_init();
@@ -405,10 +417,9 @@ void locktree::manager::get_status(LTM_STATUS statp) {
     uint64_t sto_num_eligible = 0;
     uint64_t sto_end_early_count = 0;
     tokutime_t sto_end_early_time = 0;
-    
-    uint64_t lock_wait_count = 0, lock_wait_time = 0;
-    uint64_t long_lock_wait_count = 0, long_lock_wait_time = 0;
 
+    struct lt_counters lt_counters = m_lt_counters;
+    
     size_t num_locktrees = m_locktree_map.size();
     for (size_t i = 0; i < num_locktrees; i++) {
         locktree *lt;
@@ -417,10 +428,7 @@ void locktree::manager::get_status(LTM_STATUS statp) {
 
         toku_mutex_lock(&lt->m_lock_request_info.mutex);
         lock_requests_pending += lt->m_lock_request_info.pending_lock_requests.size();
-        lock_wait_count += lt->m_lock_request_info.wait_count;
-        lock_wait_time += lt->m_lock_request_info.wait_time;
-        long_lock_wait_count += lt->m_lock_request_info.long_wait_count;
-        long_lock_wait_time  += lt->m_lock_request_info.long_wait_time;        
+        add_lt_counters(&lt_counters, &lt->m_lock_request_info.counters);
         toku_mutex_unlock(&lt->m_lock_request_info.mutex);
 
         sto_num_eligible += lt->sto_txnid_is_valid_unsafe() ? 1 : 0;
@@ -435,10 +443,11 @@ void locktree::manager::get_status(LTM_STATUS statp) {
     STATUS_VALUE(LTM_STO_NUM_ELIGIBLE) = sto_num_eligible;
     STATUS_VALUE(LTM_STO_END_EARLY_COUNT) = sto_end_early_count;
     STATUS_VALUE(LTM_STO_END_EARLY_TIME) = sto_end_early_time;
-    STATUS_VALUE(LTM_WAIT_COUNT) = lock_wait_count;
-    STATUS_VALUE(LTM_WAIT_TIME) = lock_wait_time;
-    STATUS_VALUE(LTM_LONG_WAIT_COUNT) = long_lock_wait_count;
-    STATUS_VALUE(LTM_LONG_WAIT_TIME) = long_lock_wait_time;
+    STATUS_VALUE(LTM_WAIT_COUNT) = lt_counters.wait_count;
+    STATUS_VALUE(LTM_WAIT_TIME) = lt_counters.wait_time;
+    STATUS_VALUE(LTM_LONG_WAIT_COUNT) = lt_counters.long_wait_count;
+    STATUS_VALUE(LTM_LONG_WAIT_TIME) = lt_counters.long_wait_time;
+    STATUS_VALUE(LTM_TIMEOUT_COUNT) = lt_counters.timeout_count;
     *statp = status;
 }
 #undef STATUS_VALUE

locktree/tests/manager_status.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:
+
+  TokuDB, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2007-2013 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.
+
+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."
+
+#include "manager_unit_test.h"
+#include "locktree_unit_test.h"
+#include "lock_request_unit_test.h"
+
+namespace toku {
+
+static void assert_status(LTM_STATUS ltm_status, const char *keyname, uint64_t v) {
+    TOKU_ENGINE_STATUS_ROW key_status = NULL;
+    // lookup keyname in status
+    for (int i = 0; ; i++) {
+        TOKU_ENGINE_STATUS_ROW status = &ltm_status->status[i];
+        if (status->keyname == NULL)
+            break;
+        if (strcmp(status->keyname, keyname) == 0) {
+            key_status = status;
+            break;
+        }
+    }
+    assert(key_status);
+    assert(key_status->value.num == v);
+}
+
+void manager_unit_test::test_status(void) {
+
+    locktree::manager mgr;
+    mgr.create(nullptr, nullptr, nullptr, nullptr);
+
+    LTM_STATUS_S status;
+    mgr.get_status(&status);
+    assert_status(&status, "LTM_WAIT_COUNT", 0);
+    assert_status(&status, "LTM_TIMEOUT_COUNT", 0);
+
+    DESCRIPTOR desc = nullptr;
+    DICTIONARY_ID dict_id = { 1 };
+    locktree *lt = mgr.get_lt(dict_id, desc, compare_dbts, nullptr);
+    int r;
+    TXNID txnid_a = 1001;
+    TXNID txnid_b = 2001;
+    const DBT *one = get_dbt(1);
+
+    // txn a write locks one
+    r = lt->acquire_write_lock(txnid_a, one, one, nullptr);
+    assert(r == 0);
+
+    // txn b tries to write lock one, conflicts, waits, and fails to lock one
+    lock_request request_b;
+    request_b.create(1000);
+    request_b.set(lt, txnid_b, one, one, lock_request::type::WRITE);
+    r = request_b.start();
+    assert(r == DB_LOCK_NOTGRANTED);
+    r = request_b.wait();
+    assert(r == DB_LOCK_NOTGRANTED);
+    request_b.destroy();
+
+    range_buffer buffer;
+    buffer.create();
+    buffer.append(one, one);
+    lt->release_locks(txnid_a, &buffer);
+    buffer.destroy();
+
+    assert(lt->m_rangetree->is_empty() && lt->m_sto_buffer.is_empty());
+
+    // assert that wait counters incremented
+    mgr.get_status(&status);
+    assert_status(&status, "LTM_WAIT_COUNT", 1);
+    assert_status(&status, "LTM_TIMEOUT_COUNT", 1);
+
+    // assert that wait counters are persistent after the lock tree is destroyed
+    mgr.release_lt(lt);
+    mgr.get_status(&status);
+    assert_status(&status, "LTM_WAIT_COUNT", 1);
+    assert_status(&status, "LTM_TIMEOUT_COUNT", 1);
+
+    mgr.destroy();
+}
+
+} /* namespace toku */
+
+int main(void) {
+    toku::manager_unit_test test;
+    test.test_status();
+    return 0;
+}

locktree/tests/manager_unit_test.h

@@ -105,6 +105,8 @@ public:
     void test_lt_map(void);
 
     void test_reference_release_lt(void);
+
+    void test_status(void);
 };
 
 } /* namespace toku */